diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-notifiers.cpp | 30 |
3 files changed, 7 insertions, 46 deletions
@@ -1,3 +1,10 @@ +2004-09-30 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + * embed/mozilla/mozilla-notifiers.cpp: + + Remove explicit PAC autoconf call, it works perfectly ok without it. + 2004-09-28 Christian Persch <chpe@cvs.gnome.org> * lib/ephy-debug.c: (trap_handler): diff --git a/configure.ac b/configure.ac index 6b6d6072b..5f0b2a580 100644 --- a/configure.ac +++ b/configure.ac @@ -321,22 +321,6 @@ AC_COMPILE_IFELSE( AC_MSG_RESULT([$result]) -dnl Changed from char* to nsACString& in mozilla 1.8a2 - -AC_MSG_CHECKING([whether nsIProtocolProxyService::ConfigureFromPAC expects nsACString&]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsEmbedString.h> - #include <necko/nsIProtocolProxyService.h>]], - [[nsIProtocolProxyService *p; - p->ConfigureFromPAC (nsEmbedCString());]] - )], - [AC_DEFINE([MOZ_NSIPROTOCOLPROXYSERVICE_NSACSTRING_],[1],[dummy]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - dnl Firefox doesn't have this API (?) AC_MSG_CHECKING([for nsIXULChromeRegistry API]) diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp index efb2f731d..1ddfdc69f 100644 --- a/embed/mozilla/mozilla-notifiers.cpp +++ b/embed/mozilla/mozilla-notifiers.cpp @@ -105,11 +105,6 @@ mozilla_proxy_mode_notifier (GConfClient *client, GConfEntry *entry, EphyEmbedSingle *single); static void -mozilla_proxy_autoconfig_notifier (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - EphyEmbedSingle *single); -static void mozilla_proxy_mode_notifier (GConfClient *client, guint cnxn_id, GConfEntry *entry, @@ -180,8 +175,6 @@ custom_notifiers [] = (GConfClientNotifyFunc) mozilla_language_notifier }, { CONF_NETWORK_PROXY_MODE, (GConfClientNotifyFunc) mozilla_proxy_mode_notifier }, - { CONF_NETWORK_PROXY_AUTO_URL, - (GConfClientNotifyFunc) mozilla_proxy_autoconfig_notifier }, { CONF_NETWORK_CACHE_SIZE, (GConfClientNotifyFunc) mozilla_cache_size_notifier }, { CONF_SECURITY_COOKIES_ACCEPT, @@ -356,29 +349,6 @@ mozilla_font_notifier (GConfClient *client, } static void -mozilla_proxy_autoconfig_notifier (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - EphyEmbedSingle *single) -{ - nsCOMPtr<nsIProtocolProxyService> pps = - do_GetService ("@mozilla.org/network/protocol-proxy-service;1"); - if (!pps) return; - - char *url = eel_gconf_get_string (entry->key); - if (url && url[0] != '\0') - { -#ifdef MOZ_NSIPROTOCOLPROXYSERVICE_NSACSTRING_ - pps->ConfigureFromPAC (nsEmbedCString (url)); -#else - pps->ConfigureFromPAC (url); -#endif - } - - g_free (url); -} - -static void add_notification_and_notify (GConfClient *client, const char *key, GConfClientNotifyFunc func, |