From 42a69b14dfe9b4f05bfd24e71f228c1f392e2a39 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 7 Apr 2010 11:31:22 -0400 Subject: Bug 614644 - Email window's title is blank when subject is blank --- mail/e-mail-browser.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'mail/e-mail-browser.c') 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)); -- cgit v1.2.3