changeset 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 5063f721de6d
children f769367cccd0
files ChangeLog libpurple/protocols/oscar/oscar.c
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Nov 04 22:47:18 2009 +0000
+++ b/ChangeLog	Wed Nov 04 23:39:08 2009 +0000
@@ -17,6 +17,8 @@
 	* The simultaneous login account option is respected when using
 	  the clientLogin authentication method.
 
+	AIM and ICQ:
+	* Fix offline message retrieval (broken in 2.6.3)
 
 	MSN:
 	* Don't forget display names for buddies.
--- a/libpurple/protocols/oscar/oscar.c	Wed Nov 04 22:47:18 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Nov 04 23:39:08 2009 +0000
@@ -3999,9 +3999,6 @@
 	presence = purple_status_get_presence(status);
 	aim_srv_setidle(od, !purple_presence_is_idle(presence) ? 0 : time(NULL) - purple_presence_get_idle_time(presence));
 
-	/* Request offline messages for AIM and ICQ */
-	aim_im_reqofflinemsgs(od);
-
 	if (od->icq) {
 #ifdef OLDSTYLE_ICQ_OFFLINEMSGS
 		aim_icq_reqofflinemsgs(od);
@@ -4028,6 +4025,10 @@
 	 */
 	if (od->ssi.received_data) {
 		aim_srv_clientready(od, conn);
+
+		/* Request offline messages for AIM and ICQ */
+		aim_im_reqofflinemsgs(od);
+
 		purple_connection_set_state(gc, PURPLE_CONNECTED);
 	}
 
@@ -5444,6 +5445,10 @@
 	 */
 	if (od->bos.have_rights) {
 		aim_srv_clientready(od, conn);
+
+		/* Request offline messages for AIM and ICQ */
+		aim_im_reqofflinemsgs(od);
+
 		purple_connection_set_state(gc, PURPLE_CONNECTED);
 	}