Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 2 insertions, 8 deletions

diff --git a/src/nm-audit-manager.h b/src/nm-audit-manager.h
index af8a2037..29bde1a5 100644
--- a/src/nm-audit-manager.h
+++ b/src/nm-audit-manager.h
@@ -22,7 +22,7 @@
 #define __NM_AUDIT_MANAGER_H__
 
 #include "nm-connection.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-types.h"
 
 #define NM_TYPE_AUDIT_MANAGER            (nm_audit_manager_get_type ())
@@ -32,13 +32,7 @@
 #define NM_IS_AUDIT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_AUDIT_MANAGER))
 #define NM_AUDIT_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_AUDIT_MANAGER, NMAuditManagerClass))
 
-struct _NMAuditManager {
-	GObject parent;
-};
-
-typedef struct {
-	GObjectClass parent;
-} NMAuditManagerClass;
+typedef struct _NMAuditManagerClass NMAuditManagerClass;
 
 #define NM_AUDIT_OP_CONN_ADD                "connection-add"
 #define NM_AUDIT_OP_CONN_DELETE             "connection-delete"