about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch')
-rw-r--r--nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch36
1 files changed, 17 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch b/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
index 9b2f5366950c..a68f96113d34 100644
--- a/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
+++ b/nixpkgs/pkgs/tools/networking/networkmanager/libnma/hardcode-gsettings.patch
@@ -1,26 +1,24 @@
+diff --git a/src/nma-ws/nma-eap.c b/src/nma-ws/nma-eap.c
+index fa36907..81df821 100644
 --- a/src/nma-ws/nma-eap.c
 +++ b/src/nma-ws/nma-eap.c
-@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection)
- static GSettings *
- _get_ca_ignore_settings (NMConnection *connection)
- {
-+	g_autoptr (GSettingsSchemaSource) *schema_source;
-+	g_autoptr (GSettingsSchema) *schema;
- 	GSettings *settings;
- 	char *path = NULL;
- 	const char *uuid;
-
- 	g_return_val_if_fail (connection, NULL);
-
-+	schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL);
-+	schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE);
-+
- 	uuid = nm_connection_get_uuid (connection);
+@@ -252,7 +252,18 @@ _get_ca_ignore_settings (NMConnection *connection)
  	g_return_val_if_fail (uuid && *uuid, NULL);
-
+ 
  	path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid);
 -	settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path);
-+	settings = g_settings_new_full (schema, NULL, path);
++	{
++		g_autoptr(GSettingsSchemaSource) schema_source;
++		g_autoptr(GSettingsSchema) schema;
++		schema_source = g_settings_schema_source_new_from_directory("@NM_APPLET_GSETTINGS@",
++									    g_settings_schema_source_get_default(),
++									    TRUE,
++									    NULL);
++		schema = g_settings_schema_source_lookup(schema_source,
++							 "org.gnome.nm-applet.eap",
++							 FALSE);
++		settings = g_settings_new_full(schema, NULL, path);
++	}
  	g_free (path);
-
+ 
  	return settings;