diff options
Diffstat (limited to 'embed/mozilla/mozilla-embed-single.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index e752af11e..d65a4fffa 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -181,72 +181,6 @@ mozilla_embed_single_class_init (MozillaEmbedSingleClass *klass) } static void -mozilla_load_proxy_prefs (MozillaEmbedSingle *shell) -{ - char *tmp; - int i, mozilla_mode = 0; - - /* Proxy mode */ - tmp = eel_gconf_get_string (CONF_NETWORK_PROXY_MODE); - g_return_if_fail (tmp != NULL); - - if (strcmp (tmp, "manual") == 0) - { - mozilla_mode = 1; - } - else if (strcmp (tmp, "auto") == 0) - { - mozilla_mode = 2; - } - - mozilla_prefs_set_int ("network.proxy.type", mozilla_mode); - g_free (tmp); - - /* Http proxy */ - tmp = eel_gconf_get_string (CONF_NETWORK_HTTP_PROXY); - g_return_if_fail (tmp != NULL); - mozilla_prefs_set_string ("network.proxy.http", tmp); - g_free (tmp); - - i = eel_gconf_get_integer (CONF_NETWORK_HTTP_PROXY_PORT); - mozilla_prefs_set_int ("network.proxy.http_port", i); - - /* Ftp proxy */ - tmp = eel_gconf_get_string (CONF_NETWORK_FTP_PROXY); - g_return_if_fail (tmp != NULL); - mozilla_prefs_set_string ("network.proxy.ftp", tmp); - g_free (tmp); - - i = eel_gconf_get_integer (CONF_NETWORK_FTP_PROXY_PORT); - mozilla_prefs_set_int ("network.proxy.ftp_port", i); - - /* Secure proxy */ - tmp = eel_gconf_get_string (CONF_NETWORK_SSL_PROXY); - g_return_if_fail (tmp != NULL); - mozilla_prefs_set_string ("network.proxy.ssl", tmp); - g_free (tmp); - - i = eel_gconf_get_integer (CONF_NETWORK_SSL_PROXY_PORT); - mozilla_prefs_set_int ("network.proxy.ssl_port", i); - - /* Socks proxy */ - tmp = eel_gconf_get_string (CONF_NETWORK_SOCKS_PROXY); - g_return_if_fail (tmp != NULL); - mozilla_prefs_set_string ("network.proxy.socks", tmp); - g_free (tmp); - - i = eel_gconf_get_integer (CONF_NETWORK_SOCKS_PROXY_PORT); - mozilla_prefs_set_int ("network.proxy.socks_port", i); - - /* Autoconfiguration */ - tmp = eel_gconf_get_string (CONF_NETWORK_PROXY_AUTO_URL); - g_return_if_fail (tmp != NULL); - ephy_embed_single_load_proxy_autoconf - (EPHY_EMBED_SINGLE (shell), tmp); - g_free (tmp); -} - -static void mozilla_set_default_prefs (MozillaEmbedSingle *mes) { mozilla_prefs_load (ephy_file ("default-prefs.js")); @@ -354,8 +288,6 @@ mozilla_embed_single_init (MozillaEmbedSingle *mes) mozilla_set_default_prefs (mes); - mozilla_load_proxy_prefs (mes); - START_PROFILER ("Mozilla prefs notifiers") mozilla_notifiers_init (EPHY_EMBED_SINGLE (mes)); STOP_PROFILER ("Mozilla prefs notifiers") |