GNOME.org
 

[gthumb] no need to set the parent_class explictly

commit 34b147bf2c6cacd06224b95a377d334c6cf3b700
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Tue Nov 1 17:50:07 2011 +0100

    no need to set the parent_class explictly

 extensions/edit_metadata/gth-edit-comment-page.c   |    1 -
 extensions/facebook/facebook-user.c                |    1 -
 extensions/gstreamer_tools/gth-media-viewer-page.c |    1 -
 extensions/image_viewer/gth-image-viewer-page.c    |    1 -
 gthumb/dom.c                                       |    3 --
 gthumb/gth-browser.c                               |   12 +++----
 gthumb/gth-image-navigator.c                       |    4 --
 gthumb/gth-image-viewer.c                          |   30 +++++++++----------
 gthumb/gth-location-chooser.c                      |   14 ++++-----
 gthumb/gth-menu-action.c                           |   12 ++-----
 gthumb/gth-progress-dialog.c                       |    2 -
 gthumb/gth-request-dialog.c                        |    1 -
 gthumb/gth-toggle-menu-action.c                    |   12 ++-----
 gthumb/gth-window.c                                |   15 ++++------
 gthumb/main.c                                      |    2 -
 15 files changed, 39 insertions(+), 72 deletions(-)
---
diff --git a/extensions/edit_metadata/gth-edit-comment-page.c b/extensions/edit_metadata/gth-edit-comment-page.c
index 6019f93..9217a39 100644
--- a/extensions/edit_metadata/gth-edit-comment-page.c
+++ b/extensions/edit_metadata/gth-edit-comment-page.c
@@ -418,7 +418,6 @@ gth_edit_comment_page_finalize (GObject *object)
 static void
 gth_edit_comment_page_class_init (GthEditCommentPageClass *klass)
 {
-	gth_edit_comment_page_parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthEditCommentPagePrivate));
 
 	G_OBJECT_CLASS (klass)->finalize = gth_edit_comment_page_finalize;
diff --git a/extensions/facebook/facebook-user.c b/extensions/facebook/facebook-user.c
index 89aa683..f745edb 100644
--- a/extensions/facebook/facebook-user.c
+++ b/extensions/facebook/facebook-user.c
@@ -53,7 +53,6 @@ facebook_user_finalize (GObject *obj)
 static void
 facebook_user_class_init (FacebookUserClass *klass)
 {
-	facebook_user_parent_class = g_type_class_peek_parent (klass);
 	G_OBJECT_CLASS (klass)->finalize = facebook_user_finalize;
 }
 
diff --git a/extensions/gstreamer_tools/gth-media-viewer-page.c b/extensions/gstreamer_tools/gth-media-viewer-page.c
index 4e8a83e..5335c4a 100644
--- a/extensions/gstreamer_tools/gth-media-viewer-page.c
+++ b/extensions/gstreamer_tools/gth-media-viewer-page.c
@@ -1300,7 +1300,6 @@ gth_media_viewer_page_finalize (GObject *obj)
 static void
 gth_media_viewer_page_class_init (GthMediaViewerPageClass *klass)
 {
-	gth_media_viewer_page_parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthMediaViewerPagePrivate));
 
 	G_OBJECT_CLASS (klass)->finalize = gth_media_viewer_page_finalize;
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index 69c307c..002b6bc 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -1392,7 +1392,6 @@ gth_image_viewer_page_finalize (GObject *obj)
 static void
 gth_image_viewer_page_class_init (GthImageViewerPageClass *klass)
 {
-	gth_image_viewer_page_parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthImageViewerPagePrivate));
 
 	G_OBJECT_CLASS (klass)->finalize = gth_image_viewer_page_finalize;
diff --git a/gthumb/dom.c b/gthumb/dom.c
index 3ff39e3..8065d05 100644
--- a/gthumb/dom.c
+++ b/gthumb/dom.c
@@ -219,7 +219,6 @@ dom_element_finalize (GObject *obj)
 static void
 dom_element_class_init (DomElementClass *klass)
 {
-	dom_element_parent_class = g_type_class_peek_parent (klass);
 	G_OBJECT_CLASS (klass)->finalize = dom_element_finalize;
 	DOM_ELEMENT_CLASS (klass)->dump = dom_element_real_dump;
 }
