aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/menus
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-02-13 00:37:05 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-02-13 01:54:08 +0800
commit7a1677520d439aee68c5ab0268a951d0b411e3a0 (patch)
tree5b045d6a6ad24f1e3c53847bb116610208d089a8 /widgets/menus
parent1f68d0a2ec941a7f1b47aeb06cf5502b06b49156 (diff)
downloadgsoc2013-evolution-7a1677520d439aee68c5ab0268a951d0b411e3a0.tar.gz
gsoc2013-evolution-7a1677520d439aee68c5ab0268a951d0b411e3a0.tar.zst
gsoc2013-evolution-7a1677520d439aee68c5ab0268a951d0b411e3a0.zip
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.
Diffstat (limited to 'widgets/menus')
-rw-r--r--widgets/menus/gal-define-views-dialog.c4
-rw-r--r--widgets/menus/gal-define-views-model.c4
-rw-r--r--widgets/menus/gal-view-collection.c4
-rw-r--r--widgets/menus/gal-view-etable.c4
-rw-r--r--widgets/menus/gal-view-instance-save-as-dialog.c4
-rw-r--r--widgets/menus/gal-view-instance.c4
-rw-r--r--widgets/menus/gal-view-new-dialog.c4
7 files changed, 14 insertions, 14 deletions
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*