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

[Matthew Barnes <mbarnes src gnome org>]

commit da38777cc0f397ff8e3bd8b6500916bd9291f7f9
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Feb 15 19:52:22 2013 -0500

    ETaskShellView: Use g_clear_object() in dispose().

 modules/calendar/e-task-shell-view-private.c |    6 +++---
 modules/calendar/e-task-shell-view-private.h |    6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index 028661b..562c2a2 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -395,9 +395,9 @@ e_task_shell_view_private_dispose (ETaskShellView *task_shell_view)
 {
        ETaskShellViewPrivate *priv = task_shell_view->priv;
 
-       DISPOSE (priv->task_shell_backend);
-       DISPOSE (priv->task_shell_content);
-       DISPOSE (priv->task_shell_sidebar);
+       g_clear_object (&priv->task_shell_backend);
+       g_clear_object (&priv->task_shell_content);
+       g_clear_object (&priv->task_shell_sidebar);
 
        if (task_shell_view->priv->activity != NULL) {
                /* XXX Activity is not cancellable. */
diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h
index 45bf20b..c0a38b7 100644
--- a/modules/calendar/e-task-shell-view-private.h
+++ b/modules/calendar/e-task-shell-view-private.h
@@ -54,12 +54,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-calendar-table.etspec"