# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1248938814 0
# Node ID f7cc22e0550cdd74e22fef94c0f39951339cd5ba
# Parent  29e07dedfacc3769a5b0215ebba160b15ef5f988# Parent  b5102d206f0cce1cbaabe3d3b0d7fc96f1b26896
merge of '0303b668a76bd19395d6a4feeec2d0c36f2407bf'
     and 'c9da05d4c46b4bbb646f099c087df91cb3b27ab1'

diff -r 29e07dedfacc -r f7cc22e0550c libpurple/protocols/oscar/family_locate.c
--- 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;