aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-03-05 02:29:26 +0800
committerMilan Crha <mcrha@src.gnome.org>2009-03-05 02:29:26 +0800
commit506c95a1ec88bfcc624aad51238b13e1ed988301 (patch)
tree1653088a96fe891a604486b55be47ce574bcd1a3 /mail
parent1353535f0bc0420886825fc8a4ae33b5235f1486 (diff)
downloadgsoc2013-evolution-506c95a1ec88bfcc624aad51238b13e1ed988301.tar.gz
gsoc2013-evolution-506c95a1ec88bfcc624aad51238b13e1ed988301.tar.zst
gsoc2013-evolution-506c95a1ec88bfcc624aad51238b13e1ed988301.zip
Do not unref NULL object.
2009-03-04 Milan Crha <mcrha@redhat.com> * mail-ops.c: (empty_trash_exec): Do not unref NULL object. svn path=/trunk/; revision=37369
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/mail-ops.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 167b4d5eba..190e277ac2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-04 Milan Crha <mcrha@redhat.com>
+
+ * mail-ops.c: (empty_trash_exec): Do not unref NULL object.
+
2009-03-02 Matt McCutchen <matt@mattmccutchen.net>
* evolution/mail/em-folder-view.c:
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 7e6fe30269..7c5f0332d7 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1756,10 +1756,10 @@ empty_trash_exec (struct _empty_trash_msg *m)
g_free (uri);
}
- if (trash)
+ if (trash) {
camel_folder_expunge (trash, &m->base.ex);
-
- camel_object_unref (trash);
+ camel_object_unref (trash);
+ }
}
static void