aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-11-13 03:01:02 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-11-13 03:01:02 +0800
commit2103470d557d15b2e5e177eb1ccc7ff412985358 (patch)
tree7fe12d18e412c87516aa583daa0cce45879a946c
parent11a505f1fdb5847970bfd5cde19028b5bbf267d8 (diff)
downloadgsoc2013-evolution-2103470d557d15b2e5e177eb1ccc7ff412985358.tar
gsoc2013-evolution-2103470d557d15b2e5e177eb1ccc7ff412985358.tar.gz
gsoc2013-evolution-2103470d557d15b2e5e177eb1ccc7ff412985358.tar.bz2
gsoc2013-evolution-2103470d557d15b2e5e177eb1ccc7ff412985358.tar.lz
gsoc2013-evolution-2103470d557d15b2e5e177eb1ccc7ff412985358.tar.xz
gsoc2013-evolution-2103470d557d15b2e5e177eb1ccc7ff412985358.tar.zst
gsoc2013-evolution-2103470d557d15b2e5e177eb1ccc7ff412985358.zip
** Fix for bug #559810
2008-11-12 Milan Crha <mcrha@redhat.com> ** Fix for bug #559810 * e-util-labels.c: (e_util_labels_parse): Do not localize empty label names, also localize them only first time. svn path=/branches/gnome-2-24/; revision=36778
-rw-r--r--e-util/ChangeLog7
-rw-r--r--e-util/e-util-labels.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 66f260317e..13e8f65792 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-12 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #559810
+
+ * e-util-labels.c: (e_util_labels_parse):
+ Do not localize empty label names, also localize them only first time.
+
2008-11-02 Matthew Barnes <mbarnes@redhat.com>
* e-util.c (do_format_number_as_float):
diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c
index 359157a25f..da32f233c5 100644
--- a/e-util/e-util-labels.c
+++ b/e-util/e-util-labels.c
@@ -79,7 +79,7 @@ e_util_labels_parse (GConfClient *client)
/* Needed for Backward Compatibility */
if (num < LABEL_DEFAULTS_NUM) {
- label->name = g_strdup (_(buf));
+ label->name = g_strdup ((buf && *buf) ? buf : _(label_defaults[num].name));
label->tag = g_strdup (label_defaults[num].tag);
num++;
} else if (!tag) {