aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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;
}