[Goodies-commits] r6669 - in gigolo/trunk: . src

Enrico Troeger enrico at xfce.org
Mon Feb 9 18:29:01 CET 2009


Author: enrico
Date: 2009-02-09 17:29:01 +0000 (Mon, 09 Feb 2009)
New Revision: 6669

Modified:
   gigolo/trunk/ChangeLog
   gigolo/trunk/src/backendgvfs.c
   gigolo/trunk/src/bookmark.c
   gigolo/trunk/src/bookmarkdialog.c
   gigolo/trunk/src/bookmarkeditdialog.c
   gigolo/trunk/src/menubuttonaction.c
   gigolo/trunk/src/mountdialog.c
   gigolo/trunk/src/passworddialog.c
   gigolo/trunk/src/preferencesdialog.c
   gigolo/trunk/src/settings.c
   gigolo/trunk/src/window.c
Log:
Use the G_DEFINE_TYPE() macro to generate the *_get_type() code.

Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/ChangeLog	2009-02-09 17:29:01 UTC (rev 6669)
@@ -3,6 +3,11 @@
  * src/main.c:
    Fix missing startup completion notification when
    "start-in-systray" is used.
+ * src/backendgvfs.c, src/bookmark.c, src/bookmarkdialog.c,
+   src/bookmarkeditdialog.c, src/menubuttonaction.c, src/mountdialog.c,
+   src/passworddialog.c, src/preferencesdialog.c, src/settings.c,
+   src/window.c:
+   Use the G_DEFINE_TYPE() macro to generate the *_get_type() code.
 
 
 2009-02-04  Enrico Tröger  <enrico(at)xfce(dot)org>

Modified: gigolo/trunk/src/backendgvfs.c
===================================================================
--- gigolo/trunk/src/backendgvfs.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/backendgvfs.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -59,41 +59,15 @@
 	GtkListStore *store;
 };
 
-static void gigolo_backend_gvfs_class_init			(GigoloBackendGVFSClass *klass);
-static void gigolo_backend_gvfs_init      			(GigoloBackendGVFS *self);
 static void gigolo_backend_gvfs_finalize  			(GObject *object);
 static void gigolo_backend_gvfs_set_property		(GObject *object, guint prop_id,
 													 const GValue *value, GParamSpec *pspec);
 
 
-static GObjectClass *parent_class = NULL;
+G_DEFINE_TYPE(GigoloBackendGVFS, gigolo_backend_gvfs, G_TYPE_OBJECT);
 
-GType gigolo_backend_gvfs_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloBackendGVFSClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_backend_gvfs_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloBackendGVFS),
-			0,
-			(GInstanceInitFunc)gigolo_backend_gvfs_init,
-			NULL /* value_table */
-		};
 
-		self_type = g_type_register_static(G_TYPE_OBJECT, "GigoloBackendGVFS", &self_info, 0);
-	}
 
-	return self_type;
-}
-
-
 static void gigolo_backend_gvfs_cclosure_marshal_VOID__STRING_STRING(
 											GClosure		*closure,
 							  G_GNUC_UNUSED GValue			*return_value,
@@ -140,8 +114,7 @@
 	g_object_class->finalize = gigolo_backend_gvfs_finalize;
 	g_object_class->set_property = gigolo_backend_gvfs_set_property;
 
-	parent_class = (GObjectClass*)g_type_class_peek(G_TYPE_OBJECT);
-	g_type_class_add_private((gpointer)klass, sizeof(GigoloBackendGVFSPrivate));
+	g_type_class_add_private(klass, sizeof(GigoloBackendGVFSPrivate));
 
 	g_object_class_install_property(g_object_class,
 										PROP_STORE,
@@ -177,8 +150,7 @@
 
 	self = GIGOLO_BACKEND_GVFS(object);
 
-	if (G_OBJECT_CLASS(parent_class)->finalize)
-		(* G_OBJECT_CLASS(parent_class)->finalize)(object);
+	G_OBJECT_CLASS(gigolo_backend_gvfs_parent_class)->finalize(object);
 }
 
 

Modified: gigolo/trunk/src/bookmark.c
===================================================================
--- gigolo/trunk/src/bookmark.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/bookmark.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -48,39 +48,11 @@
 	gboolean is_valid;
 };
 
-static void gigolo_bookmark_class_init		(GigoloBookmarkClass *klass);
-static void gigolo_bookmark_init      		(GigoloBookmark *self);
 static void gigolo_bookmark_finalize  		(GObject *object);
 
