diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/dbus/dbus.c | 4 | ||||
-rw-r--r-- | src/backend/plugins/config-gnome/config-gnome.c | 11 | ||||
-rw-r--r-- | src/backend/plugins/config-kde/config-kde.c | 2 | ||||
-rw-r--r-- | src/backend/plugins/config-osx/config-osx.c | 3 | ||||
-rw-r--r-- | src/backend/plugins/config-windows/config-windows.c | 6 | ||||
-rw-r--r-- | src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c | 1 |
6 files changed, 4 insertions, 23 deletions
diff --git a/src/backend/dbus/dbus.c b/src/backend/dbus/dbus.c index 7515865..e1e97aa 100644 --- a/src/backend/dbus/dbus.c +++ b/src/backend/dbus/dbus.c @@ -31,7 +31,7 @@ static GApplication *app; const GOptionEntry options[] = { { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace, "Replace old daemon.", NULL }, - { "system", 's', 0, G_OPTION_ARG_NONE, &use_system, "Use system session.", NULL }, + { "system", 's', 0, G_OPTION_ARG_NONE, &use_system, "Use system bus.", NULL }, { NULL } }; @@ -182,6 +182,8 @@ main (int argc, ); g_signal_connect (app, "activate", G_CALLBACK (activate), NULL); + + /* Set application timeout to 60 seconds */ g_application_set_inactivity_timeout (app, 60000); return g_application_run (app, argc, argv); diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.c index 1d4f182..4c2bc57 100644 --- a/src/backend/plugins/config-gnome/config-gnome.c +++ b/src/backend/plugins/config-gnome/config-gnome.c @@ -226,17 +226,6 @@ px_config_gnome_get_config (PxConfig *config, username, password); } - - if ((((GPtrArray *)builder)->len == 0) && (g_strcmp0 (scheme, "http") != 0)) { - g_autofree char *host = g_settings_get_string (self->http_proxy_settings, "host"); - store_response (builder, - "http", - host, - g_settings_get_int (self->http_proxy_settings, "port"), - auth, - username, - password); - } } } diff --git a/src/backend/plugins/config-kde/config-kde.c b/src/backend/plugins/config-kde/config-kde.c index fba7ed3..124c5b9 100644 --- a/src/backend/plugins/config-kde/config-kde.c +++ b/src/backend/plugins/config-kde/config-kde.c @@ -261,7 +261,7 @@ px_config_kde_get_config (PxConfig *config, proxy = g_strdup (self->https_proxy); } else if (g_strcmp0 (scheme, "http") == 0) { proxy = g_strdup (self->http_proxy); - } else if (g_strcmp0 (scheme, "socks") == 0) { + } else if (self->socks_proxy && strlen (self->socks_proxy) > 0) { proxy = g_strdup (self->socks_proxy); } break; diff --git a/src/backend/plugins/config-osx/config-osx.c b/src/backend/plugins/config-osx/config-osx.c index f92d9ee..8a9e6e4 100644 --- a/src/backend/plugins/config-osx/config-osx.c +++ b/src/backend/plugins/config-osx/config-osx.c @@ -320,9 +320,6 @@ px_config_osx_get_config (PxConfig *self, proxy = protocol_url (proxies, capital_scheme); if (!proxy) - proxy = protocol_url (proxies, "HTTP"); - - if (!proxy) proxy = protocol_url (proxies, "SOCKS"); } diff --git a/src/backend/plugins/config-windows/config-windows.c b/src/backend/plugins/config-windows/config-windows.c index a29c952..5bffde6 100644 --- a/src/backend/plugins/config-windows/config-windows.c +++ b/src/backend/plugins/config-windows/config-windows.c @@ -233,12 +233,6 @@ px_config_windows_get_config (PxConfig *self, return; } - ret = g_hash_table_lookup (table, "http"); - if (ret) { - px_strv_builder_add_proxy (builder, ret); - return; - } - ret = g_hash_table_lookup (table, "socks"); if (ret) { px_strv_builder_add_proxy (builder, ret); diff --git a/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c b/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c index 5818156..51c2592 100644 --- a/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c +++ b/src/backend/plugins/pacrunner-duktape/pacrunner-duktape.c @@ -142,7 +142,6 @@ px_pacrunner_duktape_class_init (PxPacRunnerDuktapeClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - /* object_class->constructed = px_duktape_constructed; */ object_class->dispose = px_pacrunner_duktape_dispose; } |