aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-config.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ab5878ee2c..3ed9f52111 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-06 Andre Klapper <a9016009@gmx.de>
+
+ * mail-config.c: (config_cache_labels):
+ Don't translate empty label names.
+ Fixes bug 363645. Thanks to Bastien Nocera.
+
2007-09-06 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #304993 (Novell Bugzilla)
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 362083ee9e..19e46073b2 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -175,7 +175,13 @@ config_cache_labels (void)
*colour++ = '\0';
label->tag = g_strdup(label_defaults[num].tag);
- label->name = g_strdup (_(buf));
+
+ /* Don't translate an empty string */
+ if (buf == NULL || buf[0] == '\0')
+ label->name = g_strdup (_("Unnamed"));
+ else
+ label->name = g_strdup (_(buf));
+
label->colour = g_strdup (colour);
n = g_slist_alloc ();