cpw.rekkanoryo.prefs_window: 79639d89: In GNOME 2.26, the program gnome-network...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 79639d895e39ef23c24691d0736a265373e2b49c
Ancestor: ccaa3f4966cf3d09102b8520524d34560d78fc97
Author: qulogic at pidgin.im
Date: 2009-11-16T08:06:20
Branch: im.pidgin.cpw.rekkanoryo.prefs_window
URL: http://d.pidgin.im/viewmtn/revision/info/79639d895e39ef23c24691d0736a265373e2b49c

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

In GNOME 2.26, the program gnome-network-preferences was renamed to
gnome-network-properties. Try to find both of these when constructing the
Proxy prefs page.

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	3bc4d204976f45849852089cc55d66a89eddae33
+++ pidgin/gtkprefs.c	9eff16219d5923f9043c386986adfc52f7ef981e
@@ -1589,11 +1589,11 @@ static void
 }
 
 static void
-proxy_button_clicked_cb(GtkWidget *button, gpointer null)
+proxy_button_clicked_cb(GtkWidget *button, gchar *program)
 {
 	GError *err = NULL;
 
-	if (g_spawn_command_line_async ("gnome-network-preferences", &err))
+	if (g_spawn_command_line_async(program, &err))
 		return;
 
 	purple_notify_error(NULL, NULL, _("Cannot start proxy configuration program."), err->message);
@@ -1951,7 +1951,7 @@ proxy_page(void)
 	prefs_proxy_frame = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 
 	if(purple_running_gnome()) {
-		gchar *path = g_find_program_in_path("gnome-network-preferences");
+		gchar *path = NULL;
 
 		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 		label = gtk_label_new(_("Proxy preferences are configured in GNOME preferences"));
@@ -1961,6 +1961,10 @@ proxy_page(void)
 		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 		gtk_container_add(GTK_CONTAINER(vbox), hbox);
 
+		path = g_find_program_in_path("gnome-network-properties");
+		if (path == NULL)
+			path = g_find_program_in_path("gnome-network-preferences");
+
 		if (path == NULL) {
 			label = gtk_label_new(NULL);
 			gtk_label_set_markup(GTK_LABEL(label),
@@ -1969,11 +1973,13 @@ proxy_page(void)
 		} else {
 			proxy_button = gtk_button_new_with_mnemonic(_("Configure _Proxy"));
 			g_signal_connect(G_OBJECT(proxy_button), "clicked",
-							 G_CALLBACK(proxy_button_clicked_cb), NULL);
+							 G_CALLBACK(proxy_button_clicked_cb),
+							 path);
 			gtk_box_pack_start(GTK_BOX(hbox), proxy_button, FALSE, FALSE, 0);
 		}
 
-		g_free(path);
+		/* NOTE: path leaks, but only when the prefs window is destroyed,
+		         which is never */
 		gtk_widget_show_all(ret);
 	} else {
 		prefs_proxy_subframe = gtk_vbox_new(FALSE, 0);