diff options
| author | Jan-Michael Brummer <jan.brummer@tabos.org> | 2023-05-15 15:09:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 15:09:42 +0200 |
| commit | 52a6d29899f8acd020c8fa5c83111193c87f9305 (patch) | |
| tree | 1a6e21413dfb6e3038b3e6528274717ee6f3bc75 | |
| parent | a1c821b01363b3a0cadbad7746713ff194c86820 (diff) | |
| download | libproxy-git-52a6d29899f8acd020c8fa5c83111193c87f9305.tar.gz | |
Improve GNOME/KDE get_config() execution (#212)libproxy-0.5.0
Only check for ignore hosts if proxy are in use.
| -rw-r--r-- | src/backend/plugins/config-gnome/config-gnome.c | 5 | ||||
| -rw-r--r-- | src/backend/plugins/config-kde/config-kde.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c index 9d6fd68..820827b 100644 --- a/src/backend/plugins/config-gnome/config-gnome.c +++ b/src/backend/plugins/config-gnome/config-gnome.c @@ -177,10 +177,13 @@ px_config_gnome_get_config (PxConfig *config, if (!self->available) return; + mode = g_settings_get_enum (self->proxy_settings, "mode"); + if (mode == GNOME_PROXY_MODE_NONE) + return; + if (px_manager_is_ignore (uri, g_settings_get_strv (self->proxy_settings, "ignore-hosts"))) return; - mode = g_settings_get_enum (self->proxy_settings, "mode"); if (mode == GNOME_PROXY_MODE_AUTO) { char *autoconfig_url = g_settings_get_string (self->proxy_settings, "autoconfig-url"); diff --git a/src/backend/plugins/config-kde/config-kde.c b/src/backend/plugins/config-kde/config-kde.c index 20c6726..3b1bb6b 100644 --- a/src/backend/plugins/config-kde/config-kde.c +++ b/src/backend/plugins/config-kde/config-kde.c @@ -251,18 +251,20 @@ px_config_kde_get_config (PxConfig *config, GStrvBuilder *builder) { PxConfigKde *self = PX_CONFIG_KDE (config); - const char *scheme = g_uri_get_scheme (uri); + const char *scheme; g_autofree char *proxy = NULL; if (!self->available) return; - if (!self->proxy_type) + if (self->proxy_type == KDE_PROXY_TYPE_NONE) return; if (px_manager_is_ignore (uri, self->no_proxy)) return; + scheme = g_uri_get_scheme (uri); + switch (self->proxy_type) { case KDE_PROXY_TYPE_MANUAL: case KDE_PROXY_TYPE_SYSTEM: |