pidgin: f7840b15: Set the "we support SMS!" ICBM flag. Th...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: f7840b15d24f0c00bab1233780002441e3b642dc
Ancestor: d7e144520671c33e5061a46179202923757a5f10
Author: markdoliner at pidgin.im
Date: 2009-07-14T07:06:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f7840b15d24f0c00bab1233780002441e3b642dc

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

ChangeLog: 

Set the "we support SMS!" ICBM flag.  This causes buddies with mobile
forwarding to show up online and allows us to IM them.  It's a bit
weird that an ICBM flag affects the presence that gets sent to us.

I also cleaned up these flags a little and added a #define for each
value.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_icbm.c	b134407f14229d10bd0e4d010288f41793c55230
+++ libpurple/protocols/oscar/family_icbm.c	b601915b549a1b3c7743457c2bedef1f113c41bb
@@ -221,7 +221,11 @@ static int aim_im_paraminfo(OscarData *o
 	params.maxrecverwarn = byte_stream_get16(bs);
 	params.minmsginterval = byte_stream_get32(bs);
 
-	params.flags = 0x0000000b | AIM_IMPARAM_FLAG_SUPPORT_OFFLINEMSGS;
+	params.flags = AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED
+			| AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED
+			| AIM_IMPARAM_FLAG_EVENTS_ALLOWED
+			| AIM_IMPARAM_FLAG_SMS_SUPPORTED
+			| AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED;
 	params.maxmsglen = 8000;
 	params.minmsginterval = 0;
 
============================================================
--- libpurple/protocols/oscar/oscar.h	778c3c2ffc9d791757e8caa92cabf4f6a27e170f
+++ libpurple/protocols/oscar/oscar.h	7dfc12db119944b628dacaaa186f33b82be48332
@@ -732,23 +732,27 @@ void aim_ads_requestads(OscarData *od, F
 #define AIM_TRANSFER_DENY_DECLINE	0x0001
 #define AIM_TRANSFER_DENY_NOTACCEPTING	0x0002
 
-#define AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED       0x00000001
-#define AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED    0x00000002
-#define AIM_IMPARAM_FLAG_SUPPORT_OFFLINEMSGS    0x00000100
+#define AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED   0x00000001
+#define AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED   0x00000002
+#define AIM_IMPARAM_FLAG_EVENTS_ALLOWED         0x00000008
+#define AIM_IMPARAM_FLAG_SMS_SUPPORTED          0x00000010
+#define AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED   0x00000100
 
 /* This is what the server will give you if you don't set them yourself. */
+/* This is probably out of date. */
 #define AIM_IMPARAM_DEFAULTS { \
 	0, \
-	AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED, \
+	AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED, \
 	512, /* !! Note how small this is. */ \
 	(99.9)*10, (99.9)*10, \
 	1000 /* !! And how large this is. */ \
 }
 
 /* This is what most AIM versions use. */
+/* This is probably out of date. */
 #define AIM_IMPARAM_REASONABLE { \
 	0, \
-	AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED, \
+	AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED, \
 	8000, \
 	(99.9)*10, (99.9)*10, \
 	0 \