Mercurial > pidgin
changeset 21934:cebfc2263199
merge of '4fa938e6f980314ccc4a44725eb809c3b5a4fcbc'
and '6c2e7fa15994f21e52019f1bce7323acdad62892'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 24 Dec 2007 10:40:28 +0000 |
| parents | a368ee78a798 (diff) 7d0ef1e3ac4f (current diff) |
| children | d230e1cfff62 94dad52b61b4 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Mon Dec 24 04:56:23 2007 +0000 +++ b/pidgin/gtkblist.c Mon Dec 24 10:40:28 2007 +0000 @@ -409,6 +409,7 @@ static void gtk_blist_renderer_editing_cancelled_cb(GtkCellRenderer *renderer, PurpleBuddyList *list) { editing_blist = FALSE; + g_object_set(G_OBJECT(renderer), "editable", FALSE, NULL); pidgin_blist_refresh(list); } @@ -534,12 +535,14 @@ if (node_alias && !g_utf8_collate(node_alias, a)) { merges = g_list_append(merges, buddy); i++; + g_free(node_alias); + break; } g_free(node_alias); } } g_free(a); - + if (i > 1) { char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias); @@ -3309,7 +3312,7 @@ /* Accounts with buddies in group */ accounts = purple_group_get_accounts(group); for (; accounts != NULL; - accounts = g_slist_remove_link(accounts, accounts)) { + accounts = g_slist_delete_link(accounts, accounts)) { PurpleAccount *account = accounts->data; purple_notify_user_info_add_pair(user_info, _("Account"), purple_account_get_username(account)); }
--- a/pidgin/pidgincombobox.c Mon Dec 24 04:56:23 2007 +0000 +++ b/pidgin/pidgincombobox.c Mon Dec 24 10:40:28 2007 +0000 @@ -2980,7 +2980,7 @@ g_return_if_fail (link != NULL); - combo_box->priv->cells = g_slist_remove_link (combo_box->priv->cells, link); + combo_box->priv->cells = g_slist_delete_link (combo_box->priv->cells, link); combo_box->priv->cells = g_slist_insert (combo_box->priv->cells, info, position);