aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorSuman Manjunath <msuman@src.gnome.org>2008-08-04 11:58:40 +0800
committerSuman Manjunath <msuman@src.gnome.org>2008-08-04 11:58:40 +0800
commit6e5fb11194759cc1cc6b202b9d16bf8c66ae583e (patch)
tree1c4a253107ab5cb8f9ba49423d6b54c5bf10515d /mail
parentcdc96a3f5f06110bc05ca6c1cdcea03fbc2d3965 (diff)
downloadgsoc2013-evolution-6e5fb11194759cc1cc6b202b9d16bf8c66ae583e.tar.gz
gsoc2013-evolution-6e5fb11194759cc1cc6b202b9d16bf8c66ae583e.tar.zst
gsoc2013-evolution-6e5fb11194759cc1cc6b202b9d16bf8c66ae583e.zip
Patch from Paul Bolle <pebolle@tiscali.nl>: Fix for bug #543058 (Use "Inbox" instead of "INBOX" while displaying IMAP mailbox).
svn path=/trunk/; revision=35899
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/em-folder-properties.c3
-rw-r--r--mail/mail-component.c2
3 files changed, 15 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 514a00ba20..4a9c7ede69 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2008-08-04 Paul Bolle <pebolle@tiscali.nl>
+
+ ** Fix for bug #543058
+
+ * em-folder-properties.c (emfp_dialog_got_folder_quota):
+ * mail-component.c (view_changed): Replace three occurrences of
+ INBOX in the GUI code with Inbox. INBOX is a written in all caps
+ because that is the way it is used in the IMAP protocol. There's
+ little reason to use it in the GUI. Inbox is properly capitalized and
+ can be localized too.
+
2008-08-04 Paul Bolle <pebolle@tiscali.nl>
** Further fix for bug #539268
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 34be92221a..506522750b 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -351,7 +351,8 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, CamelFolderQuotaInfo *quota,
}
emfp_items_translated = TRUE;
}
- }
+ } else if (!strcmp(prop_data->name, "INBOX"))
+ emfp_items[EMFP_FOLDER_SECTION].label = _("Inbox");
else
emfp_items[EMFP_FOLDER_SECTION].label = prop_data->name;
diff --git a/mail/mail-component.c b/mail/mail-component.c
index afdcfdb1e0..39d2302ea0 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -579,6 +579,8 @@ view_changed(EMFolderView *emfv, EComponentView *component_view)
&& (!strcmp (name, "Drafts") || !strcmp (name, "Inbox")
|| !strcmp (name, "Outbox") || !strcmp (name, "Sent")))
use_name = _(name);
+ else if (!strcmp (name, "INBOX"))
+ use_name = _("Inbox");
else
use_name = name;