aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2008-03-25 22:54:40 +0800
committerDan Williams <dcbw@src.gnome.org>2008-03-25 22:54:40 +0800
commit126fef4ef3d456e84f045e1760d491964b3e2717 (patch)
treea7bd681dc6c39cba7a33ff78ca0d3dfd04976457
parenta10be1eb58d2d85f9ee686671b142655ed3afdcc (diff)
downloadgsoc2013-evolution-126fef4ef3d456e84f045e1760d491964b3e2717.tar
gsoc2013-evolution-126fef4ef3d456e84f045e1760d491964b3e2717.tar.gz
gsoc2013-evolution-126fef4ef3d456e84f045e1760d491964b3e2717.tar.bz2
gsoc2013-evolution-126fef4ef3d456e84f045e1760d491964b3e2717.tar.lz
gsoc2013-evolution-126fef4ef3d456e84f045e1760d491964b3e2717.tar.xz
gsoc2013-evolution-126fef4ef3d456e84f045e1760d491964b3e2717.tar.zst
gsoc2013-evolution-126fef4ef3d456e84f045e1760d491964b3e2717.zip
** Fix for bug #524310
2008-03-25 Dan Williams <dcbw@redhat.com> ** Fix for bug #524310 * mail/mail-session.c: don't double-free server messages svn path=/trunk/; revision=35244
-rw-r--r--ChangeLog6
-rw-r--r--mail/mail-session.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f5e96874b..4bbc91d65a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-25 Dan Williams <dcbw@redhat.com>
+
+ ** Fix for bug #524310
+
+ * mail/mail-session.c: don't double-free server messages
+
2008-03-17 Paul Bolle <pebolle@tiscali.nl>
** Fix for bug #519421
diff --git a/mail/mail-session.c b/mail/mail-session.c
index c8710d63d4..597d7ab8a3 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -433,10 +433,8 @@ alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt
mail_msg_unref (m);
}
- if (m->ismain) {
- user_message_free (m);
+ if (m->ismain)
mail_msg_unref (m);
- }
return result;
}