diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-12 01:08:13 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-12 01:08:13 +0800 |
commit | c55ddc508dd4c9b558777f99604050f60b6158d3 (patch) | |
tree | 0c77bf97c02b135f557dca8747e3bebc3d7b32b6 /shell/e-corba-config-page.c | |
parent | 8657f5bbf2ddd4a5118767643e0d3cc97d60f145 (diff) | |
download | gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.gz gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.bz2 gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.lz gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.xz gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.tar.zst gsoc2013-evolution-c55ddc508dd4c9b558777f99604050f60b6158d3.zip |
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
Diffstat (limited to 'shell/e-corba-config-page.c')
-rw-r--r-- | shell/e-corba-config-page.c | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c index d792e4db9b..e449c0149a 100644 --- a/shell/e-corba-config-page.c +++ b/shell/e-corba-config-page.c @@ -101,41 +101,54 @@ setup_listener (ECorbaConfigPage *corba_config_page, } -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_dispose (GObject *object) { ECorbaConfigPage *corba_config_page; ECorbaConfigPagePrivate *priv; + CORBA_Environment ev; corba_config_page = E_CORBA_CONFIG_PAGE (object); priv = corba_config_page->priv; - if (priv != NULL) { - CORBA_Environment ev; + CORBA_exception_init (&ev); - CORBA_exception_init (&ev); + if (priv->config_control_interface != CORBA_OBJECT_NIL) { + bonobo_object_release_unref (priv->config_control_interface, &ev); + priv->config_control_interface = CORBA_OBJECT_NIL; + } - if (priv->config_control_interface != CORBA_OBJECT_NIL) - bonobo_object_release_unref (priv->config_control_interface, &ev); + if (priv->listener != NULL) { + Bonobo_EventSource_removeListener (priv->event_source, + bonobo_object_corba_objref (BONOBO_OBJECT (priv->listener)), + &ev); - if (priv->listener != NULL) { - Bonobo_EventSource_removeListener (priv->event_source, - bonobo_object_corba_objref (BONOBO_OBJECT (priv->listener)), - &ev); - bonobo_object_unref (BONOBO_OBJECT (priv->listener)); + bonobo_object_unref (BONOBO_OBJECT (priv->listener)); + bonobo_object_release_unref (priv->event_source, &ev); - bonobo_object_release_unref (priv->event_source, &ev); - } + priv->event_source = CORBA_OBJECT_NIL; + priv->listener = NULL; + } - CORBA_exception_free (&ev); + CORBA_exception_free (&ev); - g_free (priv); - corba_config_page->priv = NULL; - } + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + ECorbaConfigPage *corba_config_page; + ECorbaConfigPagePrivate *priv; + + corba_config_page = E_CORBA_CONFIG_PAGE (object); + priv = corba_config_page->priv; + + g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -167,11 +180,12 @@ impl_apply (EConfigPage *config_page) static void class_init (ECorbaConfigPageClass *class) { - GtkObjectClass *object_class; + GObjectClass *object_class; EConfigPageClass *config_page_class; - object_class = GTK_OBJECT_CLASS (class); - object_class->destroy = impl_destroy; + object_class = G_OBJECT_CLASS (class); + object_class->dispose = impl_dispose; + object_class->finalize = impl_finalize; config_page_class = E_CONFIG_PAGE_CLASS (class); config_page_class->apply = impl_apply; |