comparison: libpurple/protocols/msn/session.c
libpurple/protocols/msn/session.c
- branch
- next.minor
- changeset 24981
- ceddb7033bc8
- parent 24945
- 6678a8c83797
- parent 24605
- ad3ade4ebb0b
- child 25846
- a93cb1380fae
equal
deleted
inserted
replaced
| 24980:c195415b5fdf | 24981:ceddb7033bc8 |
|---|---|
| 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 { |
| 463 | 458 |
| 464 account = session->account; | 459 account = session->account; |
| 465 gc = purple_account_get_connection(account); | 460 gc = purple_account_get_connection(account); |
| 466 | 461 |
| 467 img = purple_buddy_icons_find_account_icon(session->account); | 462 img = purple_buddy_icons_find_account_icon(session->account); |
| 463 /* TODO: Do we really want to call this if img is NULL? */ | |
| 468 msn_user_set_buddy_icon(session->user, img); | 464 msn_user_set_buddy_icon(session->user, img); |
| 469 purple_imgstore_unref(img); | 465 if (img != NULL) |
| 466 purple_imgstore_unref(img); | |
| 470 | 467 |
| 471 session->logged_in = TRUE; | 468 session->logged_in = TRUE; |
| 472 | 469 |
| 473 msn_change_status(session); | 470 msn_change_status(session); |
| 474 | 471 |
