diff options
Diffstat (limited to 'src/settings/plugins/ifupdown/nms-ifupdown-parser.c')
| -rw-r--r-- | src/settings/plugins/ifupdown/nms-ifupdown-parser.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c index 99879c92..884c6591 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c @@ -37,7 +37,6 @@ #include "nms-ifupdown-plugin.h" #include "nms-ifupdown-parser.h" - static const gchar* _ifupdownplugin_guess_connection_type (if_block *block) { @@ -63,7 +62,6 @@ _ifupdownplugin_guess_connection_type (if_block *block) return ret_type; } - struct _Mapping { const gchar *domain; const gpointer target; @@ -340,7 +338,7 @@ update_wireless_security_setting_from_if_block(NMConnection *connection, } g_object_set(wireless_security_setting, - newkey, typed_property_value ? typed_property_value : property_value, + newkey, typed_property_value ?: property_value, NULL); security = TRUE; @@ -388,7 +386,7 @@ update_wireless_security_setting_from_if_block(NMConnection *connection, } g_object_set(wireless_security_setting, - newkey, typed_property_value ? typed_property_value : property_value, + newkey, typed_property_value ?: property_value, NULL); security = TRUE; @@ -401,7 +399,6 @@ update_wireless_security_setting_from_if_block(NMConnection *connection, curr = curr->next; } - if (security) nm_connection_add_setting (connection, NM_SETTING (wireless_security_setting)); } |