pidgin: 5255dae1: Actually that last change did break regu...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 5255dae1217b713f7cdd700364fa47efe0a98560
Ancestor: 91d403bb5dfadec9e38f0c0c058ababeed6fd9d7
Author: qulogic at pidgin.im
Date: 2008-12-15T04:34:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5255dae1217b713f7cdd700364fa47efe0a98560

Modified files:
        libpurple/protocols/msn/session.c

ChangeLog: 

Actually that last change did break regular login, but I don't feel like
disapproving a disapproval of a disapproval of a revision. This should fix
it though.

References #6196.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/session.c	7956f7d9a3490b2bfdbcd028d6e80603b2a92886
+++ libpurple/protocols/msn/session.c	42eecf5f97d3fb59d0b6dac53aa0116f8a7088ce
@@ -448,25 +448,23 @@ msn_session_finish_login(MsnSession *ses
 	PurpleConnection *gc;
 	PurpleStoredImage *img;
 
-	msn_change_status(session);
+	if (!session->logged_in) {
+		account = session->account;
+		gc = purple_account_get_connection(account);
 
-	if (session->logged_in)
-		return;
+		img = purple_buddy_icons_find_account_icon(session->account);
+		/* TODO: Do we really want to call this if img is NULL? */
+		msn_user_set_buddy_icon(session->user, img);
+		if (img != NULL)
+			purple_imgstore_unref(img);
 
-	account = session->account;
-	gc = purple_account_get_connection(account);
+		session->logged_in = TRUE;
+		purple_connection_set_state(gc, PURPLE_CONNECTED);
 
-	img = purple_buddy_icons_find_account_icon(session->account);
-	/* TODO: Do we really want to call this if img is NULL? */
-	msn_user_set_buddy_icon(session->user, img);
-	if (img != NULL)
-		purple_imgstore_unref(img);
+		/* Sync users */
+		msn_session_sync_users(session);
+	}
 
-	session->logged_in = TRUE;
-
-	purple_connection_set_state(gc, PURPLE_CONNECTED);
-
-	/* Sync users */
-	msn_session_sync_users(session);
+	msn_change_status(session);
 }