Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 5 insertions, 3 deletions

diff --git a/src/devices/nm-device-vlan.h b/src/devices/nm-device-vlan.h
index 71ca8030..0d788940 100644
--- a/src/devices/nm-device-vlan.h
+++ b/src/devices/nm-device-vlan.h
@@ -37,11 +37,13 @@ typedef enum {
 } NMVlanError;
 
 /* D-Bus exported properties */
-#define NM_DEVICE_VLAN_PARENT     "parent"
 #define NM_DEVICE_VLAN_ID         "vlan-id"
 
-typedef NMDevice NMDeviceVlan;
-typedef NMDeviceClass NMDeviceVlanClass;
+/* defined in the parent class, but exposed on D-Bus by the subclass. */
+#define NM_DEVICE_VLAN_PARENT     NM_DEVICE_PARENT
+
+typedef struct _NMDeviceVlan NMDeviceVlan;
+typedef struct _NMDeviceVlanClass NMDeviceVlanClass;
 
 GType nm_device_vlan_get_type (void);