[Xfce4-commits] <xfce4-session:master> Use G_DEFINE_TYPE macro.

[Nick Schermer]

Updating branch refs/heads/master
         to 64d8538953752b54799acfa77ae05e1a4ac42593 (commit)
       from a9f4b964819703abfab5e9b7964b98b6136ac676 (commit)

commit 64d8538953752b54799acfa77ae05e1a4ac42593
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Feb 7 13:24:27 2010 +0100

    Use G_DEFINE_TYPE macro.

 settings/xfae-dialog.c        |   33 ++++++---------------------------
 xfce4-session/xfce_trayicon.c |   37 ++-----------------------------------
 xfce4-session/xfsm-chooser.c  |   35 ++---------------------------------
 3 files changed, 10 insertions(+), 95 deletions(-)

diff --git a/settings/xfae-dialog.c b/settings/xfae-dialog.c
index 83a2bf8..18bfcd2 100644
--- a/settings/xfae-dialog.c
+++ b/settings/xfae-dialog.c
@@ -27,7 +27,6 @@
 
 #include <libxfce4ui/libxfce4ui.h>
 
-static void xfae_dialog_init   (XfaeDialog *dialog);
 static void xfae_dialog_update (XfaeDialog *dialog);
 static void xfae_dialog_browse (XfaeDialog *dialog);
 
@@ -49,33 +48,13 @@ struct _XfaeDialog
 
 
 
-GType
-xfae_dialog_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (XfaeDialog, xfae_dialog, GTK_TYPE_DIALOG)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (XfaeDialogClass),
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        sizeof (XfaeDialog),
-        0,
-        (GInstanceInitFunc) xfae_dialog_init,
-        NULL,
-      };
-
-      type = g_type_register_static (GTK_TYPE_DIALOG,
-                                     "XfaeDialog",
-                                     &info, 0);
-    }
 
-  return type;
+
+static void
+xfae_dialog_class_init (XfaeDialogClass *klass)
+{
 }
 
 
diff --git a/xfce4-session/xfce_trayicon.c b/xfce4-session/xfce_trayicon.c
index fab0dbf..6590595 100644
--- a/xfce4-session/xfce_trayicon.c
+++ b/xfce4-session/xfce_trayicon.c
@@ -39,8 +39,6 @@ enum
 };
 
 /* static prototypes */
-static void	xfce_tray_icon_class_init(XfceTrayIconClass *);
-static void	xfce_tray_icon_init(XfceTrayIcon *);
 static void	xfce_tray_icon_finalize(GObject *);
 static void	xfce_tray_icon_reconnect(XfceTrayIcon *);
 static void	xfce_tray_icon_destroy(GtkWidget *, XfceTrayIcon *);
@@ -48,40 +46,11 @@ static void	xfce_tray_icon_press(GtkWidget *, GdkEventButton *,
 			XfceTrayIcon *);
 static void	xfce_tray_icon_popup(GtkWidget *, XfceTrayIcon *);
 
-/* parent class */
-static GObjectClass	*parent_class;
-
 /* tray icon signals */
 static guint 		tray_signals[LAST_SIGNAL];
 
-/*
- */
-GType
-xfce_tray_icon_get_type(void)
-{
-	static GType tray_icon_type = 0;
 
-	if (!tray_icon_type) {
-		static const GTypeInfo tray_icon_info = {
-			sizeof(XfceTrayIconClass),
-			NULL,
-			NULL,
-			(GClassInitFunc)xfce_tray_icon_class_init,
-			NULL,
-			NULL,
-			sizeof(XfceTrayIcon),
-			0,
-			(GInstanceInitFunc)xfce_tray_icon_init
-		};
-
-		tray_icon_type = g_type_register_static(
-				GTK_TYPE_OBJECT,
-				"XfceTrayIcon",
-				&tray_icon_info,
-				0);
-	}
-
-	return(tray_icon_type);
+G_DEFINE_TYPE (XfceTrayIcon, xfce_tray_icon, GTK_TYPE_OBJECT)
 }
 
 /*
@@ -91,8 +60,6 @@ xfce_tray_icon_class_init(XfceTrayIconClass *klass)
 {
 	GObjectClass *gobject_class;
 
-	parent_class = gtk_type_class(GTK_TYPE_OBJECT);
-
 	gobject_class = G_OBJECT_CLASS(klass);
 	gobject_class->finalize = xfce_tray_icon_finalize;
 
@@ -167,7 +134,7 @@ xfce_tray_icon_finalize(GObject *object)
 	if (icon->tip_private != NULL)
 		g_free(icon->tip_private);
 
-	G_OBJECT_CLASS(parent_class)->finalize(object);
+	G_OBJECT_CLASS(xfce_tray_icon_parent_class)->finalize(object);
 }
 
 /*
diff --git a/xfce4-session/xfsm-chooser.c b/xfce4-session/xfsm-chooser.c
index 7ed0e0a..cf2a482 100644
--- a/xfce4-session/xfsm-chooser.c
+++ b/xfce4-session/xfsm-chooser.c
@@ -45,8 +45,6 @@
 #define BORDER 6
 
 
-static void xfsm_chooser_class_init (XfsmChooserClass *klass);
-static void xfsm_chooser_init (XfsmChooser *chooser);
 static void xfsm_chooser_finalize (GObject *object);
 static void xfsm_chooser_row_activated (GtkTreeView       *treeview,
                                         GtkTreePath       *path,
@@ -66,36 +64,9 @@ enum
 };
 
 
-static GObjectClass *parent_class;
 
+G_DEFINE_TYPE (XfsmChooser, xfsm_chooser, GTK_TYPE_DIALOG)
 
-GType
-xfsm_chooser_get_type (void)
-{
-  static GType chooser_type = 0;
-
-  if (chooser_type == 0)
-    {
-      static const GTypeInfo chooser_info = {
-        sizeof (XfsmChooserClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) xfsm_chooser_class_init,
-        NULL,
-        NULL,
-        sizeof (XfsmChooser),
-        0,
-        (GInstanceInitFunc) xfsm_chooser_init,
-      };
-
-      chooser_type = g_type_register_static (GTK_TYPE_DIALOG,
-                                             "XfsmChooser",
-                                             &chooser_info,
-                                             0);
-    }
-
-  return chooser_type;
-}
 
 
 void
@@ -164,8 +135,6 @@ xfsm_chooser_class_init (XfsmChooserClass *klass)
 
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = xfsm_chooser_finalize;
-
-  parent_class = gtk_type_class (gtk_dialog_get_type ());
 }
 
 
@@ -264,7 +233,7 @@ xfsm_chooser_finalize (GObject *object)
   chooser = XFSM_CHOOSER (object);
   g_object_unref (chooser->tooltips);
 
-  G_OBJECT_CLASS (parent_class)->finalize (object);
+  G_OBJECT_CLASS (xfsm_chooser_parent_class)->finalize (object);
 }