# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1181567334 0
# Node ID 751fbc2eff7e4cd95d3bbd517c2af6f990490923
# Parent  4c05f284253bf57af5a5bd03964bfde2e221cbab# Parent  18b62b0fc2531cc7ff03b9939f092d5d4b2fe06a
merge of '3b80bf600e31f234766ed90a7bba5ea586178f08'
     and '3c31f6f6c8e998f6e9c550e05bf5dfdcdc9bb154'

diff -r 18b62b0fc253 -r 751fbc2eff7e libpurple/plugins/buddynote.c
--- a/libpurple/plugins/buddynote.c	Mon Jun 11 08:45:54 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Mon Jun 11 13:08:54 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);
diff -r 18b62b0fc253 -r 751fbc2eff7e pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Mon Jun 11 08:45:54 2007 +0000
+++ b/pidgin/gtkblist.c	Mon Jun 11 13:08:54 2007 +0000
@@ -3740,8 +3740,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);
 
diff -r 18b62b0fc253 -r 751fbc2eff7e pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Mon Jun 11 08:45:54 2007 +0000
+++ b/pidgin/gtkutils.c	Mon Jun 11 13:08:54 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)