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.

117 files changed, 240 insertions, 291 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 55709ed081..4c0bf2e905 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -3728,8 +3728,8 @@ e_contact_editor_dispose (GObject *object)
 		e_contact_editor->cancellable = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c
index 110343ce80..018205e09f 100644
--- a/addressbook/gui/widgets/e-addressbook-selector.c
+++ b/addressbook/gui/widgets/e-addressbook-selector.c
@@ -238,8 +238,8 @@ addressbook_selector_constructed (GObject *object)
 	selector = E_SOURCE_SELECTOR (object);
 	addressbook_selector_load_primary_source (selector);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static gboolean
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 1e88b50209..6dfa981463 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -78,8 +78,8 @@ addressbook_dispose (GObject *object)
 		adapter->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 /* This function returns the number of columns in our ETableModel. */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index f85bcfe6d3..5d2636a413 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -585,8 +585,8 @@ addressbook_view_constructed (GObject *object)
 
 	g_free (uri);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 855b5c2058..945639f70b 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -311,8 +311,8 @@ e_minicard_view_widget_dispose (GObject *object)
 		view->adapter = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 0e36bd6b9b..31e2d35306 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -364,8 +364,8 @@ e_minicard_view_dispose (GObject *object)
 	view->stop_state_id = 0;
 	view->adapter = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static guint
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 07eacac291..ea91b57be1 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -435,8 +435,8 @@ e_minicard_dispose (GObject *object)
 		e_minicard->list_icon_pixbuf = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
@@ -459,8 +459,8 @@ e_minicard_finalize (GObject *object)
 		e_minicard->list_icon_pixbuf = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index 16f2790cfe..bd08d93f09 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -96,8 +96,8 @@ calendar_view_factory_finalize (GObject *object)
 	g_free (priv);
 	cal_view_factory->priv = NULL;
 
-	if (G_OBJECT_CLASS (calendar_view_factory_parent_class)->finalize)
-		(* G_OBJECT_CLASS (calendar_view_factory_parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (calendar_view_factory_parent_class)->finalize (object);
 }
 
 
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
index 0687fe9817..78b0b15716 100644
--- a/calendar/gui/calendar-view.c
+++ b/calendar/gui/calendar-view.c
@@ -106,8 +106,8 @@ calendar_view_finalize (GObject *object)
 	g_free (priv);
 	cal_view->priv = NULL;
 
-	if (G_OBJECT_CLASS (calendar_view_parent_class)->finalize)
-		(* G_OBJECT_CLASS (calendar_view_parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (calendar_view_parent_class)->finalize (object);
 }
 
 
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index eaecd1b8e8..846be18152 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1522,8 +1522,7 @@ comp_editor_constructed (GObject *object)
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
 
 	/* Chain up to parent's constructed() method. */
-	if (G_OBJECT_CLASS (comp_editor_parent_class)->constructed)
-		G_OBJECT_CLASS (comp_editor_parent_class)->constructed (object);
+	G_OBJECT_CLASS (comp_editor_parent_class)->constructed (object);
 }
 
 static void
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index b45f587d57..2bca1c908b 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -108,8 +108,8 @@ e_delegate_dialog_finalize (GObject *object)
 	g_free (priv);
 	edd->priv = NULL;
 
-	if (G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize (object);
 }
 
 EDelegateDialog *
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 260778d83a..7ee860f457 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -438,8 +438,8 @@ event_editor_constructed (GObject *object)
 		priv->model, "client",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (event_editor_parent_class)->constructed)
-		G_OBJECT_CLASS (event_editor_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (event_editor_parent_class)->constructed (object);
 }
 
 static void
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 8de1b09601..0e3cfc5dcf 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -108,8 +108,8 @@ memo_editor_constructed (GObject *object)
 		editor, COMP_EDITOR_PAGE (priv->memo_page),
 		_("Memo"), TRUE);
 
-	if (G_OBJECT_CLASS (memo_editor_parent_class)->constructed)
-		G_OBJECT_CLASS (memo_editor_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (memo_editor_parent_class)->constructed (object);
 }
 
 static void
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 8021339c9b..933299feb0 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -214,8 +214,8 @@ task_editor_constructed (GObject *object)
 		priv->model, "client",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (task_editor_parent_class)->constructed)
-		G_OBJECT_CLASS (task_editor_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (task_editor_parent_class)->constructed (object);
 }
 
 static void
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index c7f7ff9691..4132cb785c 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -40,7 +40,6 @@ static GType column_types[E_ALARM_LIST_NUM_COLUMNS];
 static void         e_alarm_list_init            (EAlarmList         *file_list);
 static void         e_alarm_list_class_init      (EAlarmListClass    *class);
 static void         e_alarm_list_tree_model_init (GtkTreeModelIface  *iface);
-static void         e_alarm_list_finalize        (GObject            *object);
 static GtkTreeModelFlags e_alarm_list_get_flags       (GtkTreeModel       *tree_model);
 static gint         e_alarm_list_get_n_columns   (GtkTreeModel       *tree_model);
 static GType        e_alarm_list_get_column_type (GtkTreeModel       *tree_model,
@@ -114,12 +113,7 @@ e_alarm_list_get_type (void)
 static void
 e_alarm_list_class_init (EAlarmListClass *class)
 {
-	GObjectClass *object_class;
-
 	parent_class = g_type_class_peek_parent (class);
-	object_class = (GObjectClass *) class;
-
-	object_class->finalize = e_alarm_list_finalize;
 }
 
 static void
@@ -219,13 +213,6 @@ row_updated (EAlarmList *alarm_list, gint n)
 	gtk_tree_path_free (path);
 }
 
