evolution r36857 - branches/gnome-2-24/mail

[mcrha svn gnome org]

Author: mcrha
Date: Tue Dec  9 12:58:14 2008
New Revision: 36857
URL: http://svn.gnome.org/viewvc/evolution?rev=36857&view=rev

Log:
2008-12-09  Milan Crha  <mcrha redhat com>

	** Fix for bug #563369

	* em-folder-properties.c: (emfp_dialog_got_folder_quota):
	* em-folder-tree-model.c: (em_folder_tree_model_set_folder_info):
	* mail-component.c: (view_changed): Translate "Templates" folder name.



Modified:
   branches/gnome-2-24/mail/ChangeLog
   branches/gnome-2-24/mail/em-folder-properties.c
   branches/gnome-2-24/mail/em-folder-tree-model.c
   branches/gnome-2-24/mail/mail-component.c

Modified: branches/gnome-2-24/mail/em-folder-properties.c
==============================================================================
--- branches/gnome-2-24/mail/em-folder-properties.c	(original)
+++ branches/gnome-2-24/mail/em-folder-properties.c	Tue Dec  9 12:58:14 2008
@@ -343,6 +343,7 @@
 
 	if (store == mail_component_peek_local_store(NULL)
 	    && (!strcmp(prop_data->name, "Drafts")
+		|| !strcmp(prop_data->name, "Templates")
 		|| !strcmp(prop_data->name, "Inbox")
 		|| !strcmp(prop_data->name, "Outbox")
 		|| !strcmp(prop_data->name, "Sent"))) {

Modified: branches/gnome-2-24/mail/em-folder-tree-model.c
==============================================================================
--- branches/gnome-2-24/mail/em-folder-tree-model.c	(original)
+++ branches/gnome-2-24/mail/em-folder-tree-model.c	Tue Dec  9 12:58:14 2008
@@ -502,6 +502,8 @@
 	if (si->store == mail_component_peek_local_store(NULL)) {
 		if (!strcmp(fi->full_name, "Drafts")) {
 			name = _("Drafts");
+		} else if (!strcmp(fi->full_name, "Templates")) {
+			name = _("Templates");
 		} else if (!strcmp(fi->full_name, "Inbox")) {
 			flags = (flags & ~CAMEL_FOLDER_TYPE_MASK) | CAMEL_FOLDER_TYPE_INBOX;
 			name = _("Inbox");

Modified: branches/gnome-2-24/mail/mail-component.c
==============================================================================
--- branches/gnome-2-24/mail/mail-component.c	(original)
+++ branches/gnome-2-24/mail/mail-component.c	Tue Dec  9 12:58:14 2008
@@ -574,7 +574,7 @@
 
 		if (emfv->folder->parent_store == mail_component_peek_local_store(NULL)
 		    && (!strcmp (name, "Drafts") || !strcmp (name, "Inbox")
-			|| !strcmp (name, "Outbox") || !strcmp (name, "Sent")))
+			|| !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates")))
 			use_name = _(name);
 		else if (!strcmp (name, "INBOX"))
  			use_name = _("Inbox");