aboutsummaryrefslogtreecommitdiffstats
path: root/my-evolution
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-10-24 19:52:28 +0800
committerIain Holmes <iain@src.gnome.org>2001-10-24 19:52:28 +0800
commit9be7cad2cd1adb738c571ccbff976b142c15598f (patch)
treec5313192d7210dd251009b33993299597e13db8a /my-evolution
parent438cc004df8fc7c8cecacc951d9365941944b401 (diff)
downloadgsoc2013-evolution-9be7cad2cd1adb738c571ccbff976b142c15598f.tar
gsoc2013-evolution-9be7cad2cd1adb738c571ccbff976b142c15598f.tar.gz
gsoc2013-evolution-9be7cad2cd1adb738c571ccbff976b142c15598f.tar.bz2
gsoc2013-evolution-9be7cad2cd1adb738c571ccbff976b142c15598f.tar.lz
gsoc2013-evolution-9be7cad2cd1adb738c571ccbff976b142c15598f.tar.xz
gsoc2013-evolution-9be7cad2cd1adb738c571ccbff976b142c15598f.tar.zst
gsoc2013-evolution-9be7cad2cd1adb738c571ccbff976b142c15598f.zip
Correct fix for 12236. Stops the crashing and leaves the summary in a usable state.
svn path=/trunk/; revision=13982
Diffstat (limited to 'my-evolution')
-rw-r--r--my-evolution/ChangeLog5
-rw-r--r--my-evolution/e-summary-mail.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index 5a35dd3272..cceecbda73 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-24 Iain Holmes <iain@ximian.com>
+
+ * e-summary-mail.c (e_summary_mail_init): Don't free the mail part.
+ Allows the summary to still function without the mail part.
+
2001-10-22 Anna Marie Dirks <anna@ximian.com>
* my-evolution.glade: Changed "Add new feed" to "Add news feed".
diff --git a/my-evolution/e-summary-mail.c b/my-evolution/e-summary-mail.c
index 73d919ca4a..149678b51d 100644
--- a/my-evolution/e-summary-mail.c
+++ b/my-evolution/e-summary-mail.c
@@ -400,14 +400,11 @@ e_summary_mail_init (ESummary *summary,
mail->html = NULL;
CORBA_exception_init (&ev);
mail->folder_info = oaf_activate_from_id (MAIL_IID, 0, NULL, &ev);
- if (BONOBO_EX (&ev)) {
+ if (BONOBO_EX (&ev) || mail->folder_info == NULL) {
g_warning ("Exception creating FolderInfo: %s",
CORBA_exception_id (&ev));
CORBA_exception_free (&ev);
- g_free (mail);
- summary->mail = NULL;
-
return;
}