Mercurial > pidgin
changeset 18738:2cfb6ef9ab73
merge of '10d1346d5d54ad467669dbdbeda58088587c5d91'
and '212fdd25c609bad4012e9d24867ba7d9ed6a9998'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 29 Jul 2007 21:29:10 +0000 |
| parents | 3f965b7c7ffa (current diff) bf8b69cba9ae (diff) |
| children | f29794be0163 |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Sun Jul 29 21:12:17 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Sun Jul 29 21:29:10 2007 +0000 @@ -413,8 +413,7 @@ if(chat->conv) { title = g_strdup_printf(_("Error in chat %s"), from); - if (g_hash_table_size(chat->members) == 0) - serv_got_chat_left(js->gc, chat->id); + serv_got_chat_left(js->gc, chat->id); } else { title = g_strdup_printf(_("Error joining chat %s"), from); } @@ -422,9 +421,7 @@ g_free(title); g_free(msg); - if (g_hash_table_size(chat->members) == 0) - /* Only destroy the chat if the error happened while joining */ - jabber_chat_destroy(chat); + jabber_chat_destroy(chat); jabber_id_free(jid); g_free(status); g_free(room_jid);
--- a/libpurple/protocols/oscar/family_chat.c Sun Jul 29 21:12:17 2007 +0000 +++ b/libpurple/protocols/oscar/family_chat.c Sun Jul 29 21:29:10 2007 +0000 @@ -140,23 +140,6 @@ return 0; } -/** - * Subtype 0x0001 - */ -static int -error(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs) -{ - guint16 reason; - - reason = byte_stream_get16(bs); - - /* TODO: Reason 0x000e means invalid SNAC format? Busted SNAC payload? */ - - /* TODO: Read in a TLV list. TLV of type 0x0009 is the error code. Error code 0x0033 means "invalid name." */ - - return 0; -} - /* * Subtype 0x0002 - General room information. Lots of stuff. *
--- a/libpurple/protocols/qq/qq.c Sun Jul 29 21:12:17 2007 +0000 +++ b/libpurple/protocols/qq/qq.c Sun Jul 29 21:29:10 2007 +0000 @@ -747,7 +747,10 @@ { PurpleAccountOption *option; - option = purple_account_option_bool_new(_("Connect using TCP"), "use_tcp", FALSE); + option = purple_account_option_bool_new(_("Login in TCP"), "use_tcp", FALSE); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); + + option = purple_account_option_bool_new(_("Login Hidden"), "hidden", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); option = purple_account_option_string_new(_("Server"), "server", NULL);