From 4e248695248d2c749b2d9e892549ba0e9390a3d0 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Tue, 4 Jun 2013 18:11:15 +0100
Subject: Add and use no proxy list option

---
 gtk/dialogs/preferences.c | 12 ++++++++++++
 gtk/res/options.gtk3.ui   | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

(limited to 'gtk')

diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c
index f17f1ccb0..0669f8d9f 100644
--- a/gtk/dialogs/preferences.c
+++ b/gtk/dialogs/preferences.c
@@ -45,6 +45,7 @@ struct ppref {
 	GtkEntry *entryProxyHost;
 	GtkEntry *entryProxyUser;
 	GtkEntry *entryProxyPassword;
+	GtkEntry *entryProxyNoproxy;
 	GtkSpinButton *spinProxyPort;
 
 	/* dynamic list stores */
@@ -200,6 +201,7 @@ static void set_proxy_widgets_sensitivity(int proxyval, struct ppref *priv)
 	gboolean port;
 	gboolean user;
 	gboolean pass;
+	gboolean noproxy;
 
 	switch (proxyval) {
 	case 0: /* no proxy */
@@ -207,6 +209,7 @@ static void set_proxy_widgets_sensitivity(int proxyval, struct ppref *priv)
 		port = FALSE;
 		user = FALSE;
 		pass = FALSE;
+		noproxy = FALSE;
 		break;
 
 	case 1: /* proxy with no auth */
@@ -214,6 +217,7 @@ static void set_proxy_widgets_sensitivity(int proxyval, struct ppref *priv)
 		port = TRUE;
 		user = FALSE;
 		pass = FALSE;
+		noproxy = TRUE;
 		break;
 
 	case 2: /* proxy with basic auth */
@@ -221,6 +225,7 @@ static void set_proxy_widgets_sensitivity(int proxyval, struct ppref *priv)
 		port = TRUE;
 		user = TRUE;
 		pass = TRUE;
+		noproxy = TRUE;
 		break;
 
 	case 3: /* proxy with ntlm auth */
@@ -228,6 +233,7 @@ static void set_proxy_widgets_sensitivity(int proxyval, struct ppref *priv)
 		port = TRUE;
 		user = TRUE;
 		pass = TRUE;
+		noproxy = TRUE;
 		break;
 
 	case 4: /* system proxy */
@@ -235,6 +241,7 @@ static void set_proxy_widgets_sensitivity(int proxyval, struct ppref *priv)
 		port = FALSE;
 		user = FALSE;
 		pass = FALSE;
+		noproxy = FALSE;
 		break;
 
 	default:
@@ -245,6 +252,7 @@ static void set_proxy_widgets_sensitivity(int proxyval, struct ppref *priv)
 	gtk_widget_set_sensitive(GTK_WIDGET(priv->spinProxyPort), port);
 	gtk_widget_set_sensitive(GTK_WIDGET(priv->entryProxyUser), user);
 	gtk_widget_set_sensitive(GTK_WIDGET(priv->entryProxyPassword), pass);
+	gtk_widget_set_sensitive(GTK_WIDGET(priv->entryProxyNoproxy), noproxy);
 
 }
 
@@ -322,6 +330,9 @@ ENTRY_SIGNALS(entryProxyUser, http_proxy_auth_user)
 /* password */
 ENTRY_SIGNALS(entryProxyPassword, http_proxy_auth_pass)
 
+/* no proxy */
+ENTRY_SIGNALS(entryProxyNoproxy, http_proxy_noproxy)
+
 /* Fetching */
 
 /* maximum fetchers */
@@ -1069,6 +1080,7 @@ GtkWidget* nsgtk_preferences(struct browser_window *bw, GtkWindow *parent)
 	priv->spinProxyPort = GB(SPIN_BUTTON, spinProxyPort);
 	priv->entryProxyUser = GB(ENTRY, entryProxyUser);
 	priv->entryProxyPassword = GB(ENTRY, entryProxyPassword);
+	priv->entryProxyNoproxy = GB(ENTRY, entryProxyNoproxy);
 #undef GB
 
 	/* connect all signals ready to use */
diff --git a/gtk/res/options.gtk3.ui b/gtk/res/options.gtk3.ui
index 233825c88..a795c2bf5 100644
--- a/gtk/res/options.gtk3.ui
+++ b/gtk/res/options.gtk3.ui
@@ -2002,7 +2002,7 @@
                           <object class="GtkTable" id="table2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="n_rows">4</property>
+                            <property name="n_rows">5</property>
                             <property name="n_columns">2</property>
                             <property name="column_spacing">6</property>
                             <property name="row_spacing">6</property>
@@ -2175,6 +2175,36 @@
                                 <property name="bottom_attach">4</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkLabel" id="label55">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">preferencesProxyNoproxy</property>
+                              </object>
+                              <packing>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="entryProxyNoproxy">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="has_tooltip">True</property>
+                                <property name="tooltip_text" translatable="yes">preferencesProxyNoproxyTooltip</property>
+                                <property name="caps_lock_warning">False</property>
+                                <signal name="changed" handler="nsgtk_preferences_entryProxyNoproxy_changed" swapped="no"/>
+                                <signal name="realize" handler="nsgtk_preferences_entryProxyNoproxy_realize" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                              </packing>
+                            </child>
                           </object>
                         </child>
                       </object>
-- 
cgit v1.2.3