empathy r1471 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Sep 19 13:57:19 2008
New Revision: 1471
URL: http://svn.gnome.org/viewvc/empathy?rev=1471&view=rev

Log:
Do not crash if the chatroom's account has no connection. Fixes bug #550652.

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

Modified: trunk/src/empathy-main-window.c
==============================================================================
--- trunk/src/empathy-main-window.c	(original)
+++ trunk/src/empathy-main-window.c	Fri Sep 19 13:57:19 2008
@@ -732,13 +732,15 @@
 	DEBUG ("Requesting channel for '%s'", room);
 
 	connection = mission_control_get_tpconnection (mc, account, NULL);
-	tp_connection_run_until_ready (connection, TRUE, NULL, NULL);	
-	empathy_connection_request_channel (connection, -1,
-					    TP_IFACE_CHANNEL_TYPE_TEXT,
-					    TP_HANDLE_TYPE_ROOM,
-					    room, TRUE,
-					    NULL, NULL, NULL, NULL);
-	g_object_unref (connection);
+	if (connection) {
+		tp_connection_run_until_ready (connection, TRUE, NULL, NULL);	
+		empathy_connection_request_channel (connection, -1,
+						    TP_IFACE_CHANNEL_TYPE_TEXT,
+						    TP_HANDLE_TYPE_ROOM,
+						    room, TRUE,
+						    NULL, NULL, NULL, NULL);
+		g_object_unref (connection);
+	}
 	g_object_unref (mc);
 }