# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1164666886 0
# Node ID 7ac8259f355d4f9585bd8e08badd2c27e45ebd00
# Parent  9e904eb0c009dca76f390763913894c0446525a8
[gaim-migrate @ 17831]
- change "global proxy settings" to "GNOME proxy settings," when running GNOME
- Make the docklet "click" event happen on mouse-up, rather than mouse-down (otherwise
  in "pending" mode, the mouse-up event will be sent to some other app, and it will
  think it's clicked.
- Make Jabber not create a new dialog in response to closing a dialog. This is part
  of a larger change I'm working on to remove all authentication dialogs, and it just
  happened to be in this tree when I svn ci'ed, and I don't feel like reverting it ;)

committer: Tailor Script <tailor@pidgin.im>

diff -r 9e904eb0c009 -r 7ac8259f355d gtk/gtkaccount.c
--- a/gtk/gtkaccount.c	Mon Nov 27 19:29:00 2006 +0000
+++ b/gtk/gtkaccount.c	Mon Nov 27 22:34:46 2006 +0000
@@ -865,7 +865,8 @@
 
 	gtk_list_store_append(model, &iter);
 	gtk_list_store_set(model, &iter,
-			0, _("Use Global Proxy Settings"),
+			0, gaim_running_gnome() ? _("Use GNOME Proxy Settings")
+			:_("Use Global Proxy Settings"),
 			1, GAIM_PROXY_USE_GLOBAL,
 			-1);
 
diff -r 9e904eb0c009 -r 7ac8259f355d gtk/gtkdocklet-x11.c
--- a/gtk/gtkdocklet-x11.c	Mon Nov 27 19:29:00 2006 +0000
+++ b/gtk/gtkdocklet-x11.c	Mon Nov 27 22:34:46 2006 +0000
@@ -78,7 +78,7 @@
 static void
 docklet_x11_clicked_cb(GtkWidget *button, GdkEventButton *event, void *data)
 {
-	if (event->type != GDK_BUTTON_PRESS)
+	if (event->type != GDK_BUTTON_RELEASE)
 		return;
 
 	gaim_gtk_docklet_clicked(event->button);
@@ -260,7 +260,7 @@
 
 	g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(docklet_x11_embedded_cb), NULL);
 	g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(docklet_x11_destroyed_cb), NULL);
-	g_signal_connect(G_OBJECT(box), "button-press-event", G_CALLBACK(docklet_x11_clicked_cb), NULL);
+	g_signal_connect(G_OBJECT(box), "button-release-event", G_CALLBACK(docklet_x11_clicked_cb), NULL);
 
 	gtk_container_add(GTK_CONTAINER(box), image);
 	gtk_container_add(GTK_CONTAINER(docklet), box);
diff -r 9e904eb0c009 -r 7ac8259f355d libgaim/protocols/jabber/presence.c
--- a/libgaim/protocols/jabber/presence.c	Mon Nov 27 19:29:00 2006 +0000
+++ b/libgaim/protocols/jabber/presence.c	Mon Nov 27 22:34:46 2006 +0000
@@ -185,7 +185,7 @@
 
 	jabber_presence_subscription_set(jap->gc->proto_data, jap->who,
 			"subscribed");
-
+#if 0
 	buddy = gaim_find_buddy(jap->gc->account, jap->who);
 
 	if (buddy) {
@@ -206,7 +206,7 @@
 		gaim_account_request_add(jap->gc->account, jap->who,
 		                         NULL, NULL, NULL);
 	}
-
+#endif
 	g_free(jap->who);
 	g_free(jap);
 }