diff src/gtkprefs.c @ 11878:f672349cfc1c

[gaim-migrate @ 14169] Use GNOME proxy preferences. Works For Me. People are going to go crazy. We'll try it out in beta. committer: Tailor Script <[e-mail]>

--- a/src/gtkprefs.c	Fri Oct 28 21:41:20 2005 +0000
+++ b/src/gtkprefs.c	Fri Oct 28 23:12:04 2005 +0000
@@ -996,99 +996,101 @@
 	g_signal_connect(G_OBJECT(ports_checkbox), "clicked",
 					 G_CALLBACK(gaim_gtk_toggle_sensitive), spin_button);
 
-	vbox = gaim_gtk_make_frame(ret, _("Proxy Server"));
-	prefs_proxy_frame = gtk_vbox_new(FALSE, 0);
-	gaim_gtk_prefs_dropdown(vbox, _("Proxy _type:"), GAIM_PREF_STRING,
-				"/core/proxy/type",
-				_("No proxy"), "none",
-				"SOCKS 4", "socks4",
-				"SOCKS 5", "socks5",
-				"HTTP", "http",
-				_("Use Environmental Settings"), "envvar",
-				NULL);
-	gtk_box_pack_start(GTK_BOX(vbox), prefs_proxy_frame, 0, 0, 0);
-	proxy_info = gaim_global_proxy_get_info();
+	if (!gaim_running_gnome()) {
+		vbox = gaim_gtk_make_frame(ret, _("Proxy Server"));
+		prefs_proxy_frame = gtk_vbox_new(FALSE, 0);
+		gaim_gtk_prefs_dropdown(vbox, _("Proxy _type:"), GAIM_PREF_STRING,
+					"/core/proxy/type",
+					_("No proxy"), "none",
+					"SOCKS 4", "socks4",
+					"SOCKS 5", "socks5",
+					"HTTP", "http",
+					_("Use Environmental Settings"), "envvar",
+					NULL);
+		gtk_box_pack_start(GTK_BOX(vbox), prefs_proxy_frame, 0, 0, 0);
+		proxy_info = gaim_global_proxy_get_info();
 
-	gaim_prefs_connect_callback(prefs, "/core/proxy/type",
-				    proxy_changed_cb, prefs_proxy_frame);
-
-	table = gtk_table_new(4, 2, FALSE);
-	gtk_container_set_border_width(GTK_CONTAINER(table), 0);
-	gtk_table_set_col_spacings(GTK_TABLE(table), 5);
-	gtk_table_set_row_spacings(GTK_TABLE(table), 10);
-	gtk_container_add(GTK_CONTAINER(prefs_proxy_frame), table);
+		gaim_prefs_connect_callback(prefs, "/core/proxy/type",
+					    proxy_changed_cb, prefs_proxy_frame);
+	
+		table = gtk_table_new(4, 2, FALSE);
+		gtk_container_set_border_width(GTK_CONTAINER(table), 0);
+		gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+		gtk_table_set_row_spacings(GTK_TABLE(table), 10);
+		gtk_container_add(GTK_CONTAINER(prefs_proxy_frame), table);
 
 
-	label = gtk_label_new_with_mnemonic(_("_Host:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+		label = gtk_label_new_with_mnemonic(_("_Host:"));
+		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
 
-	entry = gtk_entry_new();
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
-	gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
-	g_signal_connect(G_OBJECT(entry), "changed",
-					 G_CALLBACK(proxy_print_option), (void *)PROXYHOST);
+		entry = gtk_entry_new();
+		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
+		gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
+		g_signal_connect(G_OBJECT(entry), "changed",
+				 G_CALLBACK(proxy_print_option), (void *)PROXYHOST);
 
-	if (proxy_info != NULL && gaim_proxy_info_get_host(proxy_info))
-		gtk_entry_set_text(GTK_ENTRY(entry),
-						   gaim_proxy_info_get_host(proxy_info));
+		if (proxy_info != NULL && gaim_proxy_info_get_host(proxy_info))
+			gtk_entry_set_text(GTK_ENTRY(entry),
+					   gaim_proxy_info_get_host(proxy_info));
 
-	hbox = gtk_hbox_new(TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gaim_set_accessible_label (entry, label);
+		hbox = gtk_hbox_new(TRUE, 5);
+		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+		gaim_set_accessible_label (entry, label);
 
-	label = gtk_label_new_with_mnemonic(_("_Port:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-	gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
+		label = gtk_label_new_with_mnemonic(_("_Port:"));
+		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+		gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
 
-	entry = gtk_entry_new();
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
-	gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
-	g_signal_connect(G_OBJECT(entry), "changed",
-					 G_CALLBACK(proxy_print_option), (void *)PROXYPORT);
+		entry = gtk_entry_new();
+		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
+		gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
+		g_signal_connect(G_OBJECT(entry), "changed",
+				 G_CALLBACK(proxy_print_option), (void *)PROXYPORT);
 
-	if (proxy_info != NULL && gaim_proxy_info_get_port(proxy_info) != 0) {
-		char buf[128];
-		g_snprintf(buf, sizeof(buf), "%d",
+		if (proxy_info != NULL && gaim_proxy_info_get_port(proxy_info) != 0) {
+			char buf[128];
+			g_snprintf(buf, sizeof(buf), "%d",
 				   gaim_proxy_info_get_port(proxy_info));
 
-		gtk_entry_set_text(GTK_ENTRY(entry), buf);
-	}
-	gaim_set_accessible_label (entry, label);
+			gtk_entry_set_text(GTK_ENTRY(entry), buf);
+		}
+		gaim_set_accessible_label (entry, label);
 
-	label = gtk_label_new_with_mnemonic(_("_User:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+		label = gtk_label_new_with_mnemonic(_("_User:"));
+		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+		gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
 
-	entry = gtk_entry_new();
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
-	gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
-	g_signal_connect(G_OBJECT(entry), "changed",
-					 G_CALLBACK(proxy_print_option), (void *)PROXYUSER);
+		entry = gtk_entry_new();
+		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
+		gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+		g_signal_connect(G_OBJECT(entry), "changed",
+				 G_CALLBACK(proxy_print_option), (void *)PROXYUSER);
 
-	if (proxy_info != NULL && gaim_proxy_info_get_username(proxy_info) != NULL)
-		gtk_entry_set_text(GTK_ENTRY(entry),
+		if (proxy_info != NULL && gaim_proxy_info_get_username(proxy_info) != NULL)
+			gtk_entry_set_text(GTK_ENTRY(entry),
 						   gaim_proxy_info_get_username(proxy_info));
 
-	hbox = gtk_hbox_new(TRUE, 5);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gaim_set_accessible_label (entry, label);
+		hbox = gtk_hbox_new(TRUE, 5);
+		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+		gaim_set_accessible_label (entry, label);
 
-	label = gtk_label_new_with_mnemonic(_("Pa_ssword:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
-	gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
+		label = gtk_label_new_with_mnemonic(_("Pa_ssword:"));
+		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
+		gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
 
-	entry = gtk_entry_new();
-	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
-	gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 1, 2, GTK_FILL , 0, 0, 0);
-	gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
-	g_signal_connect(G_OBJECT(entry), "changed",
-					 G_CALLBACK(proxy_print_option), (void *)PROXYPASS);
+		entry = gtk_entry_new();
+		gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
+		gtk_table_attach(GTK_TABLE(table), entry, 3, 4, 1, 2, GTK_FILL , 0, 0, 0);
+		gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+		g_signal_connect(G_OBJECT(entry), "changed",
+				 G_CALLBACK(proxy_print_option), (void *)PROXYPASS);
 
-	if (proxy_info != NULL && gaim_proxy_info_get_password(proxy_info) != NULL)
-		gtk_entry_set_text(GTK_ENTRY(entry),
-						   gaim_proxy_info_get_password(proxy_info));
-	gaim_set_accessible_label (entry, label);
+		if (proxy_info != NULL && gaim_proxy_info_get_password(proxy_info) != NULL)
+			gtk_entry_set_text(GTK_ENTRY(entry),
+					   gaim_proxy_info_get_password(proxy_info));
+		gaim_set_accessible_label (entry, label);
+	}
 
 	gtk_widget_show_all(ret);
 	if (proxy_info == NULL ||