From c63a626b5e401da99d499402dc17d535f5724050 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 67adeec352..a1d6d114bb 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -243,6 +243,7 @@ mail_browser_message_selected_cb (EMailBrowser *browser,
 	CamelMessageInfo *info;
 	CamelFolder *folder;
 	EMailReader *reader;
+	const gchar *title;
 
 	if (uid == NULL)
 		return;
@@ -256,9 +257,11 @@ mail_browser_message_selected_cb (EMailBrowser *browser,
 	if (info == NULL)
 		return;
 
-	gtk_window_set_title (
-		GTK_WINDOW (browser),
-		camel_message_info_subject (info));
+	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