diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-16 08:51:39 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-16 10:05:32 +0800 |
| commit | d107894a439a43020ffad2763c39f792c8a989df (patch) | |
| tree | 657fc8bb5a67ca93c66ee62c045a313a7b3c1e04 | |
| parent | 5e1eda8877c85460ab1bd347533673c43c35309b (diff) | |
| download | gsoc2013-evolution-d107894a439a43020ffad2763c39f792c8a989df.tar gsoc2013-evolution-d107894a439a43020ffad2763c39f792c8a989df.tar.gz gsoc2013-evolution-d107894a439a43020ffad2763c39f792c8a989df.tar.bz2 gsoc2013-evolution-d107894a439a43020ffad2763c39f792c8a989df.tar.lz gsoc2013-evolution-d107894a439a43020ffad2763c39f792c8a989df.tar.xz gsoc2013-evolution-d107894a439a43020ffad2763c39f792c8a989df.tar.zst gsoc2013-evolution-d107894a439a43020ffad2763c39f792c8a989df.zip | |
EMemoShellView: Use g_clear_object() in dispose().
| -rw-r--r-- | modules/calendar/e-memo-shell-view-private.c | 6 | ||||
| -rw-r--r-- | modules/calendar/e-memo-shell-view-private.h | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c index d881c8cb37..d634c1e88d 100644 --- a/modules/calendar/e-memo-shell-view-private.c +++ b/modules/calendar/e-memo-shell-view-private.c @@ -293,9 +293,9 @@ e_memo_shell_view_private_dispose (EMemoShellView *memo_shell_view) { EMemoShellViewPrivate *priv = memo_shell_view->priv; - DISPOSE (priv->memo_shell_backend); - DISPOSE (priv->memo_shell_content); - DISPOSE (priv->memo_shell_sidebar); + g_clear_object (&priv->memo_shell_backend); + g_clear_object (&priv->memo_shell_content); + g_clear_object (&priv->memo_shell_sidebar); if (memo_shell_view->priv->activity != NULL) { /* XXX Activity is not cancellable. */ diff --git a/modules/calendar/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h index 0e0a2daae2..87c8ee142a 100644 --- a/modules/calendar/e-memo-shell-view-private.h +++ b/modules/calendar/e-memo-shell-view-private.h @@ -51,12 +51,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-memo-table.etspec" |