diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-06 02:18:42 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-06 02:18:42 +0800 |
| commit | 0e595276e5b32beae2a10ad3deb47a802866326f (patch) | |
| tree | f614933b1030304ca477a75602d0cb2cbd91ca8d /shell/e-shell-about-box.c | |
| parent | 99c2d72b9971cabfb736e2547f5b57f48fafa354 (diff) | |
| download | gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.gz gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.bz2 gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.lz gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.xz gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.tar.zst gsoc2013-evolution-0e595276e5b32beae2a10ad3deb47a802866326f.zip | |
Split finalize/dispose. Likewise. Likewise. Likewise. Likewise. Likewise.
* e-activity-handler.c: Split finalize/dispose.
* e-corba-shortcuts.c: Likewise.
* e-corba-storage-registry.c: Likewise.
* e-shell-about-box.c: Likewise.
* e-shell.c: Likewise.
* e-splash.c: Likewise.
* evolution-config-control.c: Likewise.
* evolution-session.c: Likewise.
* evolution-shell-component.c: Likewise.
* evolution-shell-view.c: Likewise.
* evolution-storage-set-view.c: Likewise.
* evolution-storage.c: Likewise.
* evolution-wizard.c: Likewise.
svn path=/trunk/; revision=18556
Diffstat (limited to 'shell/e-shell-about-box.c')
| -rw-r--r-- | shell/e-shell-about-box.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/shell/e-shell-about-box.c b/shell/e-shell-about-box.c index a71fb553aa..65761da8aa 100644 --- a/shell/e-shell-about-box.c +++ b/shell/e-shell-about-box.c @@ -209,7 +209,7 @@ timeout_callback (void *data) /* GObject methods. */ static void -impl_finalize (GObject *object) +impl_dispose (GObject *object) { EShellAboutBox *about_box; EShellAboutBoxPrivate *priv; @@ -217,14 +217,32 @@ impl_finalize (GObject *object) about_box = E_SHELL_ABOUT_BOX (object); priv = about_box->priv; - if (priv->pixmap != NULL) + if (priv->pixmap != NULL) { gdk_pixmap_unref (priv->pixmap); + priv->pixmap = NULL; + } - if (priv->text_background_pixmap != NULL) + if (priv->text_background_pixmap != NULL) { gdk_pixmap_unref (priv->text_background_pixmap); + priv->text_background_pixmap = NULL; + } - if (priv->clipped_gc != NULL) + if (priv->clipped_gc != NULL) { gdk_gc_unref (priv->clipped_gc); + priv->clipped_gc = NULL; + } + + (* G_OBJECT_CLASS (parent_class)->dispose) (object); +} + +static void +impl_finalize (GObject *object) +{ + EShellAboutBox *about_box; + EShellAboutBoxPrivate *priv; + + about_box = E_SHELL_ABOUT_BOX (object); + priv = about_box->priv; if (priv->timeout_id != -1) g_source_remove (priv->timeout_id); @@ -347,6 +365,7 @@ class_init (GObjectClass *object_class) parent_class = gtk_type_class (PARENT_TYPE); + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; widget_class = GTK_WIDGET_CLASS (object_class); |