pidgin: a2248079: oscar: Update the details of the buddy p...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: a22480793cb17ccde627e2c39d204433fe4c740b
Ancestor: 8c322571bfb4f2d00c9126e59746445f877be296
Author: darkrain42 at pidgin.im
Date: 2009-11-03T18:07:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a22480793cb17ccde627e2c39d204433fe4c740b

Modified files:
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

oscar: Update the details of the buddy preferences based on the OSCAR docs.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_feedbag.c	d4808efd464b029ecff3857b1d2d61a7867ef0c9
+++ libpurple/protocols/oscar/family_feedbag.c	2e846ea5273fdfb01b64f3a2e567f06c4b828770
@@ -1130,9 +1130,11 @@ int aim_ssi_delicon(OscarData *od)
  * should show up as idle or not, etc.
  *
  * @param od The oscar odion.
- * @param presence I think it's a bitmask, but I only know what one of the bits is:
- *        0x00000002 - Hide wireless?
+ * @param presence A bitmask of the first 32 entries [0-31] from
+ *        http://dev.aol.com/aim/oscar/#FEEDBAG__BUDDY_PREFS
+ *        0x00000002 - Hide "eBuddy group" (whatever that is)
  *        0x00000400 - Allow others to see your idle time
+ *        0x00020000 - Don't show Recent Buddies
  * @return Return 0 if no errors, otherwise return the error number.
  */
 int aim_ssi_setpresence(OscarData *od, guint32 presence) {
============================================================
--- libpurple/protocols/oscar/oscar.c	8aa8048150010726641d66d77ed5cb348df8917a
+++ libpurple/protocols/oscar/oscar.c	7aaad1a31b030fd18748c3f00532d6da3f8d194d
@@ -1414,9 +1414,9 @@ idle_reporting_pref_cb(const char *name,
 	presence = aim_ssi_getpresence(od->ssi.local);
 
 	if (report_idle)
-		aim_ssi_setpresence(od, presence | 0x400);
+		aim_ssi_setpresence(od, presence | AIM_SSI_PRESENCE_FLAG_SHOWIDLE);
 	else
-		aim_ssi_setpresence(od, presence & ~0x400);
+		aim_ssi_setpresence(od, presence & ~AIM_SSI_PRESENCE_FLAG_SHOWIDLE);
 }
 
 /**
@@ -5298,9 +5298,9 @@ static int purple_ssi_parselist(OscarDat
 			report_idle = strcmp(idle_reporting_pref, "none") != 0;
 
 			if (report_idle)
-				aim_ssi_setpresence(od, tmp | 0x400);
+				aim_ssi_setpresence(od, tmp | AIM_SSI_PRESENCE_FLAG_SHOWIDLE);
 			else
-				aim_ssi_setpresence(od, tmp & ~0x400);
+				aim_ssi_setpresence(od, tmp & ~AIM_SSI_PRESENCE_FLAG_SHOWIDLE);
 		}
 
 
============================================================
--- libpurple/protocols/oscar/oscar.h	e709c12b5ee15abb9ca81a73cf2904cb302a0a47
+++ libpurple/protocols/oscar/oscar.h	2a0281f7f7f03445e21af8d4f6e66c05edfffe42
@@ -1240,7 +1240,7 @@ int aim_bart_request(OscarData *od, cons
 #define AIM_SSI_ACK_INVALIDNAME		0x000d
 #define AIM_SSI_ACK_AUTHREQUIRED	0x000e
 
-/* These flags are set in the 0x00c9 TLV of SSI teyp 0x0005 */
+/* These flags are set in the 0x00c9 TLV of SSI type 0x0005 */
 #define AIM_SSI_PRESENCE_FLAG_SHOWIDLE        0x00000400
 #define AIM_SSI_PRESENCE_FLAG_NORECENTBUDDIES 0x00020000