Mercurial > pidgin
changeset 17594:4c05f284253b
merge of '3205351f2b94e04ee5972a3f2bc1c8218ac95fe6'
and 'f68bc95ec93e616afdf0527fc982ff5f226f5463'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 11 Jun 2007 01:44:07 +0000 |
| parents | 0e445e906cfd (diff) 6d3d7ee05b06 (current diff) |
| children | 751fbc2eff7e |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/buddynote.c Mon Jun 11 01:02:18 2007 +0000 +++ b/libpurple/plugins/buddynote.c Mon Jun 11 01:44:07 2007 +0000 @@ -58,6 +58,9 @@ { PurpleMenuAction *bna = NULL; + if (purple_blist_node_get_flags(node) & PURPLE_BLIST_NODE_FLAG_NO_SAVE) + return; + *m = g_list_append(*m, bna); bna = purple_menu_action_new(_("Edit Notes..."), PURPLE_CALLBACK(buddynote_edit_cb), NULL, NULL); *m = g_list_append(*m, bna);
--- a/pidgin/gtkblist.c Mon Jun 11 01:02:18 2007 +0000 +++ b/pidgin/gtkblist.c Mon Jun 11 01:44:07 2007 +0000 @@ -3733,8 +3733,11 @@ gboolean pidgin_blist_node_is_contact_expanded(PurpleBlistNode *node) { - if PURPLE_BLIST_NODE_IS_BUDDY(node) + if (PURPLE_BLIST_NODE_IS_BUDDY(node)) { node = node->parent; + if (node == NULL) + return FALSE; + } g_return_val_if_fail(PURPLE_BLIST_NODE_IS_CONTACT(node), FALSE);
--- a/pidgin/gtkutils.c Mon Jun 11 01:02:18 2007 +0000 +++ b/pidgin/gtkutils.c Mon Jun 11 01:44:07 2007 +0000 @@ -2038,6 +2038,7 @@ static void screenname_autocomplete_destroyed_cb(GtkWidget *widget, gpointer data) { + g_free(data); purple_signals_disconnect_by_handle(widget); } @@ -2119,7 +2120,7 @@ purple_signal_connect(purple_accounts_get_handle(), "account-removed", entry, PURPLE_CALLBACK(repopulate_autocomplete), cb_data); - g_signal_connect(G_OBJECT(entry), "destroy", G_CALLBACK(screenname_autocomplete_destroyed_cb), NULL); + g_signal_connect(G_OBJECT(entry), "destroy", G_CALLBACK(screenname_autocomplete_destroyed_cb), data); } void pidgin_set_cursor(GtkWidget *widget, GdkCursorType cursor_type)