empathy r969 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Sat Apr 19 18:46:57 2008
New Revision: 969
URL: http://svn.gnome.org/viewvc/empathy?rev=969&view=rev

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


Modified:
   trunk/src/empathy-chat-window.c

Modified: trunk/src/empathy-chat-window.c
==============================================================================
--- trunk/src/empathy-chat-window.c	(original)
+++ trunk/src/empathy-chat-window.c	Sat Apr 19 18:46:57 2008
@@ -273,12 +273,10 @@
 		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