pidgin: 49ffd1b6: I believe this change fixes offline mess...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 49ffd1b636d756307e3e96c9ce11c130f9d02831
Ancestor: 964025d624cbb6d302e3b5f6af14fa60f14bf80f
Author: markdoliner at pidgin.im
Date: 2009-11-04T23:39:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/49ffd1b636d756307e3e96c9ce11c130f9d02831

Modified files:
        ChangeLog libpurple/protocols/oscar/oscar.c

ChangeLog: 

I believe this change fixes offline message retrieval.

Fixes #10663

-------------- next part --------------
============================================================
--- ChangeLog	b47b03a5af9f982c6f7aa3378e03c2dc71c163ac
+++ ChangeLog	4626d9f792c55955f54b7b7293c74af9df8670a0
@@ -17,6 +17,8 @@ version 2.6.4 (??/??/20??):
 	* 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.
============================================================
--- libpurple/protocols/oscar/oscar.c	58de4f73f6700ad5ad6616977e003e6b5e8c2684
+++ libpurple/protocols/oscar/oscar.c	cb2283aeac72d003c2cd43140f27b6d9df118867
@@ -3999,9 +3999,6 @@ static int purple_bosrights(OscarData *o
 	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 @@ static int purple_bosrights(OscarData *o
 	 */
 	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 @@ static int purple_ssi_parselist(OscarDat
 	 */
 	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);
 	}