changeset 27739:f7cc22e0550c

merge of '0303b668a76bd19395d6a4feeec2d0c36f2407bf' and 'c9da05d4c46b4bbb646f099c087df91cb3b27ab1'
author Mark Doliner <mark@kingant.net>
date Thu, 30 Jul 2009 07:26:54 +0000
parents 29e07dedfacc (current diff) b5102d206f0c (diff)
children 86d4084c195d
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_locate.c	Thu Jul 30 05:24:52 2009 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Thu Jul 30 07:26:54 2009 +0000
@@ -615,13 +615,15 @@
 			 * User flags
 			 *
 			 * Specified as any of the following ORed together:
-			 *      0x0001  Trial (user less than 60days)
+			 *      0x0001  Unconfirmed account
 			 *      0x0002  Unknown bit 2
 			 *      0x0004  AOL Main Service user
 			 *      0x0008  Unknown bit 4
 			 *      0x0010  Free (AIM) user
 			 *      0x0020  Away
-			 *      0x0400  ActiveBuddy
+			 *      0x0040  ICQ user (AIM bit also set)
+			 *      0x0080  Mobile device
+			 *      0x0400  Bot (like ActiveBuddy)
 			 */
 			outinfo->flags = byte_stream_get16(bs);
 			outinfo->present |= AIM_USERINFO_PRESENT_FLAGS;