diff options
Diffstat (limited to 'src/nmcli/settings.c')
| -rw-r--r-- | src/nmcli/settings.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nmcli/settings.c b/src/nmcli/settings.c index 3c1f3c38..5b818edb 100644 --- a/src/nmcli/settings.c +++ b/src/nmcli/settings.c @@ -254,7 +254,7 @@ wireless_band_channel_changed_cb(GObject *object, GParamSpec *pspec, gpointer us } static void -connection_master_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_data) +connection_controller_changed_cb(GObject *object, GParamSpec *pspec, gpointer user_data) { NMSettingConnection *s_con = NM_SETTING_CONNECTION(object); NMConnection *connection = NM_CONNECTION(user_data); @@ -343,7 +343,7 @@ nmc_setting_connection_connect_handlers(NMSettingConnection *setting, NMConnecti g_signal_connect(setting, "notify::" NM_SETTING_CONNECTION_MASTER, - G_CALLBACK(connection_master_changed_cb), + G_CALLBACK(connection_controller_changed_cb), connection); } @@ -366,6 +366,9 @@ _set_fcn_precheck_connection_secondaries(NMClient *client, if (!strv0) return TRUE; + if (!client) + return TRUE; + connections = nm_client_get_connections(client); strv = g_strdupv((char **) strv0); @@ -495,7 +498,7 @@ _env_get_env_flags(const NMMetaEnvironment *environment, gpointer environment_us nm_assert(nmc); - return (nmc->offline ? NM_META_ENV_FLAGS_OFFLINE : NM_META_ENV_FLAGS_NONE); + return (nmc->nmc_config.offline ? NM_META_ENV_FLAGS_OFFLINE : NM_META_ENV_FLAGS_NONE); } /*****************************************************************************/ |