From c55ddc508dd4c9b558777f99604050f60b6158d3 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 11 Nov 2002 17:08:13 +0000 Subject: Make separate dispose/finalize overrides of just overriding destroy. * e-component-registry.c: Make separate dispose/finalize overrides of just overriding destroy. * e-corba-config-page.c: Likewise. * e-corba-storage.c: Likewise. * e-folder-type-registry.c: Likewise. * e-folder.c: Likewise. * e-history.c: Likewise. * e-local-folder.c: Likewise. * e-local-storage.c: Likewise. * e-shell-folder-selection-dialog.c: Likewise. * e-shell-folder-title-bar.c: Likewise. * e-shell-offline-handler.c: Likewise. * e-shell-settings-dialog.c: Likewise. * e-shell-user-creatable-items-handler.c: Likewise. * e-shell-view.c: Likewise. * e-shortcuts-view-model.c: Likewise. * e-shortcuts-view.c: Likewise. * e-shortcuts.c: Likewise. * e-storage-set-view.c: Likewise. * e-storage-set.c: Likewise. * e-storage.c: Likewise. * e-task-bar.c: Likewise. * e-task-widget.c: Likewise. * e-uri-schema-registry.c: Likewise. * evolution-activity-client.c: Likewise. * evolution-folder-selector-button.c: Likewise. * evolution-storage-listener.c: Likewise. * evolution-storage-set-view-listener.c: Likewise. * evolution-test-component.c: Likewise. svn path=/trunk/; revision=18695 --- shell/e-task-widget.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'shell/e-task-widget.c') diff --git a/shell/e-task-widget.c b/shell/e-task-widget.c index ce936a5b10..e37ddc1e34 100644 --- a/shell/e-task-widget.c +++ b/shell/e-task-widget.c @@ -53,38 +53,52 @@ struct _ETaskWidgetPrivate { }; -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_dispose (GObject *object) { ETaskWidget *task_widget; ETaskWidgetPrivate *priv; task_widget = E_TASK_WIDGET (object); - if (task_widget->priv) { - priv = task_widget->priv; - - g_free (priv->component_id); + if (priv->tooltips != NULL) { g_object_unref (priv->tooltips); + priv->tooltips = NULL; + } + if (priv->icon_pixbuf != NULL) { gdk_pixbuf_unref (priv->icon_pixbuf); - - g_free (priv); - task_widget->priv = NULL; + priv->icon_pixbuf = NULL; } - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + ETaskWidget *task_widget; + ETaskWidgetPrivate *priv; + + task_widget = E_TASK_WIDGET (object); + priv = task_widget->priv; + + g_free (priv->component_id); + g_free (priv); + + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } static void -class_init (GtkObjectClass *object_class) +class_init (GObjectClass *object_class) { parent_class = gtk_type_class (PARENT_TYPE); - object_class->destroy = impl_destroy; + object_class->dispose = impl_dispose; + object_class->finalize = impl_finalize; } static void -- cgit v1.2.3