pidgin: cefc4cff: Get rid of an unnecessary if statement, ...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: cefc4cffe26a303c84c45e1fe51b03cf08af7419
Ancestor: bdc04e580534b5b4e2678682060464c8ecf1eb32
Author: markdoliner at pidgin.im
Date: 2008-11-12T08:58:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cefc4cffe26a303c84c45e1fe51b03cf08af7419

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

ChangeLog: 

Get rid of an unnecessary if statement, and don't try to unref a
null icon when you don't have an icon set on msn.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/session.c	43e65308d6827f3ebad797cf2e9552b4bf78f6fb
+++ libpurple/protocols/msn/session.c	506940c5e058401becd1985313ea0f7ff5a6b502
@@ -118,12 +118,7 @@ msn_session_connect(MsnSession *session,
 		g_return_val_if_reached(FALSE);
 	}
 
-	if (msn_notification_connect(session->notification, host, port))
-	{
-		return TRUE;
-	}
-
-	return FALSE;
+	return msn_notification_connect(session->notification, host, port);
 }
 
 void
@@ -460,8 +455,10 @@ msn_session_finish_login(MsnSession *ses
 	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);
-	purple_imgstore_unref(img);
+	if (img != NULL)
+		purple_imgstore_unref(img);
 
 	session->logged_in = TRUE;