evolution r35213 - trunk/mail

[mcrha svn gnome org]

Author: mcrha
Date: Tue Mar 18 17:51:30 2008
New Revision: 35213
URL: http://svn.gnome.org/viewvc/evolution?rev=35213&view=rev

Log:
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.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/mail-component.c

Modified: trunk/mail/mail-component.c
==============================================================================
--- trunk/mail/mail-component.c	(original)
+++ trunk/mail/mail-component.c	Tue Mar 18 17:51:30 2008
@@ -517,6 +517,7 @@
 
 	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 @@
 		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);