summary refs log tree commit diff
path: root/clients/cli/settings.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2020-04-11 21:28:04 +0200
committerMichael Biebl <biebl@debian.org>2020-04-11 21:28:04 +0200
commit1e5977b62f896e844b548c3007ace9e1dfa7f9ed (patch)
tree7a7416ed410e72b6200f3d860fd315ec11cc106b /clients/cli/settings.c
parentb012fa6e1d808e0736c009799c62d835cbfcc1dd (diff)
New upstream version 1.23.90 upstream/1.23.90
Diffstat (limited to 'clients/cli/settings.c')
-rw-r--r--clients/cli/settings.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 698471d7..0487fb96 100644
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -456,8 +456,6 @@ const NMMetaEnvironment *const nmc_meta_environment = &((NMMetaEnvironment) {
 	.get_nm_connections = _env_get_nm_connections,
 });
 
-NmCli *const nmc_meta_environment_arg = &nm_cli;
-
 static char *
 get_property_val (NMSetting *setting, const char *prop, NMMetaAccessorGetType get_type, gboolean show_secrets, GError **error)
 {
@@ -475,7 +473,7 @@ get_property_val (NMSetting *setting, const char *prop, NMMetaAccessorGetType ge
 
 			value = property_info->property_type->get_fcn (property_info,
 			                                               nmc_meta_environment,
-			                                               nmc_meta_environment_arg,
+			                                               (gpointer) nmc_meta_environment_arg,
 			                                               setting,
 			                                               get_type,
 			                                               show_secrets ? NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS : 0,
@@ -568,7 +566,7 @@ nmc_setting_set_property (NMClient *client,
 	g_object_freeze_notify (G_OBJECT (setting));
 	success = property_info->property_type->set_fcn (property_info,
 	                                                 nmc_meta_environment,
-	                                                 nmc_meta_environment_arg,
+	                                                 (gpointer) nmc_meta_environment_arg,
 	                                                 setting,
 	                                                 modifier,
 	                                                 value,