-static void
-e_alarm_list_finalize (GObject *object)
-{
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
 /* Fulfill the GtkTreeModel requirements */
 static GtkTreeModelFlags
 e_alarm_list_get_flags (GtkTreeModel *tree_model)
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index fc2996fcd2..010de9590b 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -350,8 +350,8 @@ e_cal_list_view_dispose (GObject *object)
 		cal_list_view->table = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_cal_list_view_parent_class)->dispose)
-		G_OBJECT_CLASS (e_cal_list_view_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_cal_list_view_parent_class)->dispose (object);
 }
 
 static void
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 778b72de21..723f5e753b 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -102,8 +102,8 @@ e_cal_model_calendar_finalize (GObject *object)
 		model->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_cal_model_calendar_parent_class)->finalize)
-		G_OBJECT_CLASS (e_cal_model_calendar_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_cal_model_calendar_parent_class)->finalize (object);
 }
 
 /* ETableModel methods */
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 38e55ef71a..0356dacf0c 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -103,8 +103,8 @@ e_cal_model_memos_finalize (GObject *object)
 		model->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_cal_model_memos_parent_class)->finalize)
-		G_OBJECT_CLASS (e_cal_model_memos_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_cal_model_memos_parent_class)->finalize (object);
 }
 
 /* ETableModel methods */
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index b6efb3e0e1..a8206d50c1 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -377,8 +377,7 @@ cal_model_constructed (GObject *object)
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
 
 	/* Chain up to parent's constructed() method. */
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
@@ -3210,8 +3209,8 @@ e_cal_model_component_finalize (GObject *object)
 		comp_data->color = NULL;
 	}
 
-	if (G_OBJECT_CLASS (component_parent_class)->finalize)
-		(* G_OBJECT_CLASS (component_parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (component_parent_class)->finalize (object);
 }
 
 /* Object initialization function for the calendar component object */
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 181d4a19f4..d7aa3d8716 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -368,8 +368,7 @@ calendar_view_constructed (GObject *object)
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
 
 	/* Chain up to parent's constructed() method. */
-	if (G_OBJECT_CLASS (e_calendar_view_parent_class)->constructed)
-		G_OBJECT_CLASS (e_calendar_view_parent_class)->constructed (object);
+	G_OBJECT_CLASS (e_calendar_view_parent_class)->constructed (object);
 }
 
 static void
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 8ce7481809..3c792e6330 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1336,8 +1336,8 @@ e_day_view_dispose (GObject *object)
 		}
 	}
 
-	if (G_OBJECT_CLASS (e_day_view_parent_class)->dispose)
-		G_OBJECT_CLASS (e_day_view_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_day_view_parent_class)->dispose (object);
 }
 
 static void
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 7f6709ba7a..c7c5bdfca2 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -182,8 +182,8 @@ e_meeting_attendee_finalize (GObject *obj)
 
 	g_free (priv);
 
-	if (G_OBJECT_CLASS (e_meeting_attendee_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_meeting_attendee_parent_class)->finalize) (obj);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_meeting_attendee_parent_class)->finalize (obj);
 }
 
 GObject *
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index b72662ce8f..532a06138a 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -93,8 +93,8 @@ e_meeting_list_view_finalize (GObject *obj)
 
 	g_free (priv);
 
-	if (G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize (obj);
 }
 
 static void
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 7e405d1f36..1e9ddf97b6 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -297,8 +297,8 @@ meeting_time_selector_dispose (GObject *object)
 		mts->style_change_idle_id = 0;
 	}
 
-	if (G_OBJECT_CLASS (e_meeting_time_selector_parent_class)->dispose)
-		G_OBJECT_CLASS (e_meeting_time_selector_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_meeting_time_selector_parent_class)->dispose (object);
 }
 
 static void
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 9da9a2d944..24c68905b4 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -418,8 +418,8 @@ memo_table_constructed (GObject *object)
 	if (a11y)
 		atk_object_set_name (a11y, _("Memos"));
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static gboolean
diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c
index c177c5231b..52d6b82ed0 100644
--- a/calendar/gui/e-select-names-editable.c
+++ b/calendar/gui/e-select-names-editable.c
@@ -40,14 +40,14 @@ esne_cell_editable_init (GtkCellEditableIface *iface)
 }
 
 static void
-esne_finalize (GObject *obj)
+esne_finalize (GObject *object)
 {
-	ESelectNamesEditable *esne = (ESelectNamesEditable *) obj;
+	ESelectNamesEditable *esne = (ESelectNamesEditable *) object;
 
 	g_free (esne->priv);
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		G_OBJECT_CLASS (parent_class)->finalize (obj);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index 632ff89c91..27a08f7ada 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -171,9 +171,9 @@ e_select_names_renderer_set_property (GObject *object, guint prop_id, const GVal
 }
 
 static void
-e_select_names_renderer_finalize (GObject *obj)
+e_select_names_renderer_finalize (GObject *object)
 {
-	ESelectNamesRenderer *cell = (ESelectNamesRenderer *) obj;
+	ESelectNamesRenderer *cell = (ESelectNamesRenderer *) object;
 
 	if (cell->priv->editable)
 		g_object_unref (cell->priv->editable);
@@ -184,8 +184,8 @@ e_select_names_renderer_finalize (GObject *obj)
 	g_free (cell->priv->email);
 	g_free (cell->priv);
 
-	if (G_OBJECT_CLASS (e_select_names_renderer_parent_class)->finalize)
-		G_OBJECT_CLASS (e_select_names_renderer_parent_class)->finalize (obj);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_select_names_renderer_parent_class)->finalize (object);
 }
 
 static void
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index ef64defc61..60c5d50e0c 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -635,8 +635,8 @@ task_table_constructed (GObject *object)
 	if (a11y)
 		atk_object_set_name (a11y, _("Tasks"));
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static gboolean
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index bfe7cd20e9..10f95d3463 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -905,8 +905,8 @@ e_week_view_dispose (GObject *object)
 		week_view->scroll_by_week_notif_id = 0;
 	}
 
