libnm: fix NMActiveConnection object-path-valued properties

NMActiveConnection:connection was an object path rather than an
NMRemoteConnection because in the past the NMObject property system
wasn't capable of handling NMRemoteConnection-valued properties.
NMActiveConnection:master was an object path rather than an NMDevice
entirely by accident. Fix both.

NMActiveConnection:specific-object can't currently be converted to an
object, because we don't know ahead of time what object type it is,
and NMObject can't deal with that. Instead, we rename it to
:specific-object-path (and likewise for its get function), both to
emphasize that it doesn't behave like other properties, and to leave
the old name open for an actual object-valued property later on.

1 files changed, 30 insertions, 30 deletions

diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h
index 2b0d6821c1..ef8dd1980b 100644
--- a/libnm/nm-active-connection.h
+++ b/libnm/nm-active-connection.h
@@ -37,21 +37,21 @@ G_BEGIN_DECLS
 #define NM_IS_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACTIVE_CONNECTION))
 #define NM_ACTIVE_CONNECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass))
 
-#define NM_ACTIVE_CONNECTION_CONNECTION          "connection"
-#define NM_ACTIVE_CONNECTION_ID                  "id"
-#define NM_ACTIVE_CONNECTION_UUID                "uuid"
-#define NM_ACTIVE_CONNECTION_TYPE                "type"
-#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT     "specific-object"
-#define NM_ACTIVE_CONNECTION_DEVICES             "devices"
-#define NM_ACTIVE_CONNECTION_STATE               "state"
-#define NM_ACTIVE_CONNECTION_DEFAULT             "default"
-#define NM_ACTIVE_CONNECTION_IP4_CONFIG          "ip4-config"
-#define NM_ACTIVE_CONNECTION_DHCP4_CONFIG        "dhcp4-config"
-#define NM_ACTIVE_CONNECTION_DEFAULT6            "default6"
-#define NM_ACTIVE_CONNECTION_IP6_CONFIG          "ip6-config"
-#define NM_ACTIVE_CONNECTION_DHCP6_CONFIG        "dhcp6-config"
-#define NM_ACTIVE_CONNECTION_VPN                 "vpn"
-#define NM_ACTIVE_CONNECTION_MASTER              "master"
+#define NM_ACTIVE_CONNECTION_CONNECTION           "connection"
+#define NM_ACTIVE_CONNECTION_ID                   "id"
+#define NM_ACTIVE_CONNECTION_UUID                 "uuid"
+#define NM_ACTIVE_CONNECTION_TYPE                 "type"
+#define NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH "specific-object-path"
+#define NM_ACTIVE_CONNECTION_DEVICES              "devices"
+#define NM_ACTIVE_CONNECTION_STATE                "state"
+#define NM_ACTIVE_CONNECTION_DEFAULT              "default"
+#define NM_ACTIVE_CONNECTION_IP4_CONFIG           "ip4-config"
+#define NM_ACTIVE_CONNECTION_DHCP4_CONFIG         "dhcp4-config"
+#define NM_ACTIVE_CONNECTION_DEFAULT6             "default6"
+#define NM_ACTIVE_CONNECTION_IP6_CONFIG           "ip6-config"
+#define NM_ACTIVE_CONNECTION_DHCP6_CONFIG         "dhcp6-config"
+#define NM_ACTIVE_CONNECTION_VPN                  "vpn"
+#define NM_ACTIVE_CONNECTION_MASTER               "master"
 
 struct _NMActiveConnection {
 	NMObject parent;
@@ -66,21 +66,21 @@ typedef struct {
 
 GType nm_active_connection_get_type (void);
 
-const char * nm_active_connection_get_connection          (NMActiveConnection *connection);
-const char * nm_active_connection_get_id                  (NMActiveConnection *connection);
-const char * nm_active_connection_get_uuid                (NMActiveConnection *connection);
-const char * nm_active_connection_get_connection_type     (NMActiveConnection *connection);
-const char * nm_active_connection_get_specific_object     (NMActiveConnection *connection);
-const GPtrArray *nm_active_connection_get_devices         (NMActiveConnection *connection);
-NMActiveConnectionState nm_active_connection_get_state    (NMActiveConnection *connection);
-const char * nm_active_connection_get_master              (NMActiveConnection *connection);
-gboolean       nm_active_connection_get_default           (NMActiveConnection *connection);
-NMIP4Config *  nm_active_connection_get_ip4_config        (NMActiveConnection *connection);
-NMDhcp4Config *nm_active_connection_get_dhcp4_config      (NMActiveConnection *connection);
-gboolean       nm_active_connection_get_default6          (NMActiveConnection *connection);
-NMIP6Config *  nm_active_connection_get_ip6_config        (NMActiveConnection *connection);
-NMDhcp6Config *nm_active_connection_get_dhcp6_config      (NMActiveConnection *connection);
-gboolean       nm_active_connection_get_vpn               (NMActiveConnection *connection);
+NMRemoteConnection      *nm_active_connection_get_connection           (NMActiveConnection *connection);
+const char              *nm_active_connection_get_id                   (NMActiveConnection *connection);
+const char              *nm_active_connection_get_uuid                 (NMActiveConnection *connection);
+const char              *nm_active_connection_get_connection_type      (NMActiveConnection *connection);
+const char              *nm_active_connection_get_specific_object_path (NMActiveConnection *connection);
+const GPtrArray         *nm_active_connection_get_devices              (NMActiveConnection *connection);
+NMActiveConnectionState  nm_active_connection_get_state                (NMActiveConnection *connection);
+NMDevice                *nm_active_connection_get_master               (NMActiveConnection *connection);
+gboolean                 nm_active_connection_get_default              (NMActiveConnection *connection);
+NMIP4Config             *nm_active_connection_get_ip4_config           (NMActiveConnection *connection);
+NMDhcp4Config           *nm_active_connection_get_dhcp4_config         (NMActiveConnection *connection);
+gboolean                 nm_active_connection_get_default6             (NMActiveConnection *connection);
+NMIP6Config             *nm_active_connection_get_ip6_config           (NMActiveConnection *connection);
+NMDhcp6Config           *nm_active_connection_get_dhcp6_config         (NMActiveConnection *connection);
+gboolean                 nm_active_connection_get_vpn                  (NMActiveConnection *connection);
 
 G_END_DECLS