summary refs log tree commit diff
path: root/src/nm-active-connection.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-05-11 22:08:45 +0200
committerMichael Biebl <biebl@debian.org>2018-05-11 22:08:45 +0200
commitee9c73a923909e23a649407be77e25235d769e25 (patch)
treee21c923621fa278e737da693df9eb60ea31a6067 /src/nm-active-connection.h
parentf60117b41d5433be1b4a96d82cd11d0c3dce9b63 (diff)
New upstream version 1.10.8 upstream/1.10.8
Diffstat (limited to 'src/nm-active-connection.h')
-rw-r--r--src/nm-active-connection.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
index c3d08b64..9b6a49ef 100644
--- a/src/nm-active-connection.h
+++ b/src/nm-active-connection.h
@@ -21,9 +21,10 @@
 #ifndef __NETWORKMANAGER_ACTIVE_CONNECTION_H__
 #define __NETWORKMANAGER_ACTIVE_CONNECTION_H__
 
-#include "c-list/src/c-list.h"
+#include "nm-exported-object.h"
 #include "nm-connection.h"
-#include "nm-dbus-object.h"
+
+#include "nm-utils/c-list.h"
 
 #define NM_TYPE_ACTIVE_CONNECTION            (nm_active_connection_get_type ())
 #define NM_ACTIVE_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnection))
@@ -71,7 +72,7 @@
 struct _NMActiveConnectionPrivate;
 
 struct _NMActiveConnection {
-	NMDBusObject parent;
+	NMExportedObject parent;
 	struct _NMActiveConnectionPrivate *_priv;
 
 	/* active connection can be tracked in a list by NMManager. This is
@@ -80,7 +81,7 @@ struct _NMActiveConnection {
 };
 
 typedef struct {
-	NMDBusObjectClass parent;
+	NMExportedObjectClass parent;
 
 	/* re-emits device state changes as a convenience for subclasses for
 	 * device states >= DISCONNECTED.