pidgin: 16e3534d: Rename this flag and add a happy bumble ...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 16e3534d66c6f48b22fda1a9decd929533d7b68e
Ancestor: f88202d487eede36a5891f32d7b0298a928f28ec
Author: markdoliner at pidgin.im
Date: 2010-04-16T01:59:16
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/16e3534d66c6f48b22fda1a9decd929533d7b68e

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

ChangeLog: 

Rename this flag and add a happy bumble bee comment

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_icbm.c	fe06ada266557477a7233fbc4bd48cdef5849db7
+++ libpurple/protocols/oscar/family_icbm.c	ad2d81ea4dca8c901aa18d21961b1b2309e9f6f9
@@ -274,8 +274,8 @@ static int aim_im_paraminfo(OscarData *o
 			| AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED
 			| AIM_IMPARAM_FLAG_EVENTS_ALLOWED
 			| AIM_IMPARAM_FLAG_SMS_SUPPORTED
-			| AIM_IMPARAM_FLAG_SEND_ME_HTML_FOR_ICQ
-			| AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED;
+			| AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED
+			| AIM_IMPARAM_FLAG_USE_HTML_FOR_ICQ;
 	params.maxmsglen = 8000;
 	params.minmsginterval = 0;
 
============================================================
--- libpurple/protocols/oscar/oscar.h	fc6010babfdea02cdecb5dcd6e8d46548a7210b5
+++ libpurple/protocols/oscar/oscar.h	7ee7698542e3eb51c8cb983e68ed79bc90c609b5
@@ -746,8 +746,22 @@ void aim_ads_requestads(OscarData *od, F
 #define AIM_IMPARAM_FLAG_EVENTS_ALLOWED         0x00000008
 #define AIM_IMPARAM_FLAG_SMS_SUPPORTED          0x00000010
 #define AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED   0x00000100
-#define AIM_IMPARAM_FLAG_SEND_ME_HTML_FOR_ICQ   0x00000400
 
+/**
+ * This flag tells the server that we always send HTML in messages
+ * sent from an ICQ account to an ICQ account.  (If this flag is
+ * not sent then plaintext is sent ICQ<-->ICQ (HTML is sent in all
+ * other cases)).
+ *
+ * If we send an HTML message to an old client that doesn't support
+ * HTML messages, then the oscar servers will merrily strip the HTML
+ * for us.
+ *
+ * When we receive an IM we look at the features on the ICBM to
+ * determine if the message is HTML or plaintext.
+ */
+#define AIM_IMPARAM_FLAG_USE_HTML_FOR_ICQ       0x00000400
+
 /* 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 { \