# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1185214618 0
# Node ID fb52154f3c70e311b87eaab6c830ebc0d7ab5374
# Parent  b9a6272f4039c006a0fd06329f56dd9c093e357d# Parent  2a2cc0b57d8f1783ae9b90baa80970c5fd22db3e
propagate from branch 'im.pidgin.pidgin' (head 53b8831e57f625eca0980aca94f04416b32bcd8f)
            to branch 'im.pidgin.cpw.khc.msnp14' (head d612ab012593987ec498eea9f36231d44eaa2fed)

diff -r 2a2cc0b57d8f -r fb52154f3c70 libpurple/purple-remote
--- a/libpurple/purple-remote	Sun Jul 22 18:17:41 2007 +0000
+++ b/libpurple/purple-remote	Mon Jul 23 18:16:58 2007 +0000
@@ -59,7 +59,7 @@
     quit
 
     PurpleAccountsFindConnected?name=&protocol=prpl-jabber
-    PurpleAccountFindConnected(,prpl-jabber)
+    PurpleAccountsFindConnected(,prpl-jabber)
 """ % sys.argv[0]
 
 cpurple = CheckedObject(purple)
diff -r 2a2cc0b57d8f -r fb52154f3c70 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sun Jul 22 18:17:41 2007 +0000
+++ b/pidgin/gtkconv.c	Mon Jul 23 18:16:58 2007 +0000
@@ -8622,7 +8622,7 @@
 					   TRUE, GTK_PACK_START);
 
 	/* show the widgets */
-/* XXX	gtk_widget_show(gtkconv->icon); */
+	gtk_widget_show(gtkconv->icon);
 	gtk_widget_show(gtkconv->tab_label);
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs"))
 		gtk_widget_show(gtkconv->close);
diff -r 2a2cc0b57d8f -r fb52154f3c70 pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c	Sun Jul 22 18:17:41 2007 +0000
+++ b/pidgin/gtkrequest.c	Mon Jul 23 18:16:58 2007 +0000
@@ -581,9 +581,14 @@
 	/* Create the dialog. */
 	data->dialog = dialog = gtk_dialog_new();
 
+#if GTK_CHECK_VERSION(2,10,0)
+	gtk_window_set_deletable(GTK_WINDOW(data->dialog), FALSE);
+#endif
+
 	if (title != NULL)
 		gtk_window_set_title(GTK_WINDOW(dialog), title);
 #ifdef _WIN32
+	else
 		gtk_window_set_title(GTK_WINDOW(dialog), PIDGIN_ALERT_TITLE);
 #endif