-	if (G_OBJECT_CLASS (e_week_view_parent_class)->dispose)
-		G_OBJECT_CLASS (e_week_view_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_week_view_parent_class)->dispose (object);
 }
 
 static void
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index b3d35c90a6..84159bb53d 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -253,8 +253,8 @@ ea_cal_view_event_dispose (GObject *object)
 		a11y->state_set = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static G_CONST_RETURN gchar *
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 11b1e29ee5..3e478a063a 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -487,8 +487,8 @@ gnome_calendar_constructed (GObject *object)
 
 	gnome_calendar_goto_today (gcal);
 
-	if (G_OBJECT_CLASS (gnome_calendar_parent_class)->constructed)
-		G_OBJECT_CLASS (gnome_calendar_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (gnome_calendar_parent_class)->constructed (object);
 }
 
 /* Class initialization function for the gnome calendar */
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 650c2fa1e8..7183d79071 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -201,8 +201,7 @@ weekday_picker_dispose (GObject *object)
 	wp->priv = NULL;
 
 	/* Chain up to parent's dispose() method. */
-	if (G_OBJECT_CLASS (weekday_picker_parent_class)->dispose)
-		G_OBJECT_CLASS (weekday_picker_parent_class)->dispose (object);
+	G_OBJECT_CLASS (weekday_picker_parent_class)->dispose (object);
 }
 
 static void
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index d3df63aad0..ae6c5258f6 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2175,8 +2175,8 @@ msg_composer_constructed (GObject *object)
 
 	e_extensible_load_extensions (E_EXTENSIBLE (composer));
 
-	if (G_OBJECT_CLASS (e_msg_composer_parent_class)->constructed)
-		G_OBJECT_CLASS (e_msg_composer_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_msg_composer_parent_class)->constructed (object);
 }
 
 static void
@@ -2201,8 +2201,7 @@ msg_composer_dispose (GObject *object)
 	e_composer_private_dispose (composer);
 
 	/* Chain up to parent's dispose() method. */
-	if (G_OBJECT_CLASS (e_msg_composer_parent_class)->dispose)
-		G_OBJECT_CLASS (e_msg_composer_parent_class)->dispose (object);
+	G_OBJECT_CLASS (e_msg_composer_parent_class)->dispose (object);
 }
 
 static void
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index df5ec1dbcb..1d1571cdb0 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -215,8 +215,8 @@ alert_dialog_constructed (GObject *object)
 
 	pango_attr_list_unref (list);
 
-	if (G_OBJECT_CLASS (e_alert_dialog_parent_class)->constructed)
-		G_OBJECT_CLASS (e_alert_dialog_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_alert_dialog_parent_class)->constructed (object);
 }
 
 static void
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index 4845ce61a3..cccc3225e5 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -564,8 +564,8 @@ alert_constructed (GObject *object)
 		button = button->next;
 	}
 
-	if (G_OBJECT_CLASS (e_alert_parent_class)->constructed)
-		G_OBJECT_CLASS (e_alert_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_alert_parent_class)->constructed (object);
 }
 
 static void
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index d8aa620c8d..acf318c939 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -157,8 +157,8 @@ eba_dispose (GObject *object)
 		g_free (eba->data);
 	eba->data = NULL;
 
-	if (G_OBJECT_CLASS (e_bit_array_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_bit_array_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_bit_array_parent_class)->dispose (object);
 }
 
 /**
diff --git a/e-util/e-extension.c b/e-util/e-extension.c
index 1bcef90d76..d7d95c9496 100644
--- a/e-util/e-extension.c
+++ b/e-util/e-extension.c
@@ -122,17 +122,6 @@ extension_get_property (GObject *object,
 }
 
 static void
-extension_constructed (GObject *object)
-{
-	/* This allows subclasses to chain up safely since GObject
-	 * does not implement this method, and we might want to do
-	 * something here in the future. */
-
-	if (G_OBJECT_CLASS (e_extension_parent_class)->constructed)
-		G_OBJECT_CLASS (e_extension_parent_class)->constructed (object);
-}
-
-static void
 extension_dispose (GObject *object)
 {
 	EExtensionPrivate *priv;
@@ -159,7 +148,6 @@ e_extension_class_init (EExtensionClass *class)
 	object_class = G_OBJECT_CLASS (class);
 	object_class->set_property = extension_set_property;
 	object_class->get_property = extension_get_property;
-	object_class->constructed = extension_constructed;
 	object_class->dispose = extension_dispose;
 
 	g_object_class_install_property (
diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c
index 2491ac95d5..a69f40b7fa 100644
--- a/filter/e-rule-editor.c
+++ b/filter/e-rule-editor.c
@@ -571,8 +571,7 @@ rule_editor_dispose (GObject *object)
 	}
 
 	/* Chain up to parent's dispose() method. */
-	if (G_OBJECT_CLASS (e_rule_editor_parent_class)->dispose)
-		G_OBJECT_CLASS (e_rule_editor_parent_class)->dispose (object);
+	G_OBJECT_CLASS (e_rule_editor_parent_class)->dispose (object);
 }
 
 static void
