aboutsummaryrefslogtreecommitdiffstats
path: root/mail/e-mail-browser.c
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2010-04-10 01:21:32 +0800
committerFederico Mena Quintero <federico@novell.com>2010-04-10 01:21:32 +0800
commita16f08974d6955f843dddce3b9423c5349873488 (patch)
tree864c537265450b65c47cb4b801817cd9eede5787 /mail/e-mail-browser.c
parent5b397348258994539b452006e988be78a43a2fae (diff)
parentad1de0aa0889edaa0ad9bc41c170fa84ec5536f2 (diff)
downloadgsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.gz
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.bz2
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.lz
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.xz
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.tar.zst
gsoc2013-evolution-a16f08974d6955f843dddce3b9423c5349873488.zip
Merge gnome-2-30 into express2 to get bugfixes
Note that express2 got some documentation for EExtensible and friends, and that documentation is not in gnome-2-30 yet. We need to cherry-pick those commits into gnome-2-30 and elsewhere.
Diffstat (limited to 'mail/e-mail-browser.c')
-rw-r--r--mail/e-mail-browser.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index a6461e2bfe..78dd91b5c2 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -244,6 +244,7 @@ mail_browser_message_selected_cb (EMailBrowser *browser,
CamelMessageInfo *info;
CamelFolder *folder;
EMailReader *reader;
+ const gchar *title;
if (uid == NULL)
return;
@@ -257,9 +258,14 @@ mail_browser_message_selected_cb (EMailBrowser *browser,
if (info == NULL)
return;
- gtk_window_set_title (
- GTK_WINDOW (browser),
- camel_message_info_subject (info));
+ /* XXX The string here was added after the 2.30.0 release, so
+ * it's not marked for translation. But it IS marked for
+ * translation in 2.31. */
+ title = camel_message_info_subject (info);
+ if (title == NULL || *title == '\0')
+ title = "(No Subject)";
+
+ gtk_window_set_title (GTK_WINDOW (browser), title);
gtk_widget_grab_focus (
GTK_WIDGET (((EMFormatHTML *) html_display)->html));