Make sure to not set a NULL title on the window.

svn path=/trunk/; revision=969

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index b841506ba639bac213b9ee664921e29c6d4a4a22..dc7f2f102573b7984cc25c01b691739d5b9cc9e2 100644 (file)
--- 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);
                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
 }
 
 static void