diff --git a/libgnomecanvas/gnome-canvas-rich-text.c b/libgnomecanvas/gnome-canvas-rich-text.c
index a19738f484..a3ef6447ab 100644
--- a/libgnomecanvas/gnome-canvas-rich-text.c
+++ b/libgnomecanvas/gnome-canvas-rich-text.c
@@ -184,8 +184,8 @@ gnome_canvas_rich_text_finalize (GObject *object)
 	g_free (text->_priv);
 	text->_priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		G_OBJECT_CLASS (parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c
index 86835c2aec..b313c84af8 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -1996,8 +1996,8 @@ gnome_canvas_dispose (GObject *object)
 
 	shutdown_transients (canvas);
 
-	if (G_OBJECT_CLASS (canvas_parent_class)->dispose)
-		G_OBJECT_CLASS (canvas_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (canvas_parent_class)->dispose (object);
 }
 
 /**
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 954a3e056f..88cf81a51a 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -318,8 +318,8 @@ mail_attachment_bar_constructed (GObject *object)
 	key = "/apps/evolution/shell/attachment_view";
 	gconf_bridge_bind_property (bridge, key, object, "active-view");
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static EAttachmentViewPrivate *
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index e598c9388d..804000367c 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -432,8 +432,8 @@ mail_backend_dispose (GObject *object)
 static void
 mail_backend_finalize (GObject *object)
 {
-	if (G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize)
-		G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize (object);
 
 	camel_shutdown ();
 }
@@ -510,8 +510,8 @@ mail_backend_constructed (GObject *object)
 	mail_config_init (priv->session);
 	mail_msg_init ();
 
-	if (G_OBJECT_CLASS (e_mail_backend_parent_class)->constructed)
-		G_OBJECT_CLASS (e_mail_backend_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_mail_backend_parent_class)->constructed (object);
 }
 
 static void
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index d46217e706..750e84afd8 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -552,8 +552,7 @@ mail_browser_constructed (GObject *object)
 	guint merge_id;
 
 	/* Chain up to parent's constructed() method. */
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 
 	priv = E_MAIL_BROWSER_GET_PRIVATE (object);
 
diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
index 34a148c7a9..1170854ea8 100644
--- a/mail/e-mail-label-dialog.c
+++ b/mail/e-mail-label-dialog.c
@@ -139,8 +139,8 @@ mail_label_dialog_constructed (GObject *object)
 	gtk_container_set_border_width (GTK_CONTAINER (action_area), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index 5a22f72512..e6f4a6a6ea 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -181,8 +181,8 @@ mail_label_list_store_constructed (GObject *object)
 
 	mail_label_list_store_ensure_defaults (store);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index e4d3c1ec32..cf957c3fe0 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -568,8 +568,8 @@ mail_notebook_view_constructed (GObject *object)
 		priv->book, "switch-page",
 		G_CALLBACK (mnv_page_changed), object);
 
-	if (G_OBJECT_CLASS (e_mail_notebook_view_parent_class)->constructed)
-		G_OBJECT_CLASS (e_mail_notebook_view_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_mail_notebook_view_parent_class)->constructed (object);
 }
 
 static void
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 97b988eb55..c6f13d03b5 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -683,8 +683,8 @@ mail_paned_view_constructed (GObject *object)
 	 * set_preview_visible() method relies on it. */
 	e_mail_view_set_preview_visible (view, TRUE);
 
-	if (G_OBJECT_CLASS (e_mail_paned_view_parent_class)->constructed)
-		G_OBJECT_CLASS (e_mail_paned_view_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_mail_paned_view_parent_class)->constructed (object);
 }
 
 static void
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 621c54217e..b05ba3549d 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -60,8 +60,7 @@ folder_selector_dispose (GObject *object)
 	}
 
 	/* Chain up to parent's dispose() method. */
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index 9f56409ee5..02d16d640b 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -511,8 +511,8 @@ book_shell_backend_constructed (GObject *object)
 	 * that all EPlugins and EPluginHooks are loaded first. */
 	g_idle_add ((GSourceFunc) book_shell_backend_init_preferences, shell);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c
index f2116e63cf..fba37b3820 100644
--- a/modules/calendar/e-cal-config-calendar-item.c
+++ b/modules/calendar/e-cal-config-calendar-item.c
@@ -48,8 +48,8 @@ cal_config_calendar_item_constructed (GObject *object)
 		extensible, "week-start-day",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c
index ae8753de74..ba23a051e5 100644
--- a/modules/calendar/e-cal-config-comp-editor.c
+++ b/modules/calendar/e-cal-config-comp-editor.c
@@ -68,8 +68,8 @@ cal_config_comp_editor_constructed (GObject *object)
 		extensible, "work-day-start-minute",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c
index c26db3e2d6..05a2947d7e 100644
--- a/modules/calendar/e-cal-config-date-edit.c
+++ b/modules/calendar/e-cal-config-date-edit.c
@@ -48,8 +48,8 @@ cal_config_date_edit_constructed (GObject *object)
 		extensible, "week-start-day",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c
index 1e4dc460b9..ba1a1077b3 100644
--- a/modules/calendar/e-cal-config-meeting-store.c
+++ b/modules/calendar/e-cal-config-meeting-store.c
@@ -63,8 +63,8 @@ cal_config_meeting_store_constructed (GObject *object)
 		extensible, "week-start-day",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c
index 280645d4b9..fb03618cc8 100644
--- a/modules/calendar/e-cal-config-meeting-time-selector.c
+++ b/modules/calendar/e-cal-config-meeting-time-selector.c
@@ -53,8 +53,8 @@ cal_config_meeting_time_selector_constructed (GObject *object)
 		extensible, "week-start-day",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c
index 5455123c4c..47a3ff6463 100644
--- a/modules/calendar/e-cal-config-model.c
+++ b/modules/calendar/e-cal-config-model.c
@@ -116,8 +116,8 @@ cal_config_model_constructed (GObject *object)
 			G_BINDING_SYNC_CREATE);
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c
index 898a1d2be2..60ee4a5690 100644
--- a/modules/calendar/e-cal-config-view.c
+++ b/modules/calendar/e-cal-config-view.c
@@ -90,8 +90,8 @@ cal_config_view_constructed (GObject *object)
 			G_BINDING_SYNC_CREATE);
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 960b6c6132..6c80f71965 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -755,8 +755,8 @@ cal_shell_backend_constructed (GObject *object)
 		e_calendar_preferences_new,
 		600);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index 5ce48a60b3..d60421c49c 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -521,8 +521,8 @@ memo_shell_backend_constructed (GObject *object)
 		G_CALLBACK (memo_shell_backend_window_created_cb),
 		shell_backend);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 8bb3f47a66..a55bd75fcc 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -526,8 +526,8 @@ task_shell_backend_constructed (GObject *object)
 		G_CALLBACK (task_shell_backend_window_created_cb),
 		shell_backend);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c
