# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1229315727 0
# Node ID cf626850031fa86bd6c159e86ca506755a336234
# Parent  041bb386bf96bf090f2fff4e0bd943311e985bf8# Parent  39bd04a550a4e2d977ab51389795e1b8ff5639fb
merge of '3b87c3b008c11c068a42eba55b3f5724cdac4ad4'
     and '5255dae1217b713f7cdd700364fa47efe0a98560'

diff -r 041bb386bf96 -r cf626850031f libpurple/protocols/msn/session.c
--- a/libpurple/protocols/msn/session.c	Mon Dec 15 04:25:00 2008 +0000
+++ b/libpurple/protocols/msn/session.c	Mon Dec 15 04:35:27 2008 +0000
@@ -448,25 +448,23 @@
 	PurpleConnection *gc;
 	PurpleStoredImage *img;
 
-	msn_change_status(session);
-
-	if (session->logged_in)
-		return;
-
-	account = session->account;
-	gc = purple_account_get_connection(account);
+	if (!session->logged_in) {
+		account = session->account;
+		gc = purple_account_get_connection(account);
 
-	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);
+		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);
 
-	session->logged_in = TRUE;
+		session->logged_in = TRUE;
+		purple_connection_set_state(gc, PURPLE_CONNECTED);
 
-	purple_connection_set_state(gc, PURPLE_CONNECTED);
+		/* Sync users */
+		msn_session_sync_users(session);
+	}
 
-	/* Sync users */
-	msn_session_sync_users(session);
+	msn_change_status(session);
 }