pidgin.openq: 5232f2ce: 2008.10.08 - ccpaging <ccpaging(at)gmail...

[csyfek at gmail.com]

-----------------------------------------------------------------
Revision: 5232f2ceb214e2a461afaae2dc613de5b4dc27cf
Ancestor: 24a25744d34d0648854a70f7729112401fdd62f9
Author: csyfek at gmail.com
Date: 2008-10-28T16:35:06
Branch: im.pidgin.pidgin.openq
URL: http://d.pidgin.im/viewmtn/revision/info/5232f2ceb214e2a461afaae2dc613de5b4dc27cf

Modified files:
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_list.c

ChangeLog: 

2008.10.08 - ccpaging <ccpaging(at)gmail.com>
	* Update 'group' protocol

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/ChangeLog	13e7b6647ac18c88fbcc4c44a037a37ecf812c3c
+++ libpurple/protocols/qq/ChangeLog	e2761b8cf01f1fbd7e0f1933b524fe39ec26d271
@@ -1,4 +1,7 @@ 2008.10.08 - ccpaging <ccpaging(at)gmail
 2008.10.08 - ccpaging <ccpaging(at)gmail.com>
+	* Update 'group' protocol
+
+2008.10.08 - ccpaging <ccpaging(at)gmail.com>
 	* 20081008-1
 
 2008.10.08 - ccpaging <ccpaging(at)gmail.com>
============================================================
--- libpurple/protocols/qq/buddy_info.c	924237fad068f3e64aab3b8590934b3b3316c876
+++ libpurple/protocols/qq/buddy_info.c	e599819be706e143914fcaa3486d3d03e4ed18fc
@@ -165,11 +165,11 @@ static void info_debug(gchar **segments)
 				|| field_infos[index].type == QQ_FIELD_MULTI
 				|| index == QQ_INFO_GENDER)  {
 			utf8_str = qq_to_utf8(segments[index], QQ_CHARSET_DEFAULT);
-			purple_debug_info("QQ_BUDDY_INFO", "%s: %s\n", field_infos[index]. text, utf8_str);
+			purple_debug_info("QQ_BUDDY_INFO", "%s: %s\n", field_infos[index].text, utf8_str);
 			g_free(utf8_str);
 			continue;
 		}
-		purple_debug_info("QQ_BUDDY_INFO", "%s: %s\n", field_infos[index]. text, segments[index]);
+		purple_debug_info("QQ_BUDDY_INFO", "%s: %s\n", field_infos[index].text, segments[index]);
 	}
 }
 #endif
@@ -590,6 +590,8 @@ static void update_buddy_icon(PurpleAcco
 	gchar *icon_file_content;
 	gsize icon_file_size;
 
+	g_return_if_fail(account != NULL && who != NULL);
+	
 	purple_debug_info("QQ", "Update %s icon to %d\n", who, face);
 
 	icon_name = qq_get_icon_name(face);
============================================================
--- libpurple/protocols/qq/buddy_list.c	619029d9cf038596feb7ecffb9128fea2d0cab53
+++ libpurple/protocols/qq/buddy_list.c	d568b55591339363a57d935b1985a02c812d6b9f
@@ -252,7 +252,7 @@ guint8 qq_process_get_buddies_online(gui
 	}
 
 	purple_debug_info("QQ", "Received %d online buddies, nextposition=%u\n",
-							count, (guint) position);
+			count, (guint) position);
 	return position;
 }
 
@@ -357,7 +357,7 @@ guint32 qq_process_get_buddies_and_rooms
 	guint8 sub_cmd, reply_code;
 	guint32 unknown, position;
 	guint32 uid;
-	guint8 type, groupid;
+	guint8 type;
 	qq_group *group;
 
 	g_return_val_if_fail(data != NULL && data_len != 0, -1);
@@ -383,12 +383,8 @@ guint32 qq_process_get_buddies_and_rooms
 		bytes += qq_get32(&uid, data + bytes);
 		/* 04: type 0x1:buddy 0x4:Qun */
 		bytes += qq_get8(&type, data + bytes);
-		/* 05: groupid*4 */ /* seems to always be 0 */
-		bytes += qq_get8(&groupid, data + bytes);
-		/*
-		   purple_debug_info("QQ", "groupid: %i\n", groupid);
-		   groupid >>= 2;
-		   */
+		/* 05: skip unknow 0x00 */
+		bytes += 1;
 		if (uid == 0 || (type != 0x1 && type != 0x4)) {
 			purple_debug_info("QQ", "Buddy entry, uid=%d, type=%d", uid, type);
 			continue;