Don't translate empty strings. (#326200, Christian Stimming)

2006-01-08  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate
        empty strings.  (#326200, Christian Stimming)

diff --git a/ChangeLog b/ChangeLog
index b434a4ea08537bf14c257817f8cf95e87e1f271a..ce5115520b8a9af4f67dfca00f13f34cf66cb2bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate
+       empty strings.  (#326200, Christian Stimming)
+
 2006-01-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.[hc]: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b434a4ea08537bf14c257817f8cf95e87e1f271a..ce5115520b8a9af4f67dfca00f13f34cf66cb2bf 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkactiongroup.c (dgettext_swapped): Don't translate
+       empty strings.  (#326200, Christian Stimming)
+
 2006-01-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.[hc]: 

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 91b2cb35cf8de7bf548f6e772d82a17de88ad109..a1985809e2c054246a930027e373f227d4f12c9f 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -1037,7 +1037,11 @@ static gchar *
 dgettext_swapped (const gchar *msgid, 
                  const gchar *domainname)
 {
-  return dgettext (domainname, msgid);
+  /* Pass through dgettext if and only if msgid is nonempty. */
+  if (msgid && *msgid) 
+    return dgettext (domainname, msgid); 
+  else
+    return (gchar*) msgid;
 }
 
 /**