-/* Local data */
-static GObjectClass *parent_class = NULL;
+G_DEFINE_TYPE(GigoloBookmark, gigolo_bookmark, G_TYPE_OBJECT);
 
-GType gigolo_bookmark_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloBookmarkClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_bookmark_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloBookmark),
-			0,
-			(GInstanceInitFunc)gigolo_bookmark_init,
-			NULL /* value_table */
-		};
 
-		self_type = g_type_register_static(G_TYPE_OBJECT, "GigoloBookmark", &self_info, 0);
-	}
-
-	return self_type;
-}
-
-
 static void bookmark_clear(GigoloBookmark *self)
 {
 	GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(self);
@@ -112,8 +84,7 @@
 
 	g_object_class->finalize = gigolo_bookmark_finalize;
 
-	parent_class = (GObjectClass*)g_type_class_peek(G_TYPE_OBJECT);
-	g_type_class_add_private((gpointer)klass, sizeof(GigoloBookmarkPrivate));
+	g_type_class_add_private(klass, sizeof(GigoloBookmarkPrivate));
 }
 
 
@@ -121,7 +92,7 @@
 {
 	bookmark_clear(GIGOLO_BOOKMARK(object));
 
-	G_OBJECT_CLASS(parent_class)->finalize(object);
+	G_OBJECT_CLASS(gigolo_bookmark_parent_class)->finalize(object);
 }
 
 

Modified: gigolo/trunk/src/bookmarkdialog.c
===================================================================
--- gigolo/trunk/src/bookmarkdialog.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/bookmarkdialog.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -69,41 +69,13 @@
 	ACTION_DELETE
 };
 
-static void gigolo_bookmark_dialog_class_init		(GigoloBookmarkDialogClass *klass);
-static void gigolo_bookmark_dialog_init      		(GigoloBookmarkDialog *dialog);
 
-static GtkDialogClass *parent_class = NULL;
+G_DEFINE_TYPE(GigoloBookmarkDialog, gigolo_bookmark_dialog, GTK_TYPE_DIALOG);
 
-GType gigolo_bookmark_dialog_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloBookmarkDialogClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_bookmark_dialog_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloBookmarkDialog),
-			0,
-			(GInstanceInitFunc)gigolo_bookmark_dialog_init,
-			NULL /* value_table */
-		};
 
-		self_type = g_type_register_static(GTK_TYPE_DIALOG, "GigoloBookmarkDialog", &self_info, 0);
-	}
-
-	return self_type;
-}
-
-
 static void gigolo_bookmark_dialog_class_init(GigoloBookmarkDialogClass *klass)
 {
-	parent_class = (GtkDialogClass*)g_type_class_peek(GTK_TYPE_DIALOG);
-	g_type_class_add_private((gpointer)klass, sizeof(GigoloBookmarkDialogPrivate));
+	g_type_class_add_private(klass, sizeof(GigoloBookmarkDialogPrivate));
 }
 
 

Modified: gigolo/trunk/src/bookmarkeditdialog.c
===================================================================
--- gigolo/trunk/src/bookmarkeditdialog.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/bookmarkeditdialog.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -75,10 +75,8 @@
 	GigoloBookmark *bookmark_update;
 };
 
-static void gigolo_bookmark_edit_dialog_class_init			(GigoloBookmarkEditDialogClass *klass);
 static void gigolo_bookmark_edit_dialog_set_property		(GObject *object, guint prop_id,
 															 const GValue *value, GParamSpec *pspec);
-static void gigolo_bookmark_edit_dialog_init      			(GigoloBookmarkEditDialog *dialog);
 
 
 struct MethodInfo {
@@ -130,35 +128,11 @@
 static guint methods_len = G_N_ELEMENTS(methods);
 
 
-static GtkDialogClass *parent_class = NULL;
 
+G_DEFINE_TYPE(GigoloBookmarkEditDialog, gigolo_bookmark_edit_dialog, GTK_TYPE_DIALOG);
 
-GType gigolo_bookmark_edit_dialog_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloBookmarkEditDialogClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_bookmark_edit_dialog_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloBookmarkEditDialog),
-			0,
-			(GInstanceInitFunc)gigolo_bookmark_edit_dialog_init,
-			NULL /* value_table */
-		};
 
-		self_type = g_type_register_static(GTK_TYPE_DIALOG, "GigoloBookmarkEditDialog", &self_info, 0);
-	}
 
