[evolution] EBookShellView: Use g_clear_object() in dispose().

[Matthew Barnes <mbarnes src gnome org>]

commit f11a74d7258c164cdf8627071229a508748c8052
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Feb 15 18:40:48 2013 -0500

    EBookShellView: Use g_clear_object() in dispose().

 modules/addressbook/e-book-shell-view-private.c |    6 +++---
 modules/addressbook/e-book-shell-view-private.h |    6 ------
 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 d33054e..efe4322 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 4be67e4..1fe2b9b 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"