[empathy] main_window_favorite_chatroom_join: skip not connected accounts (#606738)



commit b9fba4f58c149afedd5a49ab9b44b95ac4ec4023
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri May 21 15:35:44 2010 +0200

    main_window_favorite_chatroom_join: skip not connected accounts (#606738)
    
    This fix a crash if the account is connecting.

 src/empathy-main-window.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 6826ee5..b526a4c 100644
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -903,14 +903,16 @@ 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,
-			gtk_get_current_event_time (), NULL, NULL);
-	}
+	DEBUG ("Requesting channel for '%s'", room);
+	empathy_dispatcher_join_muc (connection, room,
+		gtk_get_current_event_time (), NULL, NULL);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]