pidgin.2.x.y: 984ce8bc: *** Plucked rev adb5993fd26854de08af6ca2...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 984ce8bc800d4d6e81e152613f6440c0506636cd
Parent:   00a8c1c9fb17831714dc19691539024018df2e9b
Author:   markdoliner at pidgin.im
Date:     02/15/12 04:44:50
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/984ce8bc800d4d6e81e152613f6440c0506636cd

Changelog: 

*** Plucked rev adb5993fd26854de08af6ca2864eeb3fe1fc8c1d (qulogic at pidgin.im):
Add support for the GNOME3 Network dialog.

Closes #13882.

Changes against parent 00a8c1c9fb17831714dc19691539024018df2e9b

  patched  pidgin/gtkprefs.c

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	f35a70cbab14173359e1b5ce8cb15394ff73c554
+++ pidgin/gtkprefs.c	284f0758a6ca6c61f06f73feaa2d69a72dbe15d0
@@ -2036,6 +2036,14 @@ proxy_page(void)
 		path = g_find_program_in_path("gnome-network-properties");
 		if (path == NULL)
 			path = g_find_program_in_path("gnome-network-preferences");
+		if (path == NULL) {
+			path = g_find_program_in_path("gnome-control-center");
+			if (path != NULL) {
+				char *tmp = g_strdup_printf("%s network", path);
+				g_free(path);
+				path = tmp;
+			}
+		}
 
 		if (path == NULL) {
 			label = gtk_label_new(NULL);