From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- libnm-util/nm-connection.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libnm-util/nm-connection.c') diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index b929fdcd..3ddea2d7 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -120,10 +120,8 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error); - /*****************************************************************************/ /** @@ -493,7 +491,6 @@ nm_connection_compare (NMConnection *a, return TRUE; } - static void diff_one_connection (NMConnection *a, NMConnection *b, @@ -1023,7 +1020,7 @@ nm_connection_update_secrets (NMConnection *connection, g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection); success_detail = _nm_setting_update_secrets (setting, - setting_hash ? setting_hash : secrets, + setting_hash ?: secrets, error); g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection); -- cgit 1.3.0-6-gf8a5