auth-provider: refactor and simplify

The auth provider setup is a bit over-engineered. Simplify it by
making a single MMAuthProvider object that may or may not use polkit,
depending on configure options. This object is also setup as a
singleton object using the helper MM_DEFINE_SINGLETON_GETTER().

1 files changed, 17 insertions, 36 deletions

diff --git a/src/mm-auth-provider.h b/src/mm-auth-provider.h
index 0f1270ce..c33e42ce 100644
--- a/src/mm-auth-provider.h
+++ b/src/mm-auth-provider.h
@@ -17,6 +17,7 @@
 #ifndef MM_AUTH_PROVIDER_H
 #define MM_AUTH_PROVIDER_H
 
+#include <config.h>
 #include <gio/gio.h>
 
 #define MM_TYPE_AUTH_PROVIDER            (mm_auth_provider_get_type ())
@@ -37,41 +38,21 @@
 #define MM_AUTHORIZATION_TIME            "org.freedesktop.ModemManager1.Time"
 #define MM_AUTHORIZATION_FIRMWARE        "org.freedesktop.ModemManager1.Firmware"
 
-typedef struct _MMAuthProvider MMAuthProvider;
-typedef struct _MMAuthProviderClass MMAuthProviderClass;
-
-struct _MMAuthProvider {
-    GObject parent;
-};
-
-struct _MMAuthProviderClass {
-    GObjectClass parent;
-
-    /* Perform authorization checks in this request (async).
-     * Returns TRUE if authorized, FALSE if error is set. */
-    void (* authorize) (MMAuthProvider *self,
-                        GDBusMethodInvocation *invocation,
-                        const gchar *authorization,
-                        GCancellable *cancellable,
-                        GAsyncReadyCallback callback,
-                        gpointer user_data);
-    gboolean (* authorize_finish) (MMAuthProvider *self,
-                                   GAsyncResult *res,
-                                   GError **error);
-};
-
-GType mm_auth_provider_get_type (void);
-
-MMAuthProvider *mm_auth_provider_new (void);
-
-void mm_auth_provider_authorize (MMAuthProvider *self,
-                                 GDBusMethodInvocation *invocation,
-                                 const gchar *authorization,
-                                 GCancellable *cancellable,
-                                 GAsyncReadyCallback callback,
-                                 gpointer user_data);
-gboolean mm_auth_provider_authorize_finish (MMAuthProvider *self,
-                                            GAsyncResult *res,
-                                            GError **error);
+typedef struct _MMAuthProvider        MMAuthProvider;
+typedef struct _MMAuthProviderClass   MMAuthProviderClass;
+typedef struct _MMAuthProviderPrivate MMAuthProviderPrivate;
+
+GType           mm_auth_provider_get_type (void);
+MMAuthProvider *mm_auth_provider_get      (void);
+
+void     mm_auth_provider_authorize        (MMAuthProvider         *self,
+                                            GDBusMethodInvocation  *invocation,
+                                            const gchar            *authorization,
+                                            GCancellable           *cancellable,
+                                            GAsyncReadyCallback     callback,
+                                            gpointer                user_data);
+gboolean mm_auth_provider_authorize_finish (MMAuthProvider         *self,
+                                            GAsyncResult           *res,
+                                            GError                **error);
 
 #endif /* MM_AUTH_PROVIDER_H */