diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-16 08:52:22 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-16 10:05:32 +0800 |
| commit | da38777cc0f397ff8e3bd8b6500916bd9291f7f9 (patch) | |
| tree | 0adc80dae525d41bd9c7e2125cb8228c09c1fb32 | |
| parent | d107894a439a43020ffad2763c39f792c8a989df (diff) | |
| download | gsoc2013-evolution-da38777cc0f397ff8e3bd8b6500916bd9291f7f9.tar.gz gsoc2013-evolution-da38777cc0f397ff8e3bd8b6500916bd9291f7f9.tar.zst gsoc2013-evolution-da38777cc0f397ff8e3bd8b6500916bd9291f7f9.zip | |
ETaskShellView: Use g_clear_object() in dispose().
| -rw-r--r-- | modules/calendar/e-task-shell-view-private.c | 6 | ||||
| -rw-r--r-- | 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 028661b594..562c2a264d 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 45bf20bd1d..c0a38b73d4 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" |