aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-16 07:40:48 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-16 07:40:48 +0800
commitf11a74d7258c164cdf8627071229a508748c8052 (patch)
treee151a6eed288d5d878cd579c9660c46e8d7d3bd9
parent73510c9d4bbcc34825d6717b9a84b8daf25aa587 (diff)
downloadgsoc2013-evolution-f11a74d7258c164cdf8627071229a508748c8052.tar
gsoc2013-evolution-f11a74d7258c164cdf8627071229a508748c8052.tar.gz
gsoc2013-evolution-f11a74d7258c164cdf8627071229a508748c8052.tar.bz2
gsoc2013-evolution-f11a74d7258c164cdf8627071229a508748c8052.tar.lz
gsoc2013-evolution-f11a74d7258c164cdf8627071229a508748c8052.tar.xz
gsoc2013-evolution-f11a74d7258c164cdf8627071229a508748c8052.tar.zst
gsoc2013-evolution-f11a74d7258c164cdf8627071229a508748c8052.zip
EBookShellView: Use g_clear_object() in dispose().
-rw-r--r--modules/addressbook/e-book-shell-view-private.c6
-rw-r--r--modules/addressbook/e-book-shell-view-private.h6
2 files changed, 3 insertions, 9 deletions
diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c
index d33054e36f..efe4322cd0 100644
--- a/modules/addressbook/e-book-shell-view-private.c
+++ b/modules/addressbook/e-book-shell-view-private.c
@@ -587,9 +587,9 @@ e_book_shell_view_private_dispose (EBookShellView *book_shell_view)
{
EBookShellViewPrivate *priv = book_shell_view->priv;
- DISPOSE (priv->book_shell_backend);
- DISPOSE (priv->book_shell_content);
- DISPOSE (priv->book_shell_sidebar);
+ g_clear_object (&priv->book_shell_backend);
+ g_clear_object (&priv->book_shell_content);
+ g_clear_object (&priv->book_shell_sidebar);
if (priv->registry != NULL) {
g_signal_handlers_disconnect_matched (
diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h
index 4be67e41f4..1fe2b9b7a4 100644
--- a/modules/addressbook/e-book-shell-view-private.h
+++ b/modules/addressbook/e-book-shell-view-private.h
@@ -57,12 +57,6 @@
#define ACTION_GROUP(name) \
(E_SHELL_WINDOW_ACTION_GROUP_##name (shell_window))
-/* For use in dispose() methods. */
-#define DISPOSE(obj) \
- G_STMT_START { \
- if ((obj) != NULL) { g_object_unref (obj); (obj) = NULL; } \
- } G_STMT_END
-
/* ETable Specifications */
#define ETSPEC_FILENAME "e-addressbook-view.etspec"