diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/modules/config_gnome.c | 16 |
3 files changed, 2 insertions, 19 deletions
@@ -1,7 +1,3 @@ -New in unreleased trunk version -=============================== -- Gnome config module reads username / password from gconf. - New in version 0.3.1 ==================== - Bugfixes diff --git a/configure.ac b/configure.ac index 5a686d0..4b37037 100644 --- a/configure.ac +++ b/configure.ac @@ -228,7 +228,6 @@ AC_HEADER_STDBOOL AC_C_CONST AC_TYPE_SIZE_T MODULEDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/modules -SYSCONFDIR=$sysconfdir AC_SUBST(MODULEDIR) AC_SUBST(SYSCONFDIR) AC_SUBST(DIR_SEPARATOR) diff --git a/src/modules/config_gnome.c b/src/modules/config_gnome.c index 1fdf09e..d7f8764 100644 --- a/src/modules/config_gnome.c +++ b/src/modules/config_gnome.c @@ -46,10 +46,7 @@ static const char *_all_keys[] = { "/system/proxy/secure_host", "/system/proxy/secure_port", "/system/proxy/ftp_host", "/system/proxy/ftp_port", "/system/proxy/socks_host", "/system/proxy/socks_port", - "/system/http_proxy/ignore_hosts", - "/system/http_proxy/use_authentication", - "/system/http_proxy/authentication_user", - "/system/http_proxy/authentication_password", NULL + "/system/http_proxy/ignore_hosts", NULL }; static FILE * @@ -169,9 +166,6 @@ _get_config(pxConfigModule *s, pxURL *url) char *type = px_strdup("http"); char *host = NULL; char *port = NULL; - char *username = NULL; - char *password = NULL; - uint16_t p = 0; // Get the per-scheme proxy settings @@ -194,10 +188,6 @@ _get_config(pxConfigModule *s, pxURL *url) host = px_strdup(px_strdict_get(self->data, "/system/http_proxy/host")); port = px_strdup(px_strdict_get(self->data, "/system/http_proxy/port")); - if (!strcmp(px_strdict_get(self->data, "/system/http_proxy/use_authentication"), "true")) { - username = px_strdup(px_strdict_get(self->data, "/system/http_proxy/authentication_user")); - password = px_strdup(px_strdict_get(self->data, "/system/http_proxy/authentication_password")); - } if (!port || sscanf(port, "%hu", &p) != 1) p = 0; } @@ -216,13 +206,11 @@ _get_config(pxConfigModule *s, pxURL *url) // If host and port were found, build config url if (host && strcmp(host, "") && p) - curl = px_strcat(type, "://", username && password ? px_strcat(username, ":", password, "@", NULL) : "", host, ":", port, NULL); + curl = px_strcat(type, "://", host, ":", port, NULL); px_free(type); px_free(host); px_free(port); - px_free(username); - px_free(password); } // Start a refresh in the background |