[gnome-online-accounts] daemon: Use G_DECLARE_FINAL_TYPE

[Debarshi Ray <debarshir src gnome org>]

commit 468747dd80e71033daff8ac56df91ed4b497d0d5
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Jan 9 15:09:23 2017 +0100

    daemon: Use G_DECLARE_FINAL_TYPE
    
    Bump minimum GLib version to 2.44.

 configure.ac                |    2 +-
 src/daemon/goadaemon.c      |    5 -----
 src/daemon/goadaemon.h      |    5 +----
 src/daemon/goadaemontypes.h |    3 ---
 4 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5fe792b..d009352 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ GTK_DOC_CHECK([1.3])
 # Libraries
 #
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 gio-2.0 gio-unix-2.0 >= 2.40])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 gio-2.0 gio-unix-2.0 >= 2.44])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
diff --git a/src/daemon/goadaemon.c b/src/daemon/goadaemon.c
index 4b21ed9..b0dabbf 100644
--- a/src/daemon/goadaemon.c
+++ b/src/daemon/goadaemon.c
@@ -54,11 +54,6 @@ struct _GoaDaemon
   guint credentials_timeout_id;
 };
 
-typedef struct
-{
-  GObjectClass parent_class;
-} GoaDaemonClass;
-
 static void on_file_monitor_changed (GFileMonitor     *monitor,
                                      GFile            *file,
                                      GFile            *other_file,
diff --git a/src/daemon/goadaemon.h b/src/daemon/goadaemon.h
index 16bd0c8..1ff3a8b 100644
--- a/src/daemon/goadaemon.h
+++ b/src/daemon/goadaemon.h
@@ -19,16 +19,13 @@
 #ifndef __GOA_DAEMON_H__
 #define __GOA_DAEMON_H__
 
-#include "goadaemontypes.h"
 #include <goa/goa.h>
 
 G_BEGIN_DECLS
 
 #define GOA_TYPE_DAEMON  (goa_daemon_get_type ())
-#define GOA_DAEMON(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_DAEMON, GoaDaemon))
-#define GOA_IS_DAEMON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_DAEMON))
+G_DECLARE_FINAL_TYPE (GoaDaemon, goa_daemon, GOA, DAEMON, GObject);
 
-GType               goa_daemon_get_type           (void) G_GNUC_CONST;
 GoaDaemon          *goa_daemon_new                (void);
 
 G_END_DECLS
diff --git a/src/daemon/goadaemontypes.h b/src/daemon/goadaemontypes.h
index 0fdc0f1..ffa075c 100644
--- a/src/daemon/goadaemontypes.h
+++ b/src/daemon/goadaemontypes.h
@@ -23,9 +23,6 @@
 
 G_BEGIN_DECLS
 
-struct _GoaDaemon;
-typedef struct _GoaDaemon GoaDaemon;
-
 G_END_DECLS
 
 #endif /* __GOA_DAEMON_TYPES_H__ */