index cf91198d90..30155c9ed3 100644
--- a/modules/connman/evolution-connman.c
+++ b/modules/connman/evolution-connman.c
@@ -180,8 +180,8 @@ network_manager_constructed (GObject *object)
 {
 	network_manager_connect (E_CONNMAN (object));
 
-	if (G_OBJECT_CLASS (e_connman_parent_class)->constructed)
-		G_OBJECT_CLASS (e_connman_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_connman_parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index fbf8c6d748..7aa93670c5 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -66,8 +66,8 @@ mail_config_format_html_constructed (GObject *object)
 		extensible, "show-real-date",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c
index 6faad6a551..a13f0bf936 100644
--- a/modules/mail/e-mail-config-reader.c
+++ b/modules/mail/e-mail-config-reader.c
@@ -48,8 +48,8 @@ mail_config_reader_constructed (GObject *object)
 		extensible, "reply-style",
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 9dda757bd5..41b17efbad 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -71,8 +71,8 @@ mail_config_web_view_constructed (GObject *object)
 		extensible, "realize",
 		G_CALLBACK (mail_config_web_view_realize), NULL);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's consturcted() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index afba8af0c9..3649309d3c 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -244,8 +244,8 @@ mailto_handler_constructed (GObject *object)
 		shell, "event::ready-to-start",
 		G_CALLBACK (mailto_handler_check), extension);
 
-	if (G_OBJECT_CLASS (e_mailto_handler_parent_class)->constructed)
-		G_OBJECT_CLASS (e_mailto_handler_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_mailto_handler_parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c
index 68212edbcf..7546ece205 100644
--- a/modules/network-manager/evolution-network-manager.c
+++ b/modules/network-manager/evolution-network-manager.c
@@ -203,8 +203,8 @@ network_manager_constructed (GObject *object)
 {
 	network_manager_connect (E_NETWORK_MANAGER (object));
 
-	if (G_OBJECT_CLASS (e_network_manager_parent_class)->constructed)
-		G_OBJECT_CLASS (e_network_manager_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_network_manager_parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index ad6cd3607c..fa2a4efcc7 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -173,8 +173,8 @@ offline_alert_constructed (GObject *object)
 		shell, "window-created",
 		G_CALLBACK (offline_alert_window_created_cb), extension);
 
-	if (G_OBJECT_CLASS (e_offline_alert_parent_class)->constructed)
-		G_OBJECT_CLASS (e_offline_alert_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_offline_alert_parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c
index de1df62a5d..a7f7580c86 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -501,8 +501,8 @@ plugin_manager_constructed (GObject *object)
 
 	g_object_unref (action);
 
-	if (G_OBJECT_CLASS (e_plugin_manager_parent_class)->constructed)
-		G_OBJECT_CLASS (e_plugin_manager_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_plugin_manager_parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 2bbaa5675e..8f1b118a53 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -597,8 +597,8 @@ startup_wizard_constructed (GObject *object)
 		shell, "event::ready-to-start",
 		G_CALLBACK (startup_wizard_run), extension);
 
-	if (G_OBJECT_CLASS (e_startup_wizard_parent_class)->constructed)
-		G_OBJECT_CLASS (e_startup_wizard_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_startup_wizard_parent_class)->constructed (object);
 }
 
 static void
diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c
index cc61db63b9..96f0a18701 100644
--- a/modules/windows-sens/evolution-windows-sens.c
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -586,8 +586,8 @@ cleanup:
 		g_free (buf);
 	}
 
-	if (G_OBJECT_CLASS (e_windows_sens_parent_class)->constructed)
-		G_OBJECT_CLASS (e_windows_sens_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_windows_sens_parent_class)->constructed (object);
 }
 
 static void
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 4ec4159ab6..6b0233d2bc 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -93,13 +93,13 @@ junk_settings_finalise (GObject *obj)
 }
 
 static void
-junk_settings_dispose (GObject *obj)
+junk_settings_dispose (GObject *object)
 {
-	JunkSettings *js = (JunkSettings *) obj;
+	JunkSettings *js = (JunkSettings *) object;
 	free_all (js);
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (obj);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 765232d915..ea42265b4f 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -95,23 +95,25 @@ share_folder_class_init (ShareFolderClass *klass)
 }
 
 static void
-share_folder_finalise (GObject *obj)
+share_folder_finalise (GObject *object)
 {
-	ShareFolder *sf = (ShareFolder *) obj;
+	ShareFolder *sf = (ShareFolder *) object;
 	g_object_unref (sf->builder);
 	free_all (sf);
-	G_OBJECT_CLASS (parent_class)->finalize (obj);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
-share_folder_dispose (GObject *obj)
+share_folder_dispose (GObject *object)
 {
 
-	ShareFolder *sf = (ShareFolder *) obj;
+	ShareFolder *sf = (ShareFolder *) object;
 	free_all (sf);
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (obj);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 4a2925196f..70ae97784e 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -915,8 +915,8 @@ itip_view_dispose (GObject *object)
 		view->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (itip_view_parent_class)->dispose)
-		G_OBJECT_CLASS (itip_view_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (itip_view_parent_class)->dispose (object);
 }
 
 static void
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index ccd121fa48..5b53fb5334 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -208,8 +208,8 @@ shell_content_constructed (GObject *object)
 
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
 
-	if (G_OBJECT_CLASS (e_shell_content_parent_class)->constructed)
-		G_OBJECT_CLASS (e_shell_content_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_shell_content_parent_class)->constructed (object);
 }
 
 static void
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 9244d792a7..4b7dc88ae2 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -735,8 +735,8 @@ shell_searchbar_constructed (GObject *object)
 
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
 
