Mercurial > pidgin
diff libpurple/protocols/qq/qq_process.c @ 23880:1a0caf9983fa
applied changes from 92d52eef2994d2697999177804e3665989cfa352
through 5688199e261449d33b5803dafff50d860896ebcb
Reapplied 5688199e261449d33b5803dafff50d860896ebcb.
2008.09.04 - ccpaging <ccpaging(at)gmail.com>
* minor code cleaned
committer: Daniel Atallah <daniel.atallah@gmail.com>
author | SHiNE CsyFeK <csyfek@gmail.com> |
---|---|
date | Mon, 15 Sep 2008 03:02:06 +0000 |
parents | 23cec4360d4a |
children | 69c218fd5d54 |
line wrap: on
line diff
--- a/libpurple/protocols/qq/qq_process.c Mon Sep 15 03:01:03 2008 +0000 +++ b/libpurple/protocols/qq/qq_process.c Mon Sep 15 03:02:06 2008 +0000 @@ -78,7 +78,7 @@ msg_utf8 = try_dump_as_gbk(data, data_len); if (msg_utf8 != NULL) { - purple_notify_info(gc, title, msg_utf8, NULL); + purple_notify_info(gc, _("QQ Error"), title, msg_utf8); g_free(msg_utf8); } } @@ -130,6 +130,7 @@ static void process_room_cmd_notify(PurpleConnection *gc, guint8 room_cmd, guint8 room_id, guint8 reply, guint8 *data, gint data_len) { + gchar *prim; gchar *msg, *msg_utf8; g_return_if_fail(data != NULL && data_len > 0); @@ -137,11 +138,12 @@ msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT); g_free(msg); - msg = g_strdup_printf(_("Command %s(0x%02X) id %d, reply [0x%02X]:\n%s"), - qq_get_room_cmd_desc(room_cmd), room_cmd, room_id, reply, msg_utf8); + prim = g_strdup_printf(_("Error reply of %s(0x%02X)\nRoom %d, reply 0x%02X"), + qq_get_room_cmd_desc(room_cmd), room_cmd, room_id, reply); - purple_notify_error(gc, NULL, _("Invalid QQ Qun reply"), msg); - g_free(msg); + purple_notify_error(gc, _("QQ Qun Command"), prim, msg_utf8); + + g_free(prim); g_free(msg_utf8); } @@ -343,7 +345,7 @@ purple_debug_warning("QQ", "Invaild room id, [%05d], 0x%02X %s for %d, len %d\n", seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len); - return; + /* Some room cmd has no room id, like QQ_ROOM_CMD_SEARCH */ } if (data_len <= 2) {