Merge tag 'upstream/1.1.90' into experimental

Upstream version 1.1.90

1 files changed, 4 insertions, 8 deletions

diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h
index cc004fa9..1682ba7f 100644
--- a/src/nm-auth-subject.h
+++ b/src/nm-auth-subject.h
@@ -21,13 +21,9 @@
 #ifndef __NETWORKMANAGER_AUTH_SUBJECT_H__
 #define __NETWORKMANAGER_AUTH_SUBJECT_H__
 
-#include <config.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
+#include "config.h"
 
-#include "nm-types.h"
+#include "nm-default.h"
 
 #define NM_TYPE_AUTH_SUBJECT            (nm_auth_subject_get_type ())
 #define NM_AUTH_SUBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUTH_SUBJECT, NMAuthSubject))
@@ -59,9 +55,9 @@ GType nm_auth_subject_get_type (void);
 
 NMAuthSubject *nm_auth_subject_new_internal (void);
 
-NMAuthSubject *nm_auth_subject_new_unix_process_from_context (DBusGMethodInvocation *context);
+NMAuthSubject *nm_auth_subject_new_unix_process_from_context (GDBusMethodInvocation *context);
 
-NMAuthSubject *nm_auth_subject_new_unix_process_from_message (DBusConnection *connection, DBusMessage *message);
+NMAuthSubject *nm_auth_subject_new_unix_process_from_message (GDBusConnection *connection, GDBusMessage *message);
 
 
 NMAuthSubjectType nm_auth_subject_get_subject_type (NMAuthSubject *subject);