-	if (G_OBJECT_CLASS (e_shell_searchbar_parent_class)->constructed)
-		G_OBJECT_CLASS (e_shell_searchbar_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_shell_searchbar_parent_class)->constructed (object);
 }
 
 static void
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index b8ee23b6d0..ed5567e406 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -215,8 +215,8 @@ shell_sidebar_constructed (GObject *object)
 
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
 
-	if (G_OBJECT_CLASS (e_shell_sidebar_parent_class)->constructed)
-		G_OBJECT_CLASS (e_shell_sidebar_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_shell_sidebar_parent_class)->constructed (object);
 }
 
 static void
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 41863b6750..8b8cc1d4a7 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -273,8 +273,8 @@ shell_taskbar_constructed (GObject *object)
 
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
 
-	if (G_OBJECT_CLASS (e_shell_taskbar_parent_class)->constructed)
-		G_OBJECT_CLASS (e_shell_taskbar_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_shell_taskbar_parent_class)->constructed (object);
 }
 
 static void
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index cb682b7814..e513eea681 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -607,8 +607,8 @@ shell_view_constructed (GObject *object)
 
 	e_extensible_load_extensions (E_EXTENSIBLE (object));
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static GtkWidget *
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 0ca0a5a541..25986f07a7 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -344,8 +344,8 @@ shell_window_constructed (GObject *object)
 	    e_shell_get_small_screen_mode (shell_window->priv->shell))
 		gtk_window_set_decorated (GTK_WINDOW (object), FALSE);
 
-	if (G_OBJECT_CLASS (e_shell_window_parent_class)->constructed)
-		G_OBJECT_CLASS (e_shell_window_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_shell_window_parent_class)->constructed (object);
 }
 
 static GtkWidget *
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 123a9751e7..82ccf6df9e 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -713,8 +713,8 @@ shell_constructed (GObject *object)
 	if (!unique_app_is_running (UNIQUE_APP (object)))
 		e_file_lock_create ();
 
-	if (G_OBJECT_CLASS (e_shell_parent_class)->constructed)
-		G_OBJECT_CLASS (e_shell_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_shell_parent_class)->constructed (object);
 }
 
 static UniqueResponse
diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c
index 2891f53b64..983b40e8d9 100644
--- a/shell/test/e-test-shell-backend.c
+++ b/shell/test/e-test-shell-backend.c
@@ -152,8 +152,8 @@ test_shell_backend_constructed (GObject *object)
 		G_CALLBACK (test_shell_backend_window_destroyed_cb),
 		shell_backend);
 
-	if (G_OBJECT_CLASS (parent_class)->constructed)
-		G_OBJECT_CLASS (parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (parent_class)->constructed (object);
 }
 
 static void
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 6076bcd4b6..4b70b1118d 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -379,8 +379,8 @@ e_cert_db_dispose (GObject *object)
 	g_free (ec->priv);
 	ec->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 #ifdef notyet
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 6a6fef462e..a7605a42ce 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -148,8 +148,8 @@ e_cert_dispose (GObject *object)
 	g_free (ec->priv);
 	ec->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index d73b3c96af..6b7b7ae63c 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -98,8 +98,8 @@ e_pkcs12_dispose (GObject *object)
 	g_free (pk->priv);
 	pk->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
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*
diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c
index 2eb646c3f1..8b57cc80b6 100644
--- a/widgets/misc/e-attachment-handler-image.c
+++ b/widgets/misc/e-attachment-handler-image.c
@@ -210,8 +210,7 @@ attachment_handler_image_constructed (GObject *object)
 	handler = E_ATTACHMENT_HANDLER (object);
 
 	/* Chain up to parent's constructed() method. */
-	if (G_OBJECT_CLASS (e_attachment_handler_image_parent_class)->constructed)
-		G_OBJECT_CLASS (e_attachment_handler_image_parent_class)->constructed (object);
+	G_OBJECT_CLASS (e_attachment_handler_image_parent_class)->constructed (object);
 
 	view = e_attachment_handler_get_view (handler);
 
diff --git a/widgets/misc/e-attachment-handler-sendto.c b/widgets/misc/e-attachment-handler-sendto.c
index bea3e2327f..2694e3d07a 100644
--- a/widgets/misc/e-attachment-handler-sendto.c
+++ b/widgets/misc/e-attachment-handler-sendto.c
@@ -185,8 +185,7 @@ attachment_handler_sendto_constructed (GObject *object)
 	handler = E_ATTACHMENT_HANDLER (object);
 
 	/* Chain up to parent's constructed() method. */
-	if (G_OBJECT_CLASS (e_attachment_handler_sendto_parent_class)->constructed)
-		G_OBJECT_CLASS (e_attachment_handler_sendto_parent_class)->constructed (object);
+	G_OBJECT_CLASS (e_attachment_handler_sendto_parent_class)->constructed (object);
 
 	view = e_attachment_handler_get_view (handler);
 	ui_manager = e_attachment_view_get_ui_manager (view);
diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c
index 3f77136152..d388faca34 100644
--- a/widgets/misc/e-attachment-handler.c
+++ b/widgets/misc/e-attachment-handler.c
@@ -56,8 +56,7 @@ attachment_handler_constructed (GObject *object)
 	e_attachment_view_add_drag_actions (view, drag_actions);
 
 	/* Chain up to parent's constructed() method. */
