Mercurial > pidgin
changeset 17591:b1754db7010b
merge of '1e340ceaf355a27660847defa34d87510ce35d6d'
and 'fbd7e09eb7982024bdb675a64ce31c7410e0b220'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 11 Jun 2007 00:23:35 +0000 |
| parents | 91460e381dbc (diff) abc4dcd25c50 (current diff) |
| children | 0e445e906cfd |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/buddynote.c Sun Jun 10 22:22:36 2007 +0000 +++ b/libpurple/plugins/buddynote.c Mon Jun 11 00:23:35 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/gtkutils.c Sun Jun 10 22:22:36 2007 +0000 +++ b/pidgin/gtkutils.c Mon Jun 11 00:23:35 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)