From 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 24 Nov 2008 05:14:44 +0000 Subject: Merge revisions 36737:36810 from trunk. svn path=/branches/kill-bonobo/; revision=36811 --- e-util/e-util-labels.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'e-util/e-util-labels.c') 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) { -- cgit v1.2.3