-	if (G_OBJECT_CLASS (e_attachment_handler_parent_class))
-		G_OBJECT_CLASS (e_attachment_handler_parent_class)->constructed (object);
+	G_OBJECT_CLASS (e_attachment_handler_parent_class)->constructed (object);
 }
 
 static void
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index 3158c363d9..0eaada1e8e 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -350,8 +350,8 @@ attachment_paned_constructed (GObject *object)
 	key = "/apps/evolution/shell/attachment_view";
 	gconf_bridge_bind_property (bridge, key, object, "active-view");
 
-	if (G_OBJECT_CLASS (e_attachment_paned_parent_class)->constructed)
-		G_OBJECT_CLASS (e_attachment_paned_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_attachment_paned_parent_class)->constructed (object);
 }
 
 static EAttachmentViewPrivate *
diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c
index d647a575dc..4068e5efdc 100644
--- a/widgets/misc/e-attachment-store.c
+++ b/widgets/misc/e-attachment-store.c
@@ -148,8 +148,8 @@ attachment_store_constructed (GObject *object)
 	key = "/apps/evolution/shell/file_chooser_folder";
 	gconf_bridge_bind_property (bridge, key, object, "current-folder-uri");
 
-	if (G_OBJECT_CLASS (e_attachment_store_parent_class)->constructed)
-		G_OBJECT_CLASS (e_attachment_store_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_attachment_store_parent_class)->constructed (object);
 }
 
 static void
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index c21a6a4547..9332345875 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -242,8 +242,8 @@ e_calendar_dispose		(GObject *object)
 		cal->timeout_id = 0;
 	}
 
-	if (G_OBJECT_CLASS (e_calendar_parent_class)->dispose)
-		G_OBJECT_CLASS (e_calendar_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_calendar_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index c05ba2df49..431e0fde6e 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -105,8 +105,8 @@ ecb_dispose (GObject *object)
 		ecb->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (ecb_parent_class)->dispose)
-		G_OBJECT_CLASS (ecb_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (ecb_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c
index ee0e47ddf5..5994c075c5 100644
--- a/widgets/misc/e-cell-renderer-combo.c
+++ b/widgets/misc/e-cell-renderer-combo.c
@@ -136,9 +136,9 @@ ecrc_set_prop (GObject *object, guint prop_id, const GValue *value, GParamSpec *
 }
 
 static void
-ecrc_finalize (GObject *obj)
+ecrc_finalize (GObject *object)
 {
-	ECellRendererCombo *cell = (ECellRendererCombo *) obj;
+	ECellRendererCombo *cell = (ECellRendererCombo *) object;
 
 	if (cell->priv->editable)
 		g_object_unref (cell->priv->editable);
@@ -150,8 +150,8 @@ ecrc_finalize (GObject *obj)
 
 	g_free (cell->priv);
 
-	if (G_OBJECT_CLASS (e_cell_renderer_combo_parent_class)->finalize)
-		G_OBJECT_CLASS (e_cell_renderer_combo_parent_class)->finalize (obj);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_cell_renderer_combo_parent_class)->finalize (object);
 }
 
 static void
diff --git a/widgets/misc/e-focus-tracker.c b/widgets/misc/e-focus-tracker.c
index 429a62af45..eb835b94bc 100644
--- a/widgets/misc/e-focus-tracker.c
+++ b/widgets/misc/e-focus-tracker.c
@@ -445,8 +445,8 @@ focus_tracker_constructed (GObject *object)
 		clipboard, "owner-change",
 		G_CALLBACK (e_focus_tracker_update_actions), object);
 
-	if (G_OBJECT_CLASS (e_focus_tracker_parent_class)->constructed)
-		G_OBJECT_CLASS (e_focus_tracker_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_focus_tracker_parent_class)->constructed (object);
 }
 
 static void
diff --git a/widgets/misc/e-picture-gallery.c b/widgets/misc/e-picture-gallery.c
index 209b00b662..084a6f49a0 100644
--- a/widgets/misc/e-picture-gallery.c
+++ b/widgets/misc/e-picture-gallery.c
@@ -333,8 +333,8 @@ picture_gallery_constructed (GObject *object)
 	GtkTargetList *list;
 	gint n_targets;
 
-	if (G_OBJECT_CLASS (e_picture_gallery_parent_class)->constructed)
-		G_OBJECT_CLASS (e_picture_gallery_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_picture_gallery_parent_class)->constructed (object);
 
 	icon_view = GTK_ICON_VIEW (object);
 
@@ -375,8 +375,8 @@ picture_gallery_dispose (GObject *object)
 		gallery->priv->monitor = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_picture_gallery_parent_class)->dispose)
-		G_OBJECT_CLASS (e_picture_gallery_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_picture_gallery_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/misc/e-preview-pane.c b/widgets/misc/e-preview-pane.c
index b6a06ccfe5..8cc1612129 100644
--- a/widgets/misc/e-preview-pane.c
+++ b/widgets/misc/e-preview-pane.c
@@ -144,8 +144,8 @@ preview_pane_constructed (GObject *object)
 	priv->search_bar = g_object_ref (widget);
 	gtk_widget_hide (widget);
 
-	if (G_OBJECT_CLASS (e_preview_pane_parent_class)->constructed)
-		G_OBJECT_CLASS (e_preview_pane_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_preview_pane_parent_class)->constructed (object);
 }
 
 static void
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 0b0589bfa6..59476a61e1 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -381,8 +381,8 @@ search_bar_constructed (GObject *object)
 		G_BINDING_BIDIRECTIONAL |
 		G_BINDING_SYNC_CREATE);
 
-	if (G_OBJECT_CLASS (e_search_bar_parent_class)->constructed)
-		G_OBJECT_CLASS (e_search_bar_parent_class)->constructed (object);
+	/* Chain up to parent's constructed() method. */
+	G_OBJECT_CLASS (e_search_bar_parent_class)->constructed (object);
 }
 
 static void
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 8f9a8f087d..e7185a0a3f 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -188,8 +188,8 @@ esma_dispose (GObject *object)
 		esma->eba = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_selection_model_array_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_selection_model_array_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_selection_model_array_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 9687e7d392..3bf671b48a 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -246,13 +246,6 @@ pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 }
 
 static void
