diff options
Diffstat (limited to 'libnm/nm-object.c')
| -rw-r--r-- | libnm/nm-object.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libnm/nm-object.c b/libnm/nm-object.c index d0e88994b2..5afca64413 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -83,7 +83,7 @@ typedef struct { enum { PROP_0, PROP_DBUS_CONNECTION, - PROP_DBUS_PATH, + PROP_PATH, PROP_NM_RUNNING, LAST_PROP @@ -357,7 +357,7 @@ set_property (GObject *object, guint prop_id, /* Construct only */ priv->connection = g_value_dup_boxed (value); break; - case PROP_DBUS_PATH: + case PROP_PATH: /* Construct only */ priv->path = g_value_dup_string (value); break; @@ -377,7 +377,7 @@ get_property (GObject *object, guint prop_id, case PROP_DBUS_CONNECTION: g_value_set_boxed (value, priv->connection); break; - case PROP_DBUS_PATH: + case PROP_PATH: g_value_set_string (value, priv->path); break; case PROP_NM_RUNNING: @@ -422,11 +422,11 @@ nm_object_class_init (NMObjectClass *nm_object_class) /** * NMObject:path: * - * The DBus object path. + * The D-Bus object path. **/ g_object_class_install_property - (object_class, PROP_DBUS_PATH, - g_param_spec_string (NM_OBJECT_DBUS_PATH, "", "", + (object_class, PROP_PATH, + g_param_spec_string (NM_OBJECT_PATH, "", "", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | @@ -481,7 +481,7 @@ nm_object_async_initable_iface_init (GAsyncInitableIface *iface) } /** - * nm_object_get_connection: + * nm_object_get_dbus_connection: * @object: a #NMObject * * Gets the #NMObject's DBusGConnection. @@ -489,7 +489,7 @@ nm_object_async_initable_iface_init (GAsyncInitableIface *iface) * Returns: (transfer none): the connection **/ DBusGConnection * -nm_object_get_connection (NMObject *object) +nm_object_get_dbus_connection (NMObject *object) { g_return_val_if_fail (NM_IS_OBJECT (object), NULL); @@ -596,7 +596,7 @@ _nm_object_create (GType type, DBusGConnection *connection, const char *path) object = g_object_new (type, NM_OBJECT_DBUS_CONNECTION, connection, - NM_OBJECT_DBUS_PATH, path, + NM_OBJECT_PATH, path, NULL); if (NM_IS_OBJECT (object)) _nm_object_cache_add (NM_OBJECT (object)); @@ -678,7 +678,7 @@ async_got_type (GType type, gpointer user_data) object = g_object_new (type, NM_OBJECT_DBUS_CONNECTION, async_data->connection, - NM_OBJECT_DBUS_PATH, async_data->path, + NM_OBJECT_PATH, async_data->path, NULL); if (NM_IS_OBJECT (object)) _nm_object_cache_add (NM_OBJECT (object)); |