Mercurial > pidgin
changeset 24753:ace4ff827908
merge of '10ea019ecb33303883a9a34e547d2c04b8267a3d'
and '5c2262ac6439fb7a5cfdd91a6c350095bbd5d707'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 15 Dec 2008 03:59:30 +0000 |
| parents | 939d173b68b3 (current diff) c1bbbc2675a3 (diff) |
| children | 9d13030adae8 |
| files | libpurple/protocols/msn/session.c libpurple/protocols/myspace/CHANGES libpurple/protocols/myspace/ChangeLog libpurple/protocols/myspace/LICENSE libpurple/protocols/myspace/release.sh libpurple/protocols/qq/group_conv.c libpurple/protocols/qq/group_conv.h libpurple/protocols/qq/group_find.c libpurple/protocols/qq/group_find.h libpurple/protocols/qq/group_free.c libpurple/protocols/qq/group_free.h libpurple/protocols/qq/group_search.c libpurple/protocols/qq/group_search.h libpurple/protocols/qq/header_info.c libpurple/protocols/qq/header_info.h libpurple/protocols/qq/sys_msg.c libpurple/protocols/qq/sys_msg.h pidgin/pidginstock-artwork.c pidgin/pixmaps/protocols/16/facebook.png pidgin/pixmaps/protocols/22/facebook.png pidgin/pixmaps/protocols/48/facebook.png pidgin/pixmaps/status/48/rtl/login.png pidgin/pixmaps/status/48/rtl/logout.png |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/session.c Mon Dec 15 03:01:38 2008 +0000 +++ b/libpurple/protocols/msn/session.c Mon Dec 15 03:59:30 2008 +0000 @@ -448,6 +448,8 @@ PurpleConnection *gc; PurpleStoredImage *img; + msn_change_status(session); + if (session->logged_in) return; @@ -462,8 +464,6 @@ session->logged_in = TRUE; - msn_change_status(session); - purple_connection_set_state(gc, PURPLE_CONNECTED); /* Sync users */