Mercurial > pidgin
changeset 15961:9182d979ce58
merge of 'ee2473f71341ef0bbbc782c3f43a8842b164b543'
and 'f40d11ee7f26ccab21583c3b07cd9e37a62c64e2'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Wed, 28 Mar 2007 14:12:06 +0000 |
| parents | c44bb13db468 (diff) 01aa3497fedf (current diff) |
| children | 65888b6d9373 |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/libgnt/gntfilesel.c Tue Mar 27 21:16:56 2007 +0000 +++ b/finch/libgnt/gntfilesel.c Wed Mar 28 14:12:06 2007 +0000 @@ -301,6 +301,8 @@ gnt_tree_set_row_flags(GNT_TREE(tree), file, GNT_TEXT_FLAG_BOLD); } + gnt_bindable_perform_action_named(GNT_BINDABLE(tree), "move-down", NULL); + return TRUE; }
--- a/libpurple/plugin.c Tue Mar 27 21:16:56 2007 +0000 +++ b/libpurple/plugin.c Wed Mar 28 14:12:06 2007 +0000 @@ -375,7 +375,7 @@ * enter an infinite loop in certain situations by passing * purple_find_plugin_by_id a NULL value. -- ecoffey */ - if (!plugin->info->id || !strcmp(plugin->info->id, "")) + if (plugin->info->id == NULL || *plugin->info->id == '\0') { plugin->error = g_strdup_printf(_("This plugin has not defined an ID.")); purple_debug_error("plugins", "%s is not loadable: info->id is not defined.\n", plugin->path);
--- a/libpurple/protocols/jabber/presence.c Tue Mar 27 21:16:56 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Wed Mar 28 14:12:06 2007 +0000 @@ -288,16 +288,16 @@ if (buddy) { jb = jabber_buddy_find(js, from, TRUE); - if ((jb->subscription & JABBER_SUB_TO) == 0) + if ((jb->subscription & JABBER_SUB_TO)) onlist = TRUE; } - + jap->gc = js->gc; jap->who = g_strdup(from); jap->js = js; purple_account_request_authorization(purple_connection_get_account(js->gc), from, NULL, NULL, NULL, onlist, - G_CALLBACK(authorize_add_cb), G_CALLBACK(deny_add_cb), jap); + G_CALLBACK(authorize_add_cb), G_CALLBACK(deny_add_cb), jap); jabber_id_free(jid); return; } else if(type && !strcmp(type, "subscribed")) {