-	return self_type;
-}
-
-
 static void gigolo_bookmark_edit_dialog_destroy(GtkObject *object)
 {
 	GigoloBookmarkEditDialogPrivate *priv = GIGOLO_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(object);
@@ -177,7 +151,7 @@
 	gtk_widget_destroy(priv->share_label);
 	gtk_widget_destroy(priv->information_label);
 
-	GTK_OBJECT_CLASS(parent_class)->destroy(object);
+	GTK_OBJECT_CLASS(gigolo_bookmark_edit_dialog_parent_class)->destroy(object);
 }
 
 
@@ -273,15 +247,14 @@
 
 static void gigolo_bookmark_edit_dialog_class_init(GigoloBookmarkEditDialogClass *klass)
 {
-	GtkObjectClass *gtk_object_class = (GtkObjectClass *)klass;
+	GtkObjectClass *gtk_object_class = (GtkObjectClass *) klass;
 	GObjectClass *g_object_class = G_OBJECT_CLASS(klass);
 
 	gtk_object_class->destroy = gigolo_bookmark_edit_dialog_destroy;
 
 	g_object_class->set_property = gigolo_bookmark_edit_dialog_set_property;
 
-	parent_class = (GtkDialogClass*)g_type_class_peek(GTK_TYPE_DIALOG);
-	g_type_class_add_private((gpointer)klass, sizeof(GigoloBookmarkEditDialogPrivate));
+	g_type_class_add_private(klass, sizeof(GigoloBookmarkEditDialogPrivate));
 
 	g_object_class_install_property(g_object_class,
 									PROP_MODE,

Modified: gigolo/trunk/src/menubuttonaction.c
===================================================================
--- gigolo/trunk/src/menubuttonaction.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/menubuttonaction.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -45,37 +45,10 @@
 static guint signals[LAST_SIGNAL];
 
 
-static void gigolo_menu_button_action_class_init	(GigoloMenubuttonActionClass *klass);
-static void gigolo_menu_button_action_init      	(GigoloMenubuttonAction *action);
 
-static GtkActionClass *parent_class = NULL;
+G_DEFINE_TYPE(GigoloMenubuttonAction, gigolo_menu_button_action, GTK_TYPE_ACTION);
 
-GType gigolo_menu_button_action_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloMenubuttonActionClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_menu_button_action_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloMenubuttonAction),
-			0,
-			(GInstanceInitFunc)gigolo_menu_button_action_init,
-			NULL /* value_table */
-		};
 
-		self_type = g_type_register_static(GTK_TYPE_ACTION, "GigoloMenubuttonAction", &self_info, 0);
-	}
-
-	return self_type;
-}
-
-
 static void delegate_item_activated(GtkMenuItem *item, GigoloMenubuttonAction *action)
 {
 	g_signal_emit(action, signals[ITEM_CLICKED], 0, item);
@@ -175,7 +148,7 @@
 
 static void gigolo_menu_button_action_connect_proxy(GtkAction *action, GtkWidget *widget)
 {
-	GTK_ACTION_CLASS(parent_class)->connect_proxy(action, widget);
+	GTK_ACTION_CLASS(gigolo_menu_button_action_parent_class)->connect_proxy(action, widget);
 
 	/* Overwrite the icon and label of the toolbar button */
 	if (GTK_IS_TOOL_BUTTON(widget))
@@ -216,8 +189,6 @@
 	action_class->menu_item_type = GTK_TYPE_IMAGE_MENU_ITEM;
 	action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
 
-	parent_class = (GtkActionClass*)g_type_class_peek(GTK_TYPE_ACTION);
-
 	g_object_class_install_property(g_object_class,
 										PROP_SETTINGS,
 										g_param_spec_object (

Modified: gigolo/trunk/src/mountdialog.c
===================================================================
--- gigolo/trunk/src/mountdialog.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/mountdialog.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -50,47 +50,20 @@
 	guint timer_id;
 };
 
-static void gigolo_mount_dialog_class_init			(GigoloMountDialogClass *klass);
-static void gigolo_mount_dialog_init      			(GigoloMountDialog *self);
 static void gigolo_mount_dialog_destroy				(GtkObject *widget);
 
-/* Local data */
-static GtkDialogClass *parent_class = NULL;
 
-GType gigolo_mount_dialog_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloMountDialogClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_mount_dialog_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloMountDialog),
-			0,
-			(GInstanceInitFunc)gigolo_mount_dialog_init,
-			NULL /* value_table */
-		};
+G_DEFINE_TYPE(GigoloMountDialog, gigolo_mount_dialog, GTK_TYPE_DIALOG);
 
-		self_type = g_type_register_static(GTK_TYPE_DIALOG, "GigoloMountDialog", &self_info, 0);
-	}
 