@@ -418,7 +417,6 @@ dom_text_node_finalize (GObject *obj)
 static void
 dom_text_node_class_init (DomTextNodeClass *klass)
 {
-	dom_text_node_parent_class = g_type_class_peek_parent (klass);
 	G_OBJECT_CLASS (klass)->finalize = dom_text_node_finalize;
 	DOM_ELEMENT_CLASS (klass)->dump = dom_text_node_real_dump;
 }
@@ -469,7 +467,6 @@ dom_document_finalize (GObject *obj)
 static void
 dom_document_class_init (DomDocumentClass *klass)
 {
-	dom_document_parent_class = g_type_class_peek_parent (klass);
 	G_OBJECT_CLASS (klass)->finalize = dom_document_finalize;
 }
 
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 496963a..5f09394 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -77,6 +77,9 @@
 #define STATUSBAR_SEPARATOR " Â "
 
 
+G_DEFINE_TYPE (GthBrowser, gth_browser, GTH_TYPE_WINDOW)
+
+
 enum {
 	LOCATION_READY,
 	LAST_SIGNAL
@@ -190,7 +193,6 @@ struct _GthBrowserPrivate {
 };
 
 
-static GthWindowClass *parent_class = NULL;
 static guint gth_browser_signals[LAST_SIGNAL] = { 0 };
 
 
@@ -2371,7 +2373,7 @@ _gth_browser_real_set_current_page (GthWindow *window,
 	if (page == prev_page)
 		return;
 
-	GTH_WINDOW_CLASS (parent_class)->set_current_page (window, page);
+	GTH_WINDOW_CLASS (gth_browser_parent_class)->set_current_page (window, page);
 
 	/* update the ui commands */
 
@@ -2507,7 +2509,7 @@ gth_browser_finalize (GObject *object)
 	_g_object_unref (browser->priv->forward_history_menu);
 	_g_object_unref (browser->priv->go_parent_menu);
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (gth_browser_parent_class)->finalize (object);
 }
 
 
@@ -2517,7 +2519,6 @@ gth_browser_class_init (GthBrowserClass *klass)
 	GObjectClass   *gobject_class;
 	GthWindowClass *window_class;
 
-	parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthBrowserPrivate));
 
 	gobject_class = G_OBJECT_CLASS (klass);
@@ -4594,9 +4595,6 @@ gth_browser_init (GthBrowser *browser)
 }
 
 
-G_DEFINE_TYPE(GthBrowser, gth_browser, GTH_TYPE_WINDOW)
-
-
 GtkWidget *
 gth_browser_new (GFile *location)
 {
diff --git a/gthumb/gth-image-navigator.c b/gthumb/gth-image-navigator.c
index bfa24b0..d57a1d1 100644
--- a/gthumb/gth-image-navigator.c
+++ b/gthumb/gth-image-navigator.c
@@ -53,9 +53,6 @@ struct _GthImageNavigatorPrivate {
 };
 
 
-static gpointer parent_class = NULL;
-
-
 static void
 _gth_image_navigator_set_viewer (GthImageNavigator *self,
 			         GtkWidget         *viewer)
@@ -276,7 +273,6 @@ gth_image_navigator_class_init (GthImageNavigatorClass *klass)
 	GtkWidgetClass    *widget_class;
 	GtkContainerClass *container_class;
 
-	parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthImageNavigatorPrivate));
 
 	object_class = (GObjectClass *) klass;
diff --git a/gthumb/gth-image-viewer.c b/gthumb/gth-image-viewer.c
index 44740c1..1585918 100644
--- a/gthumb/gth-image-viewer.c
+++ b/gthumb/gth-image-viewer.c
@@ -49,6 +49,12 @@
 #define STEP_INCREMENT  20.0  /* Scroll increment. */
 
 
+G_DEFINE_TYPE_WITH_CODE (GthImageViewer,
+			 gth_image_viewer,
+			 GTK_TYPE_WIDGET,
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
+
+
 enum {
 	PROP_0,
 	PROP_HADJUSTMENT,
@@ -125,7 +131,6 @@ struct _GthImageViewerPrivate {
 };
 
 
-static gpointer parent_class = NULL;
 static guint gth_image_viewer_signals[LAST_SIGNAL] = { 0 };
 
 
@@ -177,7 +182,7 @@ gth_image_viewer_finalize (GObject *object)
 	_cairo_clear_surface (&self->priv->iter_surface);
 	_cairo_clear_surface (&self->priv->surface);
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (gth_image_viewer_parent_class)->finalize (object);
 }
 
 
@@ -436,7 +441,7 @@ gth_image_viewer_unrealize (GtkWidget *widget)
 
 	gth_image_viewer_tool_unrealize (self->priv->tool);
 
-	GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+	GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->unrealize (widget);
 }
 
 
