diff options
| author | SHiNE CsyFeK <csyfek@gmail.com> | 2008-10-28 16:35:06 +0000 |
|---|---|---|
| committer | SHiNE CsyFeK <csyfek@gmail.com> | 2008-10-28 16:35:06 +0000 |
| commit | 960db935706d17b30f10ae00feb8ef20c9a88b7a (patch) | |
| tree | 92b50657c388a287ab60d6ae55decf037b55549b | |
| parent | 20e4ac0b2e6bd6addf1d2242ce966a29004717a0 (diff) | |
| download | pidgin-960db935706d17b30f10ae00feb8ef20c9a88b7a.tar.gz | |
2008.10.08 - ccpaging <ccpaging(at)gmail.com>
* Update 'group' protocol
| -rw-r--r-- | libpurple/protocols/qq/ChangeLog | 3 | ||||
| -rw-r--r-- | libpurple/protocols/qq/buddy_info.c | 6 | ||||
| -rw-r--r-- | libpurple/protocols/qq/buddy_list.c | 12 |
3 files changed, 11 insertions, 10 deletions
diff --git a/libpurple/protocols/qq/ChangeLog b/libpurple/protocols/qq/ChangeLog index cc4bb7b6af..ab1396be32 100644 --- a/libpurple/protocols/qq/ChangeLog +++ b/libpurple/protocols/qq/ChangeLog @@ -1,4 +1,7 @@ 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> diff --git a/libpurple/protocols/qq/buddy_info.c b/libpurple/protocols/qq/buddy_info.c index e246f3be99..436bee162a 100644 --- a/libpurple/protocols/qq/buddy_info.c +++ b/libpurple/protocols/qq/buddy_info.c @@ -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(PurpleAccount *account, const gchar *who, gint fac 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); diff --git a/libpurple/protocols/qq/buddy_list.c b/libpurple/protocols/qq/buddy_list.c index fb56246311..69975dba35 100644 --- a/libpurple/protocols/qq/buddy_list.c +++ b/libpurple/protocols/qq/buddy_list.c @@ -252,7 +252,7 @@ guint8 qq_process_get_buddies_online(guint8 *data, gint data_len, PurpleConnecti } 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 *data, gint data_len, PurpleConn 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(guint8 *data, gint data_len, PurpleConn 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; |