-	return self_type;
-}
 
-
 static void gigolo_mount_dialog_class_init(GigoloMountDialogClass *klass)
 {
 	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
 
 	object_class->destroy = gigolo_mount_dialog_destroy;
 
-	parent_class = (GtkDialogClass*)g_type_class_peek(GTK_TYPE_DIALOG);
-	g_type_class_add_private((gpointer)klass, sizeof(GigoloMountDialogPrivate));
+	g_type_class_add_private(klass, sizeof(GigoloMountDialogPrivate));
 }
 
 
@@ -104,7 +77,7 @@
 		priv->timer_id = -1;
 	}
 
-    GTK_OBJECT_CLASS(parent_class)->destroy(widget);
+    GTK_OBJECT_CLASS(gigolo_mount_dialog_parent_class)->destroy(widget);
 }
 
 

Modified: gigolo/trunk/src/passworddialog.c
===================================================================
--- gigolo/trunk/src/passworddialog.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/passworddialog.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -45,42 +45,13 @@
 	GtkWidget *entry_password;
 };
 
-static void gigolo_password_dialog_class_init		(GigoloPasswordDialogClass *klass);
-static void gigolo_password_dialog_init      		(GigoloPasswordDialog *dialog);
 
-/* Local data */
-static GtkDialogClass *parent_class = NULL;
+G_DEFINE_TYPE(GigoloPasswordDialog, gigolo_password_dialog, GTK_TYPE_DIALOG);
 
-GType gigolo_password_dialog_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloPasswordDialogClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_password_dialog_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloPasswordDialog),
-			0,
-			(GInstanceInitFunc)gigolo_password_dialog_init,
-			NULL /* value_table */
-		};
 
-		self_type = g_type_register_static(GTK_TYPE_DIALOG, "GigoloPasswordDialog", &self_info, 0);
-	}
-
-	return self_type;
-}
-
-
 static void gigolo_password_dialog_class_init(GigoloPasswordDialogClass *klass)
 {
-	parent_class = (GtkDialogClass*)g_type_class_peek(GTK_TYPE_DIALOG);
-	g_type_class_add_private((gpointer)klass, sizeof(GigoloPasswordDialogPrivate));
+	g_type_class_add_private(klass, sizeof(GigoloPasswordDialogPrivate));
 }
 
 

Modified: gigolo/trunk/src/preferencesdialog.c
===================================================================
--- gigolo/trunk/src/preferencesdialog.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/preferencesdialog.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -35,43 +35,16 @@
 #define GIGOLO_PREFERENCES_DIALOG_GET_PRIVATE(obj)		(G_TYPE_INSTANCE_GET_PRIVATE((obj),\
 			GIGOLO_PREFERENCES_DIALOG_TYPE, GigoloPreferencesDialogPrivate))
 
-static void gigolo_preferences_dialog_class_init		(GigoloPreferencesDialogClass *klass);
-static void gigolo_preferences_dialog_init      		(GigoloPreferencesDialog *dialog);
 
-static GtkDialogClass *parent_class = NULL;
-
 enum
 {
     PROP_0,
     PROP_SETTINGS
 };
 
-GType gigolo_preferences_dialog_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloPreferencesDialogClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_preferences_dialog_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloPreferencesDialog),
-			0,
-			(GInstanceInitFunc)gigolo_preferences_dialog_init,
-			NULL /* value_table */
-		};
+G_DEFINE_TYPE(GigoloPreferencesDialog, gigolo_preferences_dialog, GTK_TYPE_DIALOG);
 
-		self_type = g_type_register_static(GTK_TYPE_DIALOG, "GigoloPreferencesDialog", &self_info, 0);
-	}
 
-	return self_type;
-}
-
-
 /* Create an Xfce header with icon and title (only used on Xfce).
  * (Code from Midori, thanks to Christian Dywan.) */
 static GtkWidget *xfce_header_new(const gchar *icon, const gchar *title)
@@ -524,8 +497,6 @@
 									"Settings instance to provide properties",
 									GIGOLO_SETTINGS_TYPE,
 									G_PARAM_WRITABLE));
-
-	parent_class = (GtkDialogClass*)g_type_class_peek(GTK_TYPE_DIALOG);
 }
 
 

