# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1271383156 0
# Node ID 787d82881a3ed8d263402da5eda79e487ad66570
# Parent  54289a753667aaadda285409dd2111a0d9eb2463
Rename this flag and add a happy bumble bee comment

diff -r 54289a753667 -r 787d82881a3e libpurple/protocols/oscar/family_icbm.c
--- a/libpurple/protocols/oscar/family_icbm.c	Thu Apr 15 04:21:55 2010 +0000
+++ b/libpurple/protocols/oscar/family_icbm.c	Fri Apr 16 01:59:16 2010 +0000
@@ -274,8 +274,8 @@
 			| 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;
 
diff -r 54289a753667 -r 787d82881a3e libpurple/protocols/oscar/oscar.h
--- a/libpurple/protocols/oscar/oscar.h	Thu Apr 15 04:21:55 2010 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Fri Apr 16 01:59:16 2010 +0000
@@ -746,7 +746,21 @@
 #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. */