diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-11-24 13:14:44 +0800 |
| commit | 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 (patch) | |
| tree | 828acaa7b76aa12a490a3238b0ec4a7086b8be16 /e-util | |
| parent | 076b7c45131482b87d18963d34d035435491ee8d (diff) | |
| download | gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.gz gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.tar.zst gsoc2013-evolution-4f4615a46d5ba518c1e6a0c2412b1edf1e268d99.zip | |
Merge revisions 36737:36810 from trunk.
svn path=/branches/kill-bonobo/; revision=36811
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/ChangeLog | 16 | ||||
| -rw-r--r-- | e-util/e-util-labels.c | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index f61b43a003..461861d7c3 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,5 +1,16 @@ -<<<<<<< .working -======= +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-04 Matthew Barnes <mbarnes@redhat.com> + + * e-non-intrusive-error-dialog.c: + * e-non-intrusive-error-dialog.h: + Fix compiler warnings. + 2008-11-04 Akhil Laddha <lakhil@novell.com> * e-non-intrusive-error-dialog.c (eni_query_tooltip_cb), @@ -34,7 +45,6 @@ License Changes * e-plugin-ui.c: * e-plugin-ui.h: ->>>>>>> .merge-right.r36736 2008-10-06 Sankar P <psankar@novell.com> * widgets/table/e-cell-float.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) { |