aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-component.c8
2 files changed, 12 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 07e0072759..10c433ab90 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2008-03-18 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #519154
+
+ * mail-component.c: (view_changed):
+ Do not localize folder name used in window title.
+
+2008-03-18 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #506359
* mail-component.c: (mail_component_show_logger):
diff --git a/mail/mail-component.c b/mail/mail-component.c
index b5b1ca0e84..5a35245dea 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -517,6 +517,7 @@ view_changed(EMFolderView *emfv, EComponentView *component_view)
if (emfv->folder) {
char *name, *title;
+ const char *use_name; /* will contain localized name, if necessary */
guint32 visible, unread, deleted, junked;
GPtrArray *selected;
GString *tmp = g_string_new("");
@@ -562,11 +563,12 @@ view_changed(EMFolderView *emfv, EComponentView *component_view)
if (emfv->folder->parent_store == mail_component_peek_local_store(NULL)
&& (!strcmp (name, "Drafts") || !strcmp (name, "Inbox")
|| !strcmp (name, "Outbox") || !strcmp (name, "Sent")))
- e_info_label_set_info(el, _(name), tmp->str);
+ use_name = _(name);
else
- e_info_label_set_info(el, name, tmp->str);
+ use_name = name;
- title = g_strdup_printf("%s (%s)", _(name), tmp->str);
+ e_info_label_set_info (el, use_name, tmp->str);
+ title = g_strdup_printf ("%s (%s)", use_name, tmp->str);
e_component_view_set_title(component_view, title);
g_free(title);