aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail/e-mail-shell-view-private.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-02-16 10:04:43 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-02-16 10:05:32 +0800
commit5e1eda8877c85460ab1bd347533673c43c35309b (patch)
treeeabab7cd61e8370e7da8748f7d09dc5066d34e6d /modules/mail/e-mail-shell-view-private.c
parent2ebfd1d525cac225a61f743a295fd94266095e6a (diff)
downloadgsoc2013-evolution-5e1eda8877c85460ab1bd347533673c43c35309b.tar
gsoc2013-evolution-5e1eda8877c85460ab1bd347533673c43c35309b.tar.gz
gsoc2013-evolution-5e1eda8877c85460ab1bd347533673c43c35309b.tar.bz2
gsoc2013-evolution-5e1eda8877c85460ab1bd347533673c43c35309b.tar.lz
gsoc2013-evolution-5e1eda8877c85460ab1bd347533673c43c35309b.tar.xz
gsoc2013-evolution-5e1eda8877c85460ab1bd347533673c43c35309b.tar.zst
gsoc2013-evolution-5e1eda8877c85460ab1bd347533673c43c35309b.zip
EMailShellView: Use g_clear_object() in dispose().
Diffstat (limited to 'modules/mail/e-mail-shell-view-private.c')
-rw-r--r--modules/mail/e-mail-shell-view-private.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index cb37b6e374..cf917f5251 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -855,17 +855,16 @@ e_mail_shell_view_private_dispose (EMailShellView *mail_shell_view)
priv->prepare_for_quit_handler_id = 0;
}
- DISPOSE (priv->mail_shell_backend);
- DISPOSE (priv->mail_shell_content);
- DISPOSE (priv->mail_shell_sidebar);
+ g_clear_object (&priv->mail_shell_backend);
+ g_clear_object (&priv->mail_shell_content);
+ g_clear_object (&priv->mail_shell_sidebar);
for (ii = 0; ii < MAIL_NUM_SEARCH_RULES; ii++)
- DISPOSE (priv->search_rules[ii]);
+ g_clear_object (&priv->search_rules[ii]);
if (priv->opening_folder != NULL) {
g_cancellable_cancel (priv->opening_folder);
- g_object_unref (priv->opening_folder);
- priv->opening_folder = NULL;
+ g_clear_object (&priv->opening_folder);
}
if (priv->search_account_all != NULL) {