Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 28881:30f8f2105740
I believe this change fixes offline message retrieval.
Fixes #10663
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 04 Nov 2009 23:39:08 +0000 |
parents | bb923bcae9de |
children | 17617d892bc4 |
comparison
equal
deleted
inserted
replaced
28880:5063f721de6d | 28881:30f8f2105740 |
---|---|
3997 g_free(tmp); | 3997 g_free(tmp); |
3998 | 3998 |
3999 presence = purple_status_get_presence(status); | 3999 presence = purple_status_get_presence(status); |
4000 aim_srv_setidle(od, !purple_presence_is_idle(presence) ? 0 : time(NULL) - purple_presence_get_idle_time(presence)); | 4000 aim_srv_setidle(od, !purple_presence_is_idle(presence) ? 0 : time(NULL) - purple_presence_get_idle_time(presence)); |
4001 | 4001 |
4002 /* Request offline messages for AIM and ICQ */ | |
4003 aim_im_reqofflinemsgs(od); | |
4004 | |
4005 if (od->icq) { | 4002 if (od->icq) { |
4006 #ifdef OLDSTYLE_ICQ_OFFLINEMSGS | 4003 #ifdef OLDSTYLE_ICQ_OFFLINEMSGS |
4007 aim_icq_reqofflinemsgs(od); | 4004 aim_icq_reqofflinemsgs(od); |
4008 #endif | 4005 #endif |
4009 oscar_set_extendedstatus(gc); | 4006 oscar_set_extendedstatus(gc); |
4026 * wait for bos rights before calling clientready. But it seems safer | 4023 * wait for bos rights before calling clientready. But it seems safer |
4027 * to do it this way. | 4024 * to do it this way. |
4028 */ | 4025 */ |
4029 if (od->ssi.received_data) { | 4026 if (od->ssi.received_data) { |
4030 aim_srv_clientready(od, conn); | 4027 aim_srv_clientready(od, conn); |
4028 | |
4029 /* Request offline messages for AIM and ICQ */ | |
4030 aim_im_reqofflinemsgs(od); | |
4031 | |
4031 purple_connection_set_state(gc, PURPLE_CONNECTED); | 4032 purple_connection_set_state(gc, PURPLE_CONNECTED); |
4032 } | 4033 } |
4033 | 4034 |
4034 return 1; | 4035 return 1; |
4035 } | 4036 } |
5442 * If we've already received our bos rights then we're not waiting on | 5443 * If we've already received our bos rights then we're not waiting on |
5443 * anything else, so send the server clientready. | 5444 * anything else, so send the server clientready. |
5444 */ | 5445 */ |
5445 if (od->bos.have_rights) { | 5446 if (od->bos.have_rights) { |
5446 aim_srv_clientready(od, conn); | 5447 aim_srv_clientready(od, conn); |
5448 | |
5449 /* Request offline messages for AIM and ICQ */ | |
5450 aim_im_reqofflinemsgs(od); | |
5451 | |
5447 purple_connection_set_state(gc, PURPLE_CONNECTED); | 5452 purple_connection_set_state(gc, PURPLE_CONNECTED); |
5448 } | 5453 } |
5449 | 5454 |
5450 return 1; | 5455 return 1; |
5451 } | 5456 } |