From 6d45ed28597a85c6b5dfa49aeeaf3911da76cf77 Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Thu, 14 Aug 2003 07:18:18 +0000 Subject: Chain. 2003-08-12 Hans Petter Jansson * backend/ebook/e-destination.c (e_destination_dispose): Chain. * gui/component/e-address-widget.c (e_address_widget_destroy): Chain. Prevent double frees. Prevent double GSource removal. * gui/component/e-cardlist-model.c (e_cardlist_model_class_init): Store parent class. (e_cardlist_model_dispose): Chain. Prevent double frees and unrefs. * gui/contact-editor/e-contact-editor-address.c (e_contact_editor_address_dispose): Chain. * gui/contact-editor/e-contact-editor-fullname.c (e_contact_editor_fullname_dispose): Chain. * gui/contact-list-editor/e-contact-list-editor.c (e_contact_list_editor_dispose): Chain. * gui/contact-list-editor/e-contact-list-model.c (contact_list_model_destroy): Chain. Prevent double frees and unrefs. * gui/widgets/e-addressbook-reflow-adapter.c (addressbook_dispose): Chain. (addressbook_finalize): Chain. * gui/widgets/e-addressbook-table-adapter.c (addressbook_dispose): Chain. * gui/widgets/e-addressbook-treeview-adapter.c (addressbook_destroy): Chain. Prevent double free. * gui/widgets/gal-view-minicard.c (gal_view_minicard_dispose): Chain. Prevent double free and detach. * gui/widgts/gal-view-treeview.c (gal_view_treeview_dispose): Chain. Prevent double free and detach. * printins/e-contact-print-style-editor.c (e_contact_print_stule_editor_destroy): Chain. Prevent double unref. svn path=/trunk/; revision=22229 --- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 6 ++++++ addressbook/gui/widgets/e-addressbook-table-adapter.c | 3 +++ addressbook/gui/widgets/e-addressbook-treeview-adapter.c | 3 +++ addressbook/gui/widgets/gal-view-minicard.c | 11 +++++++++-- addressbook/gui/widgets/gal-view-treeview.c | 11 +++++++++-- 5 files changed, 30 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 7ece1aab8c..a4cb9364b5 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -104,6 +104,9 @@ addressbook_dispose(GObject *object) EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object); unlink_model (adapter); + + if (G_OBJECT_CLASS (parent_class)->dispose) + (* G_OBJECT_CLASS (parent_class)->dispose) (object); } static void @@ -112,6 +115,9 @@ addressbook_finalize(GObject *object) EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object); g_free (adapter->priv); + + if (G_OBJECT_CLASS (parent_class)->finalize) + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } static void diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index b3f79f064c..6a9e06da54 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -91,6 +91,9 @@ addressbook_dispose(GObject *object) g_free (adapter->priv); adapter->priv = NULL; } + + if (G_OBJECT_CLASS (parent_class)->dispose) + (* 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-treeview-adapter.c b/addressbook/gui/widgets/e-addressbook-treeview-adapter.c index af4652226e..ab1a559f0c 100644 --- a/addressbook/gui/widgets/e-addressbook-treeview-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-treeview-adapter.c @@ -89,6 +89,9 @@ addressbook_destroy(GtkObject *object) unlink_model(adapter); g_free (adapter->priv); + adapter->priv = NULL; + + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } #if 0 diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 08818f9ee3..da60497cdb 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -89,8 +89,15 @@ static void gal_view_minicard_dispose (GObject *object) { GalViewMinicard *view = GAL_VIEW_MINICARD(object); - gal_view_minicard_detach (view); - g_free(view->title); + + if (view->title != NULL) { + gal_view_minicard_detach (view); + g_free(view->title); + view->title = NULL; + } + + if (G_OBJECT_CLASS (gal_view_minicard_parent_class)->dispose) + (* G_OBJECT_CLASS (gal_view_minicard_parent_class)->dispose) (object); } static void diff --git a/addressbook/gui/widgets/gal-view-treeview.c b/addressbook/gui/widgets/gal-view-treeview.c index f43b3add75..e18ae6341b 100644 --- a/addressbook/gui/widgets/gal-view-treeview.c +++ b/addressbook/gui/widgets/gal-view-treeview.c @@ -92,8 +92,15 @@ static void gal_view_treeview_dispose (GObject *object) { GalViewTreeView *view = GAL_VIEW_TREEVIEW(object); - gal_view_treeview_detach (view); - g_free(view->title); + + if (view->title != NULL) { + gal_view_treeview_detach (view); + g_free(view->title); + view->title = NULL; + } + + if (G_OBJECT_CLASS (gal_view_treeview_parent_class)->dispose) + (* G_OBJECT_CLASS (gal_view_treeview_parent_class)->dispose) (object); } static void -- cgit v1.2.3