AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't translate NULL messages. (#161789, Morten Welinder)

Browse Source 
2004-12-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't
	translate NULL messages.  (#161789, Morten Welinder)
This commit is contained in:
Matthias Clasen 2004-12-20 16:05:25 +00:00 committed by Matthias Clasen
parent 7e00903af7
commit 8454afe8e6
7 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-12-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't
translate NULL messages. (#161789, Morten Welinder)
* gtk/gtkmessagedialog.c (setup_primary_label_font): Don't show
the secondary label on show_all(). (#161707, Christian Persch)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2004-12-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't
translate NULL messages. (#161789, Morten Welinder)
* gtk/gtkmessagedialog.c (setup_primary_label_font): Don't show
the secondary label on show_all(). (#161707, Christian Persch)

3
ChangeLog.pre-2-6
View File

@ -1,5 +1,8 @@
2004-12-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't
translate NULL messages. (#161789, Morten Welinder)
* gtk/gtkmessagedialog.c (setup_primary_label_font): Don't show
the secondary label on show_all(). (#161707, Christian Persch)

3
ChangeLog.pre-2-8
View File

@ -1,5 +1,8 @@
2004-12-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't
translate NULL messages. (#161789, Morten Welinder)
* gtk/gtkmessagedialog.c (setup_primary_label_font): Don't show
the secondary label on show_all(). (#161707, Christian Persch)

4
docs/reference/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-20 Matthias Clasen <mclasen@redhat.com>
* gtk/tmpl/gtkitemfactory.sgml: Document GtkTranslateFunc
2004-12-17 Matthias Clasen <mclasen@redhat.com>
* gdk/tmpl/x_interaction.sgml: Remove a no longer needed

11
docs/reference/gtk/tmpl/gtkitemfactory.sgml
View File

@ -31,12 +31,15 @@ As of GTK+ 2.4, #GtkItemFactory has been deprecated in favour of #GtkUIManager.
<!-- ##### USER_FUNCTION GtkTranslateFunc ##### -->
<para>
The function used to translate messages in e.g. #GtkIconFactory
and #GtkActionGroup.
</para>
@path:
@func_data:
@Returns:
@path: The id of the message. In #GtkItemFactory this will be a path
from a #GtkItemFactoryEntry, in #GtkActionGroup, it will be a label
or tooltip from a #GtkActionEntry.
@func_data: user data passed in when registering the function
@Returns: the translated message
<!-- ##### USER_FUNCTION GtkItemFactoryCallback ##### -->

3
gtk/gtkactiongroup.c
View File

@ -1076,6 +1076,9 @@ gtk_action_group_translate_string (GtkActionGroup *action_group,
g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), string);
if (string == NULL)
return NULL;
translate_func = action_group->private_data->translate_func;
translate_data = action_group->private_data->translate_data;