From 6e0bf464f3337147bbc43f1bb5e0785369c1bcfb Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Thu, 6 Sep 2007 10:33:29 +0000 Subject: Don't translate empty label names. Fixes bug 363645. Thanks to Bastien 2007-09-06 Andre Klapper * mail-config.c: (config_cache_labels): Don't translate empty label names. Fixes bug 363645. Thanks to Bastien Nocera. svn path=/trunk/; revision=34186 --- mail/ChangeLog | 6 ++++++ mail/mail-config.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 + + * mail-config.c: (config_cache_labels): + Don't translate empty label names. + Fixes bug 363645. Thanks to Bastien Nocera. + 2007-09-06 Srinivasa Ragavan ** 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 (); -- cgit v1.2.3