@@ -447,7 +452,7 @@ gth_image_viewer_map (GtkWidget *widget)
 
 	g_return_if_fail (GTH_IS_IMAGE_VIEWER (widget));
 
-	GTK_WIDGET_CLASS (parent_class)->map (widget);
+	GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->map (widget);
 
 	self = GTH_IMAGE_VIEWER (widget);
 	gth_image_viewer_tool_map (self->priv->tool);
@@ -464,7 +469,7 @@ gth_image_viewer_unmap (GtkWidget *widget)
 	self = GTH_IMAGE_VIEWER (widget);
 	gth_image_viewer_tool_unmap (self->priv->tool);
 
-	GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+	GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->unmap (widget);
 }
 
 
@@ -698,8 +703,8 @@ gth_image_viewer_key_press (GtkWidget   *widget,
 	if (handled)
 		return TRUE;
 
-	if (GTK_WIDGET_CLASS (parent_class)->key_press_event &&
-	    GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
+	if (GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->key_press_event &&
+	    GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->key_press_event (widget, event))
 		return TRUE;
 
 	return FALSE;
@@ -998,7 +1003,7 @@ gth_image_viewer_style_updated (GtkWidget *widget)
 {
 	GthImageViewer *self = GTH_IMAGE_VIEWER (widget);
 
-	GTK_WIDGET_CLASS (parent_class)->style_updated (widget);
+	GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->style_updated (widget);
 
 	if (self->priv->transp_type == GTH_TRANSP_TYPE_NONE) {
 		GdkRGBA color;
@@ -1251,7 +1256,6 @@ gth_image_viewer_class_init (GthImageViewerClass *class)
 	GtkWidgetClass *widget_class;
 	GtkBindingSet  *binding_set;
 
-	parent_class = g_type_class_peek_parent (class);
 	g_type_class_add_private (class, sizeof (GthImageViewerPrivate));
 
 	/* signals */
@@ -1554,13 +1558,7 @@ gth_image_viewer_init (GthImageViewer *self)
 }
 
 
-G_DEFINE_TYPE_WITH_CODE (GthImageViewer,
-			 gth_image_viewer,
-			 GTK_TYPE_WIDGET,
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
-
-
-GtkWidget*
+GtkWidget *
 gth_image_viewer_new (void)
 {
 	return GTK_WIDGET (g_object_new (GTH_TYPE_IMAGE_VIEWER, NULL));
diff --git a/gthumb/gth-location-chooser.c b/gthumb/gth-location-chooser.c
index ccb17ba..c28e5b1 100644
--- a/gthumb/gth-location-chooser.c
+++ b/gthumb/gth-location-chooser.c
@@ -37,6 +37,9 @@
 #define MIN_WIDTH 200
 
 
+G_DEFINE_TYPE (GthLocationChooser, gth_location_chooser, GTK_TYPE_BOX)
+
+
 enum {
 	ITEM_TYPE_NONE,
 	ITEM_TYPE_SEPARATOR,
@@ -70,7 +73,6 @@ struct _GthLocationChooserPrivate
 };
 
 
-static GtkHBoxClass *parent_class = NULL;
 static guint gth_location_chooser_signals[LAST_SIGNAL] = { 0 };
 
 
@@ -91,7 +93,7 @@ gth_location_chooser_finalize (GObject *object)
 	if (self->priv->location != NULL)
 		g_object_unref (self->priv->location);
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (gth_location_chooser_parent_class)->finalize (object);
 }
 
 
@@ -281,7 +283,7 @@ gth_location_chooser_realize (GtkWidget *widget)
 {
 	GthLocationChooser *self = GTH_LOCATION_CHOOSER (widget);
 
-	GTK_WIDGET_CLASS (parent_class)->realize (widget);
+	GTK_WIDGET_CLASS (gth_location_chooser_parent_class)->realize (widget);
 	self->priv->icon_cache = gth_icon_cache_new (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (self))),
 						     _gtk_icon_get_pixel_size (GTK_WIDGET (self), GTK_ICON_SIZE_MENU));
 	entry_points_changed_cb (NULL, self);
@@ -294,7 +296,7 @@ gth_location_chooser_unrealize (GtkWidget *widget)
 	GthLocationChooser *self = GTH_LOCATION_CHOOSER (widget);
 
 	gth_icon_cache_free (self->priv->icon_cache);
-	GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+	GTK_WIDGET_CLASS (gth_location_chooser_parent_class)->unrealize (widget);
 }
 
 
@@ -304,7 +306,6 @@ gth_location_chooser_class_init (GthLocationChooserClass *klass)
 	GObjectClass   *object_class;
 	GtkWidgetClass *widget_class;
 
-	parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthLocationChooserPrivate));
 
 	object_class = (GObjectClass*) klass;
