summaryrefslogtreecommitdiff
path: root/src/nm-active-connection.h
diff options
context:
space:
mode:
authorDan Winship <danw@redhat.com>2015-04-13 13:31:42 -0400
committerDan Winship <danw@redhat.com>2015-07-24 13:25:47 -0400
commit6fcc1deee0a9549d753813f9406ea1d74a2a8e8c (patch)
tree6eda31c6115d9e42600adf531610e1a1fcb80507 /src/nm-active-connection.h
parentf3d10b3ec8aa6674f8146ea6d1fd9d872af50083 (diff)
downloadNetworkManager-6fcc1deee0a9549d753813f9406ea1d74a2a8e8c.tar.gz
core: add an NMExportedObject base class
Add NMExportedObject, make it the base class of all D-Bus-exported types, and move the nm-properties-changed-signal logic into it. (Also, make NMSettings use the same properties-changed code as everything else, which it was not previously doing, presumably for historical reasons). (This is mostly just shuffling code around at this point, but NMExportedObject will be more important in the gdbus port, since gdbus-codegen doesn't do a very good job of supporting objects that export multiple interfaces [as each NMDevice subclass does, for example], so we will need more glue/helper code in NMExportedObject then.)
Diffstat (limited to 'src/nm-active-connection.h')
-rw-r--r--src/nm-active-connection.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
index 01568c8fe0..a483895ade 100644
--- a/src/nm-active-connection.h
+++ b/src/nm-active-connection.h
@@ -21,8 +21,7 @@
#ifndef __NETWORKMANAGER_ACTIVE_CONNECTION_H__
#define __NETWORKMANAGER_ACTIVE_CONNECTION_H__
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-exported-object.h"
#include "nm-connection.h"
#define NM_TYPE_ACTIVE_CONNECTION (nm_active_connection_get_type ())
@@ -61,11 +60,11 @@
#define NM_ACTIVE_CONNECTION_DEVICE_METERED_CHANGED "device-metered-changed"
struct _NMActiveConnection {
- GObject parent;
+ NMExportedObject parent;
};
typedef struct {
- GObjectClass parent;
+ NMExportedObjectClass parent;
/* re-emits device state changes as a convenience for subclasses for
* device states >= DISCONNECTED.