From f20e456a6fb0264ea2e327b96693c727647bdfc8 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Sat, 19 Apr 2008 18:46:57 +0000
Subject: Make sure to not set a NULL title on the window.

svn path=/trunk/; revision=969
---
 src/empathy-chat-window.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index b841506ba..dc7f2f102 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -273,12 +273,10 @@ chat_window_get_chat_name (EmpathyChat *chat)
 		remote_contact = empathy_chat_get_remote_contact (chat);
 		if (remote_contact) {
 			name = empathy_contact_get_name (remote_contact);
-		} else {
-			name = _("Conversation");
 		}
 	}
 
-	return name;
+	return name ? name : _("Conversation");
 }
 
 static void
-- 
cgit v1.2.3