From 7a1677520d439aee68c5ab0268a951d0b411e3a0 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 ++-- widgets/misc/e-attachment-handler-image.c | 3 +-- widgets/misc/e-attachment-handler-sendto.c | 3 +-- widgets/misc/e-attachment-handler.c | 3 +-- widgets/misc/e-attachment-paned.c | 4 ++-- widgets/misc/e-attachment-store.c | 4 ++-- widgets/misc/e-calendar.c | 4 ++-- widgets/misc/e-canvas-background.c | 4 ++-- widgets/misc/e-cell-renderer-combo.c | 8 ++++---- widgets/misc/e-focus-tracker.c | 4 ++-- widgets/misc/e-picture-gallery.c | 8 ++++---- widgets/misc/e-preview-pane.c | 4 ++-- widgets/misc/e-search-bar.c | 4 ++-- widgets/misc/e-selection-model-array.c | 4 ++-- widgets/table/e-cell-pixbuf.c | 8 -------- widgets/table/e-table-click-to-add.c | 4 ++-- widgets/table/e-table-col.c | 4 ++-- widgets/table/e-table-field-chooser-item.c | 4 ++-- widgets/table/e-table-field-chooser.c | 4 ++-- widgets/table/e-table-group-leaf.c | 4 ++-- widgets/table/e-table-group.c | 4 ++-- widgets/table/e-table-header-item.c | 4 ++-- widgets/table/e-table-header.c | 4 ++-- widgets/table/e-table-item.c | 4 ++-- widgets/table/e-table-model.c | 9 --------- widgets/table/e-table-selection-model.c | 4 ++-- widgets/text/e-text-model.c | 4 ++-- widgets/text/e-text.c | 4 ++-- 34 files changed, 65 insertions(+), 85 deletions(-) (limited to 'widgets') 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 @@ -245,13 +245,6 @@ pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col) return max_width; } -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, @@ -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 @@ -263,20 +263,11 @@ e_table_model_value_to_string (ETableModel *e_table_model, gint col, gconstpoint return g_strdup(""); } -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 -- cgit