comparison libpurple/protocols/msn/session.c @ 24328:5b5c21b60690

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.
author Mark Doliner <mark@kingant.net>
date Wed, 12 Nov 2008 08:58:27 +0000
parents 107166bb2a64
children 95ef7beb926b ace4ff827908 94fa7211eb98
comparison
equal deleted inserted replaced
24327:38f4670c3daa 24328:5b5c21b60690
116 { 116 {
117 purple_debug_error("msn", "This shouldn't happen\n"); 117 purple_debug_error("msn", "This shouldn't happen\n");
118 g_return_val_if_reached(FALSE); 118 g_return_val_if_reached(FALSE);
119 } 119 }
120 120
121 if (msn_notification_connect(session->notification, host, port)) 121 return msn_notification_connect(session->notification, host, port);
122 {
123 return TRUE;
124 }
125
126 return FALSE;
127 } 122 }
128 123
129 void 124 void
130 msn_session_disconnect(MsnSession *session) 125 msn_session_disconnect(MsnSession *session)
131 { 126 {
458 453
459 account = session->account; 454 account = session->account;
460 gc = purple_account_get_connection(account); 455 gc = purple_account_get_connection(account);
461 456
462 img = purple_buddy_icons_find_account_icon(session->account); 457 img = purple_buddy_icons_find_account_icon(session->account);
458 /* TODO: Do we really want to call this if img is NULL? */
463 msn_user_set_buddy_icon(session->user, img); 459 msn_user_set_buddy_icon(session->user, img);
464 purple_imgstore_unref(img); 460 if (img != NULL)
461 purple_imgstore_unref(img);
465 462
466 session->logged_in = TRUE; 463 session->logged_in = TRUE;
467 464
468 msn_change_status(session); 465 msn_change_status(session);
469 466