diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 792ec51a1..7e3b1a60b 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -176,7 +176,7 @@ nm_active_connection_set_state (NMActiveConnection *self, } const char * -nm_active_connection_get_name (NMActiveConnection *self) +nm_active_connection_get_id (NMActiveConnection *self) { g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (self), NULL); @@ -512,7 +512,7 @@ nm_active_connection_set_master (NMActiveConnection *self, NMActiveConnection *m } nm_log_dbg (LOGD_DEVICE, "(%p): master ActiveConnection is [%p] %s", - self, master, nm_active_connection_get_name (master)); + self, master, nm_active_connection_get_id (master)); priv->master = g_object_ref (master); g_signal_connect (priv->master, diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h index fac09e7c0..0d96c8723 100644 --- a/src/nm-active-connection.h +++ b/src/nm-active-connection.h @@ -94,7 +94,7 @@ NMConnection *nm_active_connection_get_connection (NMActiveConnection *self); void nm_active_connection_set_connection (NMActiveConnection *self, NMConnection *connection); -const char * nm_active_connection_get_name (NMActiveConnection *self); +const char * nm_active_connection_get_id (NMActiveConnection *self); const char * nm_active_connection_get_uuid (NMActiveConnection *self); diff --git a/src/nm-manager.c b/src/nm-manager.c index 52a01895e..b14a0daf4 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -4228,7 +4228,7 @@ policy_default_device_changed (GObject *object, GParamSpec *pspec, gpointer user if (ac != priv->primary_connection) { g_clear_object (&priv->primary_connection); priv->primary_connection = ac ? g_object_ref (ac) : NULL; - nm_log_dbg (LOGD_CORE, "PrimaryConnection now %s", ac ? nm_active_connection_get_name (ac) : "(none)"); + nm_log_dbg (LOGD_CORE, "PrimaryConnection now %s", ac ? nm_active_connection_get_id (ac) : "(none)"); g_object_notify (G_OBJECT (self), NM_MANAGER_PRIMARY_CONNECTION); } } @@ -4261,7 +4261,7 @@ policy_activating_device_changed (GObject *object, GParamSpec *pspec, gpointer u if (ac != priv->activating_connection) { g_clear_object (&priv->activating_connection); priv->activating_connection = ac ? g_object_ref (ac) : NULL; - nm_log_dbg (LOGD_CORE, "ActivatingConnection now %s", ac ? nm_active_connection_get_name (ac) : "(none)"); + nm_log_dbg (LOGD_CORE, "ActivatingConnection now %s", ac ? nm_active_connection_get_id (ac) : "(none)"); g_object_notify (G_OBJECT (self), NM_MANAGER_ACTIVATING_CONNECTION); } } diff --git a/src/nm-policy.c b/src/nm-policy.c index 2e9567682..dd11d16a9 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1077,7 +1077,7 @@ process_secondaries (NMPolicy *policy, if (connected) { nm_log_dbg (LOGD_DEVICE, "Secondary connection '%s' SUCCEEDED; active path '%s'", - nm_active_connection_get_name (active), + nm_active_connection_get_id (active), nm_active_connection_get_path (active)); /* Secondary connection activated */ @@ -1092,7 +1092,7 @@ process_secondaries (NMPolicy *policy, } } else { nm_log_dbg (LOGD_DEVICE, "Secondary connection '%s' FAILED; active path '%s'", - nm_active_connection_get_name (active), + nm_active_connection_get_id (active), nm_active_connection_get_path (active)); /* Secondary connection failed -> do not watch other connections */