From 24cda2bc367d9fafa847a82493a1adb9f3e53e47 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Tue, 12 Feb 2013 13:09:30 -0500
Subject: [PATCH] libnm-util, libnm-glib: Make NMRemoteConnection instantiable
 by NMObject

In order to resolve NMRemoteConnection-valued properties, NMObject
needs to be able to create NMRemoteConnections. But NMObject assumes
that all the objects it will be creating have "dbus-connection" and
"dbus-path" properties. So add those properties to NMRemoteConnection,
aliasing the existing "bus" and "path" properties (and ensure that
whichever version gets set, we keep that value, rather than letting it
get overwritten by the NULL default value of the other one).

https://bugzilla.gnome.org/show_bug.cgi?id=693669
---
 libnm-glib/nm-remote-connection.c | 37 ++++++++++++++++++++++++++-----
 libnm-util/nm-connection.c        |  3 ++-
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index bdae83ab2..9d6a2f42e 100644
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -33,6 +33,8 @@
 #include "nm-glib-compat.h"
 
 #define NM_REMOTE_CONNECTION_BUS "bus"
+#define NM_REMOTE_CONNECTION_DBUS_CONNECTION "dbus-connection"
+#define NM_REMOTE_CONNECTION_DBUS_PATH "dbus-path"
 
 static void nm_remote_connection_initable_iface_init (GInitableIface *iface);
 static void nm_remote_connection_async_initable_iface_init (GAsyncInitableIface *iface);
@@ -45,6 +47,8 @@ G_DEFINE_TYPE_WITH_CODE (NMRemoteConnection, nm_remote_connection, NM_TYPE_CONNE
 enum {
 	PROP_0,
 	PROP_BUS,
+	PROP_DBUS_CONNECTION,
+	PROP_DBUS_PATH,
 
 	LAST_PROP
 };
@@ -471,8 +475,15 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_BUS:
+	case PROP_DBUS_CONNECTION:
 		/* Construct only */
-		priv->bus = dbus_g_connection_ref ((DBusGConnection *) g_value_get_boxed (value));
+		if (g_value_get_boxed (value))
+			priv->bus = dbus_g_connection_ref ((DBusGConnection *) g_value_get_boxed (value));
+		break;
+	case PROP_DBUS_PATH:
+		/* Construct only */
+		if (g_value_get_string (value))
+			nm_connection_set_path (NM_CONNECTION (object), g_value_get_string (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -515,10 +526,26 @@ nm_remote_connection_class_init (NMRemoteConnectionClass *remote_class)
 	g_object_class_install_property
 		(object_class, PROP_BUS,
 		 g_param_spec_boxed (NM_REMOTE_CONNECTION_BUS,
-						 "DBusGConnection",
-						 "DBusGConnection",
-						 DBUS_TYPE_G_CONNECTION,
-						 G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+							 "DBusGConnection",
+							 "DBusGConnection",
+							 DBUS_TYPE_G_CONNECTION,
+							 G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+
+	/* These are needed so _nm_object_create() can create NMRemoteConnections */
+	g_object_class_install_property
+		(object_class, PROP_DBUS_CONNECTION,
+		 g_param_spec_boxed (NM_REMOTE_CONNECTION_DBUS_CONNECTION,
+		                     "DBusGConnection",
+		                     "DBusGConnection",
+		                     DBUS_TYPE_G_CONNECTION,
+		                     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+	g_object_class_install_property
+		(object_class, PROP_DBUS_PATH,
+		 g_param_spec_string (NM_REMOTE_CONNECTION_DBUS_PATH,
+		                      "Object Path",
+		                      "DBus Object Path",
+		                      NULL,
+		                      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 
 	/* Signals */
 	/**
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 47a9ec090..2a1593c2f 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -1658,7 +1658,8 @@ set_property (GObject *object, guint prop_id,
 
 	switch (prop_id) {
 	case PROP_PATH:
-		nm_connection_set_path (connection, g_value_get_string (value));
+		if (g_value_get_string (value))
+			nm_connection_set_path (connection, g_value_get_string (value));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);