Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/galeon/ChangeLog,v
retrieving revision 1.3604
diff -u -r1.3604 ChangeLog
--- ChangeLog	18 May 2003 14:16:28 -0000	1.3604
+++ ChangeLog	19 May 2003 02:19:26 -0000
@@ -1,3 +1,11 @@
+2003-05-19  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* embead/galeon-embed-prefs.h
+	* mozilla/mozilla-notifiers.cpp: Remove the
+	apps/galeon/Advanced/Network/no_proxies_for key and correctly
+	handle the case when system/http_proxy/ignore_hosts is empty or
+	missing.
+
 2003-05-18  Malcolm Tredinnick <malcolm@commsecure.com.au>
 
 	* embed/galeon-embed-prefs.h
Index: galeon.schemas.in
===================================================================
RCS file: /cvs/gnome/galeon/galeon.schemas.in,v
retrieving revision 1.148
diff -u -r1.148 galeon.schemas.in
--- galeon.schemas.in	5 Apr 2003 17:01:03 -0000	1.148
+++ galeon.schemas.in	19 May 2003 02:19:30 -0000
@@ -873,18 +873,6 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/galeon/Advanced/Network/no_proxies_for</key>
-        <applyto>/apps/galeon/Advanced/Network/no_proxies_for</applyto>
-        <owner>galeon</owner>
-        <type>string</type>
-        <default></default>
-        <locale name="C">
-        <short>No proxy for</short>
-        <long>List of domains for wherefore not to use the proxy, comma
-        delimited</long>
-        </locale>
-      </schema>
-      <schema>
         <key>/schemas/apps/galeon/Advanced/Network/proxy_keepalive</key>
         <applyto>/apps/galeon/Advanced/Network/proxy_keepalive</applyto>
         <owner>galeon</owner>
Index: embed/galeon-embed-prefs.h
===================================================================
RCS file: /cvs/gnome/galeon/embed/galeon-embed-prefs.h,v
retrieving revision 1.7
diff -u -r1.7 galeon-embed-prefs.h
--- embed/galeon-embed-prefs.h	18 May 2003 14:16:29 -0000	1.7
+++ embed/galeon-embed-prefs.h	19 May 2003 02:19:31 -0000
@@ -12,7 +12,6 @@
 #define CONF_MOUSE_WHEEL_SHIFT_STEP "/apps/galeon/UI/Mouse/wheel_shift_step"
 #define CONF_MOUSE_WHEEL_STEP_SIZE "/apps/galeon/UI/Mouse/wheel_step_size"
 #define CONF_NETWORK_SOCKS_PROXY_VERSION "/apps/galeon/Advanced/Network/socks_proxy_version"
-#define CONF_NETWORK_NO_PROXIES_FOR "/apps/galeon/Advanced/Network/no_proxies_for"
 #define CONF_NETWORK_PROXY_KA "/apps/galeon/Advanced/Network/proxy_keepalive"
 #define CONF_NETWORK_DISK_CACHE "/apps/galeon/Advanced/Network/disk_cache_size"
 #define CONF_NETWORK_MEMORY_CACHE "/apps/galeon/Advanced/Network/mem_cache_size"
Index: mozilla/mozilla-notifiers.cpp
===================================================================
RCS file: /cvs/gnome/galeon/mozilla/mozilla-notifiers.cpp,v
retrieving revision 1.16
diff -u -r1.16 mozilla-notifiers.cpp
--- mozilla/mozilla-notifiers.cpp	18 May 2003 14:16:29 -0000	1.16
+++ mozilla/mozilla-notifiers.cpp	19 May 2003 02:19:34 -0000
@@ -167,7 +167,6 @@
 	{ CONF_NETWORK_FTP_PROXY_PORT, INT_PREF, "network.proxy.ftp_port"},
 	{ CONF_NETWORK_SSL_PROXY_PORT, INT_PREF, "network.proxy.ssl_port"},
 	{ CONF_NETWORK_SOCKS_PROXY_PORT, INT_PREF, "network.proxy.socks_port"},
-	{ CONF_NETWORK_NO_PROXIES_FOR, STRING_PREF, "network.proxy.no_proxies_on"},
 	{ CONF_NETWORK_PROXY_KA, BOOL_PREF, "network.http.proxy.keep-alive"},
 	{ CONF_NETWORK_MEMORY_CACHE, INT_PREF, "browser.cache.memory.capacity"},
 	{ CONF_NETWORK_DISK_CACHE, INT_PREF, "browser.cache.disk.capacity"},
@@ -282,11 +281,6 @@
 	int i;
 
 	hosts = gconf_value_get_list (entry->value);
-	if (!hosts)
-	{
-		return;
-	}
-
 	strings = g_new (gchar*, g_slist_length (hosts) + 1);
 	for (pos = hosts, i = 0; pos; pos = g_slist_next (pos), ++i)
 	{
