[evolution/gnome-2-30] Bug 614644 - Email window's title is blank when subject is blank

[Matthew Barnes <mbarnes src gnome org>]

commit 42a69b14dfe9b4f05bfd24e71f228c1f392e2a39
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Apr 7 11:31:22 2010 -0400

    Bug 614644 - Email window's title is blank when subject is blank

 mail/e-mail-browser.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index a6461e2..78dd91b 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));