Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
7.6 kB · 140 lines
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141diff --git a/src/backend/plugins/config-gnome/config-gnome.c b/src/backend/plugins/config-gnome/config-gnome.cindex 820827b..338e269 100644--- a/src/backend/plugins/config-gnome/config-gnome.c+++ b/src/backend/plugins/config-gnome/config-gnome.c@@ -85,11 +85,60 @@ px_config_gnome_init (PxConfigGnome *self) if (!self->available) return; - self->proxy_settings = g_settings_new ("org.gnome.system.proxy");- self->http_proxy_settings = g_settings_new ("org.gnome.system.proxy.http");- self->https_proxy_settings = g_settings_new ("org.gnome.system.proxy.https");- self->ftp_proxy_settings = g_settings_new ("org.gnome.system.proxy.ftp");- self->socks_proxy_settings = g_settings_new ("org.gnome.system.proxy.socks");+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy", FALSE);+ self->proxy_settings = g_settings_new_full(schema, NULL, NULL);+ }+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy.http",+ FALSE);+ self->http_proxy_settings = g_settings_new_full(schema, NULL, NULL);+ }+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy.https",+ FALSE);+ self->https_proxy_settings = g_settings_new_full(schema, NULL, NULL);+ }+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy.ftp",+ FALSE);+ self->ftp_proxy_settings = g_settings_new_full(schema, NULL, NULL);+ }+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy.socks",+ FALSE);+ self->socks_proxy_settings = g_settings_new_full(schema, NULL, NULL);+ } } static voiddiff --git a/tests/config-gnome-test.c b/tests/config-gnome-test.cindex f80914a..118d429 100644--- a/tests/config-gnome-test.c+++ b/tests/config-gnome-test.c@@ -60,11 +60,60 @@ static void fixture_setup (Fixture *self, gconstpointer data) {- self->proxy_settings = g_settings_new ("org.gnome.system.proxy");- self->http_proxy_settings = g_settings_new ("org.gnome.system.proxy.http");- self->https_proxy_settings = g_settings_new ("org.gnome.system.proxy.https");- self->ftp_proxy_settings = g_settings_new ("org.gnome.system.proxy.ftp");- self->socks_proxy_settings = g_settings_new ("org.gnome.system.proxy.socks");+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy", FALSE);+ self->proxy_settings = g_settings_new_full(schema, NULL, NULL);+ }+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy.http",+ FALSE);+ self->http_proxy_settings = g_settings_new_full(schema, NULL, NULL);+ }+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy.https",+ FALSE);+ self->https_proxy_settings = g_settings_new_full(schema, NULL, NULL);+ }+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy.ftp",+ FALSE);+ self->ftp_proxy_settings = g_settings_new_full(schema, NULL, NULL);+ }+ {+ g_autoptr(GSettingsSchemaSource) schema_source;+ g_autoptr(GSettingsSchema) schema;+ schema_source = g_settings_schema_source_new_from_directory("@gds@",+ g_settings_schema_source_get_default(),+ TRUE, NULL);+ schema = g_settings_schema_source_lookup(schema_source,+ "org.gnome.system.proxy.socks",+ FALSE);+ self->socks_proxy_settings = g_settings_new_full(schema, NULL, NULL);+ } } static void