[empathy/gnome-2-30] main_window_favorite_chatroom_join: skip not connected accounts (#606738)

[Guillaume Desmottes <gdesmott src gnome org>]

commit 156949f6b444cb4ef04d320fa4cef13c630f8573
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri May 21 15:54:39 2010 +0200

    main_window_favorite_chatroom_join: skip not connected accounts (#606738)
    
    This fix a crash if the account is connecting.
    
    Conflicts:
    
    	src/empathy-main-window.c

 src/empathy-main-window.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index c4986bc..7bd6fab 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -882,13 +882,15 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom)
 	const gchar    *room;
 
 	account = empathy_chatroom_get_account (chatroom);
+	if (tp_account_get_connection_status (account, NULL) !=
+					     TP_CONNECTION_STATUS_CONNECTED)
+		return;
 	connection = tp_account_get_connection (account);
+	g_assert (connection != NULL);
 	room = empathy_chatroom_get_room (chatroom);
 
-	if (connection != NULL) {
-		DEBUG ("Requesting channel for '%s'", room);
-		empathy_dispatcher_join_muc (connection, room, NULL, NULL);
-	}
+	DEBUG ("Requesting channel for '%s'", room);
+	empathy_dispatcher_join_muc (connection, room, NULL, NULL);
 }
 
 static void