core: move D-Bus export/unexport into NMExportedObject

Move D-Bus export/unexport handling into NMExportedObject and remove
type-specific export/get_path methods (export paths are now specified
at the class level, and NMExportedObject handles the counters for all
exported types automatically).

Since all exportable objects now use the same get_path() method, we
can also add some helper methods to simplify get_property()
implementations for object-path and object-path-array properties.

1 files changed, 7 insertions, 26 deletions

diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
index 3ffe5359a4..e52b467136 100644
--- a/src/nm-active-connection.c
+++ b/src/nm-active-connection.c
@@ -27,7 +27,6 @@
 #include "nm-dbus-interface.h"
 #include "nm-logging.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-dbus-manager.h"
 #include "nm-device.h"
 #include "nm-settings-connection.h"
 #include "nm-auth-utils.h"
@@ -45,7 +44,6 @@ G_DEFINE_ABSTRACT_TYPE (NMActiveConnection, nm_active_connection, NM_TYPE_EXPORT
 
 typedef struct {
 	NMConnection *connection;
-	char *path;
 	char *specific_object;
 	NMDevice *device;
 
@@ -228,7 +226,7 @@ nm_active_connection_set_connection (NMActiveConnection *self,
 	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
 
 	/* Can't change connection after the ActiveConnection is exported over D-Bus */
-	g_return_if_fail (priv->path == NULL);
+	g_return_if_fail (!nm_exported_object_is_exported (NM_EXPORTED_OBJECT (self)));
 	g_return_if_fail (priv->connection == NULL || !NM_IS_SETTINGS_CONNECTION (priv->connection));
 
 	if (priv->connection)
@@ -237,12 +235,6 @@ nm_active_connection_set_connection (NMActiveConnection *self,
 }
 
 const char *
-nm_active_connection_get_path (NMActiveConnection *self)
-{
-	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->path;
-}
-
-const char *
 nm_active_connection_get_specific_object (NMActiveConnection *self)
 {
 	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->specific_object;
@@ -317,18 +309,6 @@ nm_active_connection_get_default6 (NMActiveConnection *self)
 	return NM_ACTIVE_CONNECTION_GET_PRIVATE (self)->is_default6;
 }
 
-void
-nm_active_connection_export (NMActiveConnection *self)
-{
-	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self);
-	static guint32 counter = 0;
-
-	g_assert (priv->device || priv->vpn);
-
-	priv->path = g_strdup_printf (NM_DBUS_PATH "/ActiveConnection/%d", counter++);
-	nm_dbus_manager_register_object (nm_dbus_manager_get (), priv->path, self);
-}
-
 NMAuthSubject *
 nm_active_connection_get_subject (NMActiveConnection *self)
 {
@@ -566,7 +546,7 @@ nm_active_connection_set_master (NMActiveConnection *self, NMActiveConnection *m
 
 	/* Master is write-once, and must be set before exporting the object */
 	g_return_if_fail (priv->master == NULL);
-	g_return_if_fail (priv->path == NULL);
+	g_return_if_fail (!nm_exported_object_is_exported (NM_EXPORTED_OBJECT (self)));
 	if (priv->device) {
 		/* Note, the master ActiveConnection may not yet have a device */
 		g_return_if_fail (priv->device != nm_active_connection_get_device (master));
@@ -792,7 +772,7 @@ get_property (GObject *object, guint prop_id,
 	case PROP_DEVICES:
 		devices = g_ptr_array_sized_new (1);
 		if (priv->device && priv->state < NM_ACTIVE_CONNECTION_STATE_DEACTIVATED)
-			g_ptr_array_add (devices, g_strdup (nm_device_get_path (priv->device)));
+			g_ptr_array_add (devices, g_strdup (nm_exported_object_get_path (NM_EXPORTED_OBJECT (priv->device))));
 		g_value_take_boxed (value, devices);
 		break;
 	case PROP_STATE:
@@ -830,7 +810,7 @@ get_property (GObject *object, guint prop_id,
 	case PROP_MASTER:
 		if (priv->master)
 			master_device = nm_active_connection_get_device (priv->master);
-		g_value_set_boxed (value, master_device ? nm_device_get_path (master_device) : "/");
+		nm_utils_g_value_set_object_path (value, master_device);
 		break;
 	case PROP_INT_SUBJECT:
 		g_value_set_object (value, priv->subject);
@@ -874,8 +854,6 @@ dispose (GObject *object)
 		priv->chain = NULL;
 	}
 
-	g_free (priv->path);
-	priv->path = NULL;
 	g_free (priv->specific_object);
 	priv->specific_object = NULL;
 
@@ -898,9 +876,12 @@ static void
 nm_active_connection_class_init (NMActiveConnectionClass *ac_class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (ac_class);
+	NMExportedObjectClass *exported_object_class = NM_EXPORTED_OBJECT_CLASS (ac_class);
 
 	g_type_class_add_private (ac_class, sizeof (NMActiveConnectionPrivate));
 
+	exported_object_class->export_path = NM_DBUS_PATH "/ActiveConnection/%u";
+
 	/* virtual methods */
 	object_class->get_property = get_property;
 	object_class->set_property = set_property;