comparison libpurple/protocols/msn/session.c @ 25237:401f548e3544

propagate from branch 'im.pidgin.pidgin' (head df6eba32e5b6b34d7483cbfb7e9f2e4c836ac35f) to branch 'org.darkrain42.pidgin.buddy-add' (head 6831808999a270f8c1a128c7430a73d3dc0bfae2)
author Paul Aurich <paul@darkrain42.org>
date Sun, 21 Dec 2008 18:32:37 +0000
parents 39bd04a550a4
children 201789d2f003 f8dbd57cf635
comparison
equal deleted inserted replaced
25172:125cac3e24ee 25237:401f548e3544
446 { 446 {
447 PurpleAccount *account; 447 PurpleAccount *account;
448 PurpleConnection *gc; 448 PurpleConnection *gc;
449 PurpleStoredImage *img; 449 PurpleStoredImage *img;
450 450
451 if (session->logged_in) 451 if (!session->logged_in) {
452 return; 452 account = session->account;
453 453 gc = purple_account_get_connection(account);
454 account = session->account; 454
455 gc = purple_account_get_connection(account); 455 img = purple_buddy_icons_find_account_icon(session->account);
456 456 /* TODO: Do we really want to call this if img is NULL? */
457 img = purple_buddy_icons_find_account_icon(session->account); 457 msn_user_set_buddy_icon(session->user, img);
458 /* TODO: Do we really want to call this if img is NULL? */ 458 if (img != NULL)
459 msn_user_set_buddy_icon(session->user, img); 459 purple_imgstore_unref(img);
460 if (img != NULL) 460
461 purple_imgstore_unref(img); 461 session->logged_in = TRUE;
462 462 purple_connection_set_state(gc, PURPLE_CONNECTED);
463 session->logged_in = TRUE; 463
464 /* Sync users */
465 msn_session_sync_users(session);
466 }
464 467
465 msn_change_status(session); 468 msn_change_status(session);
466 469 }
467 purple_connection_set_state(gc, PURPLE_CONNECTED); 470
468
469 /* Sync users */
470 msn_session_sync_users(session);
471 }
472