@@ -404,9 +405,6 @@ gth_location_chooser_init (GthLocationChooser *self)
 }
 
 
-G_DEFINE_TYPE(GthLocationChooser, gth_location_chooser, GTK_TYPE_BOX)
-
-
 GtkWidget *
 gth_location_chooser_new (void)
 {
diff --git a/gthumb/gth-menu-action.c b/gthumb/gth-menu-action.c
index 0600733..1e797f8 100644
--- a/gthumb/gth-menu-action.c
+++ b/gthumb/gth-menu-action.c
@@ -25,6 +25,9 @@
 #include "gth-menu-action.h"
 
 
+G_DEFINE_TYPE (GthMenuAction, gth_menu_action, GTK_TYPE_ACTION)
+
+
 /* Properties */
 enum {
         PROP_0,
@@ -34,9 +37,6 @@ enum {
 };
 
 
-static gpointer parent_class = NULL;
-
-
 struct _GthMenuActionPrivate {
 	char      *button_tooltip;
 	char      *arrow_tooltip;
@@ -121,7 +121,7 @@ gth_menu_action_finalize (GObject *base)
 	g_free (self->priv->arrow_tooltip);
 	g_free (self->priv->button_tooltip);
 
-	G_OBJECT_CLASS (parent_class)->finalize (base);
+	G_OBJECT_CLASS (gth_menu_action_parent_class)->finalize (base);
 }
 
 
@@ -147,7 +147,6 @@ gth_menu_action_class_init (GthMenuActionClass *klass)
 	GObjectClass   *object_class;
 	GtkActionClass *action_class;
 
-	parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthMenuActionPrivate));
 
 	object_class = (GObjectClass*) klass;
@@ -183,6 +182,3 @@ gth_menu_action_class_init (GthMenuActionClass *klass)
                                                               GTK_TYPE_MENU,
                                                               G_PARAM_READWRITE));
 }
-
-
-G_DEFINE_TYPE (GthMenuAction, gth_menu_action, GTK_TYPE_ACTION)
diff --git a/gthumb/gth-progress-dialog.c b/gthumb/gth-progress-dialog.c
index 0e1f242..23b5db1 100644
--- a/gthumb/gth-progress-dialog.c
+++ b/gthumb/gth-progress-dialog.c
@@ -83,7 +83,6 @@ gth_task_progress_finalize (GObject *base)
 static void
 gth_task_progress_class_init (GthTaskProgressClass *klass)
 {
-	gth_task_progress_parent_class = g_type_class_peek_parent (klass);
 	G_OBJECT_CLASS (klass)->finalize = gth_task_progress_finalize;
 }
 
@@ -267,7 +266,6 @@ gth_progress_dialog_finalize (GObject *base)
 static void
 gth_progress_dialog_class_init (GthProgressDialogClass *klass)
 {
-	gth_progress_dialog_parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthProgressDialogPrivate));
 
 	G_OBJECT_CLASS (klass)->finalize = gth_progress_dialog_finalize;
diff --git a/gthumb/gth-request-dialog.c b/gthumb/gth-request-dialog.c
index 67cf9d1..73a3f75 100644
--- a/gthumb/gth-request-dialog.c
+++ b/gthumb/gth-request-dialog.c
@@ -50,7 +50,6 @@ gth_request_dialog_finalize (GObject *base)
 static void
 gth_request_dialog_class_init (GthRequestDialogClass *klass)
 {
-	gth_request_dialog_parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthRequestDialogPrivate));
 
 	G_OBJECT_CLASS (klass)->finalize = gth_request_dialog_finalize;