-pixbuf_dispose (GObject *object)
-{
-	if (G_OBJECT_CLASS (e_cell_pixbuf_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_cell_pixbuf_parent_class)->dispose) (object);
-}
-
-static void
 pixbuf_set_property (GObject *object,
 		     guint prop_id,
 		     const GValue *value,
@@ -324,7 +317,6 @@ e_cell_pixbuf_class_init (ECellPixbufClass *class)
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 	ECellClass *ecc = E_CELL_CLASS (class);
 
-	object_class->dispose = pixbuf_dispose;
 	object_class->set_property = pixbuf_set_property;
 	object_class->get_property = pixbuf_get_property;
 
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index d7a1e7f237..773aefc674 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -183,8 +183,8 @@ etcta_dispose (GObject *object)
 		g_object_unref (etcta->selection);
 	etcta->selection = NULL;
 
-	if (G_OBJECT_CLASS (etcta_parent_class)->dispose)
-		(*G_OBJECT_CLASS (etcta_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etcta_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 1238d5c017..2eb688e54f 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -74,8 +74,8 @@ etc_dispose (GObject *object)
 	g_free (etc->icon_name);
 	etc->icon_name = NULL;
 
-	if (G_OBJECT_CLASS (e_table_col_parent_class)->dispose)
-		G_OBJECT_CLASS (e_table_col_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_table_col_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index dafd0b79fe..51ab6c1139 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -82,8 +82,8 @@ etfci_dispose (GObject *object)
 		pango_font_description_free (etfci->font_desc);
 	etfci->font_desc = NULL;
 
-	if (G_OBJECT_CLASS (etfci_parent_class)->dispose)
-		(*G_OBJECT_CLASS (etfci_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etfci_parent_class)->dispose (object);
 }
 
 static gint
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index e038271b86..20ecb6edec 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -232,8 +232,8 @@ e_table_field_chooser_dispose (GObject *object)
 		g_object_unref (etfc->header);
 	etfc->header = NULL;
 
-	if (G_OBJECT_CLASS (e_table_field_chooser_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_table_field_chooser_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_table_field_chooser_parent_class)->dispose (object);
 }
 
 GtkWidget*
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 2f287c2abf..7ec55301a0 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -106,8 +106,8 @@ etgl_dispose (GObject *object)
 		etgl->selection_model = NULL;
 	}
 
-	if (G_OBJECT_CLASS (etgl_parent_class)->dispose)
-		G_OBJECT_CLASS (etgl_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etgl_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 2b6f3e971a..8f67a02ba6 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -73,8 +73,8 @@ etg_dispose (GObject *object)
 		etg->model = NULL;
 	}
 
-	if (G_OBJECT_CLASS (etg_parent_class)->dispose)
-		G_OBJECT_CLASS (etg_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etg_parent_class)->dispose (object);
 }
 
 /**
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 2ae10b87f3..1c7f4a2c54 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -137,8 +137,8 @@ ethi_dispose (GObject *object) {
 		g_object_unref (ethi->config);
 	ethi->config = NULL;
 
-	if (G_OBJECT_CLASS (ethi_parent_class)->dispose)
-		(*G_OBJECT_CLASS (ethi_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (ethi_parent_class)->dispose (object);
 }
 
 static gint
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index df772a3c80..f648a8d765 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -181,8 +181,8 @@ eth_finalize (GObject *object)
 	eth->col_count = 0;
 	eth->columns = NULL;
 
-	if (G_OBJECT_CLASS (e_table_header_parent_class)->finalize)
-		G_OBJECT_CLASS (e_table_header_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_table_header_parent_class)->finalize (object);
 }
 
 static void
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 98ce069e81..51e3c9fecd 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1426,8 +1426,8 @@ eti_dispose (GObject *object)
 		g_free (eti->height_cache);
 	eti->height_cache = NULL;
 
-	if (G_OBJECT_CLASS (eti_parent_class)->dispose)
-		(*G_OBJECT_CLASS (eti_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (eti_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 308cdb0c58..3bf5ec5c8f 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -264,19 +264,10 @@ e_table_model_value_to_string (ETableModel *e_table_model, gint col, gconstpoint
 }
 
 static void
-e_table_model_finalize (GObject *object)
-{
-	if (G_OBJECT_CLASS (e_table_model_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_table_model_parent_class)->finalize)(object);
-}
-
-static void
 e_table_model_class_init (ETableModelClass *class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-	object_class->finalize = e_table_model_finalize;
-
 	e_table_model_signals[MODEL_NO_CHANGE] =
 		g_signal_new ("model_no_change",
 			      G_TYPE_FROM_CLASS (object_class),
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 7c11d1bd4a..18c0f5ea03 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -237,8 +237,8 @@ etsm_dispose (GObject *object)
 	drop_model (etsm);
 	free_hash (etsm);
 
-	if (G_OBJECT_CLASS (e_table_selection_model_parent_class)->dispose)
-		G_OBJECT_CLASS (e_table_selection_model_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_table_selection_model_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index b65ee7e6cc..8641bf1527 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -165,8 +165,8 @@ e_text_model_dispose (GObject *object)
 		model->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_text_model_parent_class)->dispose)
-		G_OBJECT_CLASS (e_text_model_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_text_model_parent_class)->dispose (object);
 }
 
 static gint
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index f6522672b2..9801132684 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -274,8 +274,8 @@ e_text_dispose (GObject *object)
 		text->font_desc = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_text_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_text_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_text_parent_class)->dispose (object);
 }
 
 static void