aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-12-09 20:58:00 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-12-09 20:58:00 +0800
commitb607fe6bee3648726f88122e4d6e3856c9ada922 (patch)
tree508f6f35c978f7d816c0ef7bef1d6d1d603701e9
parent14ed95aaafdf590495c951a46234894acfd14157 (diff)
downloadgsoc2013-evolution-b607fe6bee3648726f88122e4d6e3856c9ada922.tar
gsoc2013-evolution-b607fe6bee3648726f88122e4d6e3856c9ada922.tar.gz
gsoc2013-evolution-b607fe6bee3648726f88122e4d6e3856c9ada922.tar.bz2
gsoc2013-evolution-b607fe6bee3648726f88122e4d6e3856c9ada922.tar.lz
gsoc2013-evolution-b607fe6bee3648726f88122e4d6e3856c9ada922.tar.xz
gsoc2013-evolution-b607fe6bee3648726f88122e4d6e3856c9ada922.tar.zst
gsoc2013-evolution-b607fe6bee3648726f88122e4d6e3856c9ada922.zip
** Fix for bug #563369
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. svn path=/trunk/; revision=36856
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/em-folder-properties.c1
-rw-r--r--mail/em-folder-tree-model.c2
-rw-r--r--mail/mail-component.c2
4 files changed, 12 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 15f2ddbfee..f83efc22e7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
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.
+
+2008-12-09 Milan Crha <mcrha@redhat.com>
+
** Part of fix for bug #563669
* mail-config.glade:
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index b871d28203..89cf3c7070 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -343,6 +343,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota,
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"))) {
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 6f716d7e13..0357a26142 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -502,6 +502,8 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite
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");
diff --git a/mail/mail-component.c b/mail/mail-component.c
index b16cbca936..2a908ee7e5 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -579,7 +579,7 @@ 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")))
+ || !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates")))
use_name = _(name);
else if (!strcmp (name, "INBOX"))
use_name = _("Inbox");