colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: rename function nm_active_connection_get_name() to nm_active_connection_get_id()

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-03-05 21:15:09 +01:00
parent 4753dff29e
commit 950cb2c44f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nm-active-connection.c
View File

@@ -176,7 +176,7 @@ nm_active_connection_set_state (NMActiveConnection *self,
} }
const char * 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); 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", 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); priv->master = g_object_ref (master);
g_signal_connect (priv->master, g_signal_connect (priv->master,

2
src/nm-active-connection.h
View File

@@ -94,7 +94,7 @@ NMConnection *nm_active_connection_get_connection (NMActiveConnection *self);
void nm_active_connection_set_connection (NMActiveConnection *self, void nm_active_connection_set_connection (NMActiveConnection *self,
NMConnection *connection); 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); const char * nm_active_connection_get_uuid (NMActiveConnection *self);

4
src/nm-manager.c
View File

@@ -4228,7 +4228,7 @@ policy_default_device_changed (GObject *object, GParamSpec *pspec, gpointer user
if (ac != priv->primary_connection) { if (ac != priv->primary_connection) {
g_clear_object (&priv->primary_connection); g_clear_object (&priv->primary_connection);
priv->primary_connection = ac ? g_object_ref (ac) : NULL; 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); 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) { if (ac != priv->activating_connection) {
g_clear_object (&priv->activating_connection); g_clear_object (&priv->activating_connection);
priv->activating_connection = ac ? g_object_ref (ac) : NULL; 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); g_object_notify (G_OBJECT (self), NM_MANAGER_ACTIVATING_CONNECTION);
} }
} }

4
src/nm-policy.c
View File

@@ -1077,7 +1077,7 @@ process_secondaries (NMPolicy *policy,
if (connected) { if (connected) {
nm_log_dbg (LOGD_DEVICE, "Secondary connection '%s' SUCCEEDED; active path '%s'", 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)); nm_active_connection_get_path (active));
/* Secondary connection activated */ /* Secondary connection activated */
@@ -1092,7 +1092,7 @@ process_secondaries (NMPolicy *policy,
} }
} else { } else {
nm_log_dbg (LOGD_DEVICE, "Secondary connection '%s' FAILED; active path '%s'", 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)); nm_active_connection_get_path (active));
/* Secondary connection failed -> do not watch other connections */ /* Secondary connection failed -> do not watch other connections */