aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-16 08:50:28 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-16 08:50:28 +0800
commit2ebfd1d525cac225a61f743a295fd94266095e6a (patch)
treec41672fa5b6f5f0e27f18043514e6e151b57138c
parentf11a74d7258c164cdf8627071229a508748c8052 (diff)
downloadgsoc2013-evolution-2ebfd1d525cac225a61f743a295fd94266095e6a.tar
gsoc2013-evolution-2ebfd1d525cac225a61f743a295fd94266095e6a.tar.gz
gsoc2013-evolution-2ebfd1d525cac225a61f743a295fd94266095e6a.tar.bz2
gsoc2013-evolution-2ebfd1d525cac225a61f743a295fd94266095e6a.tar.lz
gsoc2013-evolution-2ebfd1d525cac225a61f743a295fd94266095e6a.tar.xz
gsoc2013-evolution-2ebfd1d525cac225a61f743a295fd94266095e6a.tar.zst
gsoc2013-evolution-2ebfd1d525cac225a61f743a295fd94266095e6a.zip
ECalShellView: Use g_clear_object() in dispose().
-rw-r--r--modules/calendar/e-cal-shell-view-private.c6
-rw-r--r--modules/calendar/e-cal-shell-view-private.h6
2 files changed, 3 insertions, 9 deletions
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index f22b8eef20..5678daabcb 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -742,9 +742,9 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
if (priv->cal_shell_content != NULL)
e_cal_shell_content_save_state (priv->cal_shell_content);
- DISPOSE (priv->cal_shell_backend);
- DISPOSE (priv->cal_shell_content);
- DISPOSE (priv->cal_shell_sidebar);
+ g_clear_object (&priv->cal_shell_backend);
+ g_clear_object (&priv->cal_shell_content);
+ g_clear_object (&priv->cal_shell_sidebar);
if (priv->calendar_activity != NULL) {
/* XXX Activity is not cancellable. */
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index b589907dad..a2dd1c33c4 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -62,12 +62,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"
#define CHECK_NB 5