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

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

	* gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't
	translate NULL messages.  (#161789, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 6fec83ea2fd6db4e8533dc5f93eedd60fde8a3ee..6b13ff30b141fa015466ad344d65ed9a8ac9c5fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6fec83ea2fd6db4e8533dc5f93eedd60fde8a3ee..6b13ff30b141fa015466ad344d65ed9a8ac9c5fa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6fec83ea2fd6db4e8533dc5f93eedd60fde8a3ee..6b13ff30b141fa015466ad344d65ed9a8ac9c5fa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6fec83ea2fd6db4e8533dc5f93eedd60fde8a3ee..6b13ff30b141fa015466ad344d65ed9a8ac9c5fa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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)
 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index b87cf8cd864df83a4b6d37838a14fdeeb596b6ad..8fc3f7a1848dbc4fe33998385ee52769921abe6f 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -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

diff --git a/docs/reference/gtk/tmpl/gtkitemfactory.sgml b/docs/reference/gtk/tmpl/gtkitemfactory.sgml
index 39a44ad4b1c5be7abf52d2eadc5af7317916cad1..1195901c3908f69a9ef5663f8333160098a4bbe3 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkitemfactory.sgml
+++ b/docs/reference/gtk/tmpl/gtkitemfactory.sgml
@@ -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 ##### -->

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 803c5ef7c97702649c089b7ab61a8349e885ec8f..510f9c5c87390cabf470f0d05f69f939f9f7ab4a 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -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;