From a58b32a5b362f5059c697d9ff39b7fcee536a4df Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Sat, 26 Dec 2015 21:38:50 -0500
Subject: Start modernizing GObject usage

Long way to go...
---
 src/trg-gtk-app.h | 40 +++++++++-------------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

(limited to 'src/trg-gtk-app.h')

diff --git a/src/trg-gtk-app.h b/src/trg-gtk-app.h
index b60425a..e369fae 100644
--- a/src/trg-gtk-app.h
+++ b/src/trg-gtk-app.h
@@ -17,39 +17,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gtk/gtk.h>
-
-#ifndef TRG_GTKAPP_
-#define TRG_GTKAPP_
-#if GTK_CHECK_VERSION( 3, 0, 0 )
 
-#include <glib-object.h>
+#pragma once
 
+#include <gtk/gtk.h>
 #include "trg-client.h"
 
 G_BEGIN_DECLS
-#define TRG_TYPE_GTK_APP trg_gtk_app_get_type()
-#define TRG_GTK_APP(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRG_TYPE_GTK_APP, TrgGtkApp))
-#define TRG_GTK_APP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), TRG_TYPE_GTK_APP, TrgGtkAppClass))
-#define TRG_IS_GTK_APP(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRG_TYPE_GTK_APP))
-#define TRG_IS_GTK_APP_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRG_TYPE_GTK_APP))
-#define TRG_GTK_APP_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), TRG_TYPE_GTK_APP, TrgGtkAppClass))
-    typedef struct {
-    GtkApplication parent;
-} TrgGtkApp;
-
-typedef struct {
-    GtkApplicationClass parent_class;
-} TrgGtkAppClass;
-
-GType trg_gtk_app_get_type(void);
-
-TrgGtkApp *trg_gtk_app_new(TrgClient * client);
-
-#endif
-#endif
+
+#define TRG_TYPE_GTK_APP (trg_gtk_app_get_type())
+G_DECLARE_FINAL_TYPE (TrgGtkApp, trg_gtk_app, TRG, GTK_APP, GtkApplication)
+
+TrgGtkApp *trg_gtk_app_new (TrgClient *client);
+
+G_END_DECLS
-- 
cgit v1.2.3