From 274697623e2a6749a3b173c28f4832d9e88019e3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Feb 2011 11:37:05 -0500 Subject: Remove NULL checks for GObject methods. As of GLib 2.28 all GObject virtual methods, including constructed(), are safe to chain up to unconditionally. Remove unnecessary checks. --- widgets/menus/gal-define-views-dialog.c | 4 ++-- widgets/menus/gal-define-views-model.c | 4 ++-- widgets/menus/gal-view-collection.c | 4 ++-- widgets/menus/gal-view-etable.c | 4 ++-- widgets/menus/gal-view-instance-save-as-dialog.c | 4 ++-- widgets/menus/gal-view-instance.c | 4 ++-- widgets/menus/gal-view-new-dialog.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'widgets/menus') diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c index b2a8196c06..6605f22e2d 100644 --- a/widgets/menus/gal-define-views-dialog.c +++ b/widgets/menus/gal-define-views-dialog.c @@ -285,8 +285,8 @@ gal_define_views_dialog_dispose (GObject *object) g_object_unref (gal_define_views_dialog->builder); gal_define_views_dialog->builder = NULL; - if (G_OBJECT_CLASS (gal_define_views_dialog_parent_class)->dispose) - (* G_OBJECT_CLASS (gal_define_views_dialog_parent_class)->dispose) (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (gal_define_views_dialog_parent_class)->dispose (object); } static void diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c index 4b98bef571..50ac7f1ac1 100644 --- a/widgets/menus/gal-define-views-model.c +++ b/widgets/menus/gal-define-views-model.c @@ -100,8 +100,8 @@ gdvm_dispose (GObject *object) g_object_unref (model->collection); model->collection = NULL; - if (G_OBJECT_CLASS (gal_define_views_model_parent_class)->dispose) - (* G_OBJECT_CLASS (gal_define_views_model_parent_class)->dispose) (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (gal_define_views_model_parent_class)->dispose (object); } /* This function returns the number of columns in our ETableModel. */ diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index 56d8044680..42b5ff687a 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -187,8 +187,8 @@ gal_view_collection_dispose (GObject *object) g_free (collection->title); collection->title = NULL; - if (G_OBJECT_CLASS (gal_view_collection_parent_class)->dispose) - (* G_OBJECT_CLASS (gal_view_collection_parent_class)->dispose)(object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (gal_view_collection_parent_class)->dispose (object); } static void diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c index 1dcf453c18..bb69aadf42 100644 --- a/widgets/menus/gal-view-etable.c +++ b/widgets/menus/gal-view-etable.c @@ -155,8 +155,8 @@ gal_view_etable_dispose (GObject *object) g_object_unref (view->state); view->state = NULL; - if (G_OBJECT_CLASS (gal_view_etable_parent_class)->dispose) - (* G_OBJECT_CLASS (gal_view_etable_parent_class)->dispose) (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (gal_view_etable_parent_class)->dispose (object); } static void diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 8cacf1a849..71f2218a3a 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -202,8 +202,8 @@ gal_view_instance_save_as_dialog_dispose (GObject *object) g_object_unref (gal_view_instance_save_as_dialog->builder); gal_view_instance_save_as_dialog->builder = NULL; - if (G_OBJECT_CLASS (gal_view_instance_save_as_dialog_parent_class)->dispose) - (* G_OBJECT_CLASS (gal_view_instance_save_as_dialog_parent_class)->dispose) (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (gal_view_instance_save_as_dialog_parent_class)->dispose (object); } /* Init functions */ diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c index fc5aff0c63..944918243e 100644 --- a/widgets/menus/gal-view-instance.c +++ b/widgets/menus/gal-view-instance.c @@ -168,8 +168,8 @@ gal_view_instance_dispose (GObject *object) g_free (instance->default_view); - if (G_OBJECT_CLASS (gal_view_instance_parent_class)->dispose) - (* G_OBJECT_CLASS (gal_view_instance_parent_class)->dispose)(object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (gal_view_instance_parent_class)->dispose (object); } static void diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index 1bc9369a48..5b9f8f12da 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -118,8 +118,8 @@ gal_view_new_dialog_dispose (GObject *object) g_object_unref (gal_view_new_dialog->builder); gal_view_new_dialog->builder = NULL; - if (G_OBJECT_CLASS (gal_view_new_dialog_parent_class)->dispose) - (* G_OBJECT_CLASS (gal_view_new_dialog_parent_class)->dispose) (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (gal_view_new_dialog_parent_class)->dispose (object); } GtkWidget* -- cgit v1.2.3