# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1181679563 0
# Node ID 10aba1e6abc919dd5c02e3a343271bc26a916e2b
# Parent  c7df0c2d8eef09c2aeb9b81297b3dbe8f773e6a5# Parent  ae3c3de19ba8bb3f77c91db2f0c3532f4a808e0a
merge of '239c3cd266bcc877339e2d4c9a486bcf2be02f82'
     and 'e5e7f4ffa8d8176a0b76cc7087fd8ad987d04566'

diff -r c7df0c2d8eef -r 10aba1e6abc9 libpurple/plugins/buddynote.c
--- a/libpurple/plugins/buddynote.c	Tue Jun 12 18:28:10 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Tue Jun 12 20:19:23 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 c7df0c2d8eef -r 10aba1e6abc9 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Jun 12 18:28:10 2007 +0000
+++ b/pidgin/gtkblist.c	Tue Jun 12 20:19:23 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 c7df0c2d8eef -r 10aba1e6abc9 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Tue Jun 12 18:28:10 2007 +0000
+++ b/pidgin/gtkutils.c	Tue Jun 12 20:19:23 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)
diff -r c7df0c2d8eef -r 10aba1e6abc9 po/stats.pl
--- a/po/stats.pl	Tue Jun 12 18:28:10 2007 +0000
+++ b/po/stats.pl	Tue Jun 12 20:19:23 2007 +0000
@@ -33,6 +33,7 @@
 $lang{pt_BR} = "Portuguese (Brazilian)";
 $lang{'sr@Latn'} = "Serbian (Latin)";
 $lang{zh_CN} = "Chinese (Simplified)";
+$lang{zh_HK} = "Chinese (Hong Kong)";
 $lang{zh_TW} = "Chinese (Traditional)";
 
 opendir(DIR, ".") || die "can't open directory: $!";