Mercurial > pidgin.yaz
changeset 24720:6efcf61cf12b
merge of '91d403bb5dfadec9e38f0c0c058ababeed6fd9d7'
and 'eb16a1c0c5f81e6320a264061588965751a02101'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 15 Dec 2008 04:09:02 +0000 |
| parents | 9d13030adae8 (diff) 0e8d91cdd63a (current diff) |
| children | 68cc1a8a0d21 041bb386bf96 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 15 04:08:31 2008 +0000 +++ b/ChangeLog Mon Dec 15 04:09:02 2008 +0000 @@ -40,6 +40,8 @@ album, if possible. * Messages sent from a mobile device while you were offline are now correctly received. + * Server transfers after you've been connected for a long time should + now be handled correctly. * Many other fixes and code cleanup. XMPP:
--- a/libpurple/protocols/msn/session.c Mon Dec 15 04:08:31 2008 +0000 +++ b/libpurple/protocols/msn/session.c Mon Dec 15 04:09:02 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 */