Mercurial > pidgin.yaz
comparison libpurple/protocols/qq/group_search.c @ 23755:23cec4360d4a
applied changes from 8cebefbc6cd5d84acb69c74e69e8821f11dd225d
through 92d52eef2994d2697999177804e3665989cfa352
Reapplied 92d52eef2994d2697999177804e3665989cfa352 at the right time.
2008.09.02 - ccpaging <ccpaging(at)gmail.com>
* Bugfix: can not send message to the QUN blocked adding
* Tickets:
Fixes #6957
Fixes #6990
2008.09.02 - ccpaging <ccpaging(at)gmail.com>
* Use new tactics of information update:
1. send next package till the previous package received
2. fix duplicated get_room_info and get_room_buddies command
committer: Daniel Atallah <daniel.atallah@gmail.com>
author | SHiNE CsyFeK <csyfek@gmail.com> |
---|---|
date | Mon, 15 Sep 2008 03:01:03 +0000 |
parents | 967344bc404d |
children | 6408be948d56 |
comparison
equal
deleted
inserted
replaced
23754:967344bc404d | 23755:23cec4360d4a |
---|---|
114 bytes += qq_get16(&(unknown), data + bytes); | 114 bytes += qq_get16(&(unknown), data + bytes); |
115 bytes += qq_get8(&(group.auth_type), data + bytes); | 115 bytes += qq_get8(&(group.auth_type), data + bytes); |
116 bytes += convert_as_pascal_string(data + bytes, &(group.desc_utf8), QQ_CHARSET_DEFAULT); | 116 bytes += convert_as_pascal_string(data + bytes, &(group.desc_utf8), QQ_CHARSET_DEFAULT); |
117 /* end of one qq_group */ | 117 /* end of one qq_group */ |
118 if(bytes != len) { | 118 if(bytes != len) { |
119 purple_debug_error("QQ", | 119 purple_debug_error("QQ", |
120 "group_cmd_search_group: Dangerous error! maybe protocol changed, notify developers!"); | 120 "group_cmd_search_group: Dangerous error! maybe protocol changed, notify developers!"); |
121 } | 121 } |
122 | 122 |
123 pending_id = qq_get_pending_id(qd->joining_groups, group.ext_id); | 123 pending_id = qq_get_pending_id(qd->joining_groups, group.ext_id); |
124 if (pending_id != NULL) { | 124 if (pending_id != NULL) { |
125 qq_set_pending_id(&qd->joining_groups, group.ext_id, FALSE); | 125 qq_set_pending_id(&qd->joining_groups, group.ext_id, FALSE); |
126 if (qq_room_search_id(gc, group.id) == NULL) | 126 if (qq_room_search_id(gc, group.id) == NULL) |
127 qq_group_create_internal_record(gc, | 127 qq_group_create_internal_record(gc, |
128 group.id, group.ext_id, group.title_utf8); | 128 group.id, group.ext_id, group.title_utf8); |
129 qq_send_cmd_group_join_group(gc, &group); | 129 qq_request_room_join(gc, &group); |
130 } else { | 130 } else { |
131 _qq_setup_roomlist(qd, &group); | 131 _qq_setup_roomlist(qd, &group); |
132 } | 132 } |
133 } | 133 } |