diff --git a/gthumb/gth-toggle-menu-action.c b/gthumb/gth-toggle-menu-action.c
index 3400290..3458d6c 100644
--- a/gthumb/gth-toggle-menu-action.c
+++ b/gthumb/gth-toggle-menu-action.c
@@ -26,6 +26,9 @@
 #include "gth-toggle-menu-tool-button.h"
 
 
+G_DEFINE_TYPE (GthToggleMenuAction, gth_toggle_menu_action, GTK_TYPE_TOGGLE_ACTION)
+
+
 /* Properties */
 enum {
         PROP_0,
@@ -33,9 +36,6 @@ enum {
 };
 
 
-static gpointer parent_class = NULL;
-
-
 struct _GthToggleMenuActionPrivate {
 	GtkWidget       *menu;
 	GthShowMenuFunc  show_menu_func;
@@ -132,7 +132,7 @@ gth_toggle_menu_action_finalize (GObject *base)
 	if (self->priv->menu != NULL)
 		g_object_unref (self->priv->menu);
 
-	G_OBJECT_CLASS (parent_class)->finalize (base);
+	G_OBJECT_CLASS (gth_toggle_menu_action_parent_class)->finalize (base);
 }
 
 
@@ -142,7 +142,6 @@ gth_toggle_menu_action_class_init (GthToggleMenuActionClass *klass)
 	GObjectClass   *object_class;
 	GtkActionClass *action_class;
 
-	parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthToggleMenuActionPrivate));
 
 	object_class = (GObjectClass *) klass;
@@ -166,9 +165,6 @@ gth_toggle_menu_action_class_init (GthToggleMenuActionClass *klass)
 }
 
 
-G_DEFINE_TYPE (GthToggleMenuAction, gth_toggle_menu_action, GTK_TYPE_TOGGLE_ACTION)
-
-
 void
 gth_toggle_menu_action_set_show_menu_func (GthToggleMenuAction *self,
 					   GthShowMenuFunc      func,
diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c
index 016c24f..362d50a 100644
--- a/gthumb/gth-window.c
+++ b/gthumb/gth-window.c
@@ -25,15 +25,16 @@
 #include "gtk-utils.h"
 #include "main.h"
 
+
+G_DEFINE_TYPE (GthWindow, gth_window, GTK_TYPE_WINDOW)
+
+
 enum  {
 	PROP_0,
 	PROP_N_PAGES
 };
 
 
-static GtkWindowClass *parent_class = NULL;
-
-
 struct _GthWindowPrivate {
 	int             n_pages;
 	int             current_page;
@@ -159,7 +160,7 @@ gth_window_finalize (GObject *object)
 	g_free (window->priv->contents);
 	g_free (window->priv->window_size);
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (gth_window_parent_class)->finalize (object);
 }
 
 
@@ -202,7 +203,7 @@ gth_window_real_set_current_page (GthWindow *window,
 static void
 gth_window_realize (GtkWidget *widget)
 {
-	GTK_WIDGET_CLASS (parent_class)->realize (widget);
+	GTK_WIDGET_CLASS (gth_window_parent_class)->realize (widget);
 
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)),
 					   GTHUMB_ICON_DIR);
@@ -215,7 +216,6 @@ gth_window_class_init (GthWindowClass *klass)
 	GObjectClass   *gobject_class;
 	GtkWidgetClass *widget_class;
 
-	parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (GthWindowPrivate));
 
 	gobject_class = (GObjectClass*) klass;
@@ -259,9 +259,6 @@ gth_window_init (GthWindow *window)
 }
 
 
-G_DEFINE_TYPE(GthWindow, gth_window, GTK_TYPE_WINDOW)
-
-
 void
 gth_window_close (GthWindow *window)
 {
diff --git a/gthumb/main.c b/gthumb/main.c
index b2893b6..ef47d2a 100644
--- a/gthumb/main.c
+++ b/gthumb/main.c
@@ -500,8 +500,6 @@ gth_application_class_init (GthApplicationClass *klass)
 	GObjectClass      *object_class;
 	GApplicationClass *application_class;
 
-	gth_application_parent_class = g_type_class_peek_parent (klass);
-
 	object_class = G_OBJECT_CLASS (klass);
 	object_class->finalize = gth_application_finalize;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]