Modified: gigolo/trunk/src/settings.c
===================================================================
--- gigolo/trunk/src/settings.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/settings.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -60,11 +60,8 @@
 	GigoloBookmarkList *bookmarks; /* array of known bookmarks */
 };
 
-static void gigolo_settings_class_init			(GigoloSettingsClass *klass);
-static void gigolo_settings_init				(GigoloSettings *self);
 static void gigolo_settings_finalize			(GObject* object);
 
-static GObjectClass *parent_class = NULL;
 
 /* keyfile section names */
 #define SECTION_GENERAL	"general"
@@ -91,32 +88,9 @@
 };
 
 
-GType gigolo_settings_get_type(void)
-{
-	static GType self_type = 0;
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloSettingsClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_settings_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloSettings),
-			0,
-			(GInstanceInitFunc)gigolo_settings_init,
-			NULL /* value_table */
-		};
+G_DEFINE_TYPE(GigoloSettings, gigolo_settings, G_TYPE_OBJECT);
 
-		self_type = g_type_register_static(G_TYPE_OBJECT, "GigoloSettings", &self_info, 0);
-	}
 
-	return self_type;
-}
-
-
 static void gigolo_settings_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
 	GigoloSettingsPrivate *priv = GIGOLO_SETTINGS_GET_PRIVATE(object);
@@ -207,8 +181,7 @@
 	gobject_class->get_property = gigolo_settings_get_property;
 	gobject_class->set_property = gigolo_settings_set_property;
 
-	parent_class = (GObjectClass*)g_type_class_peek(G_TYPE_OBJECT);
-	g_type_class_add_private((gpointer)klass, sizeof(GigoloSettingsPrivate));
+	g_type_class_add_private(klass, sizeof(GigoloSettingsPrivate));
 
 	g_object_class_install_property(gobject_class,
 									PROP_SAVE_GEOMETRY,
@@ -478,7 +451,7 @@
 	g_free(priv->bookmarks_filename);
 	g_free(priv->config_path);
 
-	G_OBJECT_CLASS(parent_class)->finalize(object);
+	G_OBJECT_CLASS(gigolo_settings_parent_class)->finalize(object);
 }
 
 

Modified: gigolo/trunk/src/window.c
===================================================================
--- gigolo/trunk/src/window.c	2009-02-09 16:58:06 UTC (rev 6668)
+++ gigolo/trunk/src/window.c	2009-02-09 17:29:01 UTC (rev 6669)
@@ -93,39 +93,10 @@
 	VIEW_MODE_TREEVIEW
 };
 
-static void gigolo_window_class_init			(GigoloWindowClass *klass);
-static void gigolo_window_init					(GigoloWindow *window);
 
-static GtkWindowClass *parent_class = NULL;
+G_DEFINE_TYPE(GigoloWindow, gigolo_window, GTK_TYPE_WINDOW);
 
 
-GType gigolo_window_get_type(void)
-{
-	static GType self_type = 0;
-
-	if (! self_type)
-	{
-		static const GTypeInfo self_info =
-		{
-			sizeof(GigoloWindowClass),
-			NULL, /* base_init */
-			NULL, /* base_finalize */
-			(GClassInitFunc)gigolo_window_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof(GigoloWindow),
-			0,
-			(GInstanceInitFunc)gigolo_window_init,
-			NULL /* value_table */
-		};
-
-		self_type = g_type_register_static(GTK_TYPE_WINDOW, "GigoloWindow", &self_info, 0);
-	}
-
-	return self_type;
-}
-
-
 static gboolean gigolo_window_state_event(GtkWidget *widget, GdkEventWindowState *event)
 {
 	GigoloWindowPrivate *priv = GIGOLO_WINDOW_GET_PRIVATE(widget);
@@ -212,8 +183,7 @@
 	gtkwidget_class->delete_event = gigolo_window_delete_event;
 	gtkwidget_class->window_state_event = gigolo_window_state_event;
 
-	parent_class =(GtkWindowClass*)g_type_class_peek(GTK_TYPE_WINDOW);
-	g_type_class_add_private((gpointer)klass, sizeof(GigoloWindowPrivate));
+	g_type_class_add_private(klass, sizeof(GigoloWindowPrivate));
 }
 
 
@@ -1312,7 +1282,6 @@
 }
 
 
-
 GtkWidget *gigolo_window_new(GigoloSettings *settings)
 {
 	GtkWidget *window;




More information about the Goodies-commits mailing list