aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--my-evolution/ChangeLog6
-rw-r--r--my-evolution/e-summary-mail.c9
-rw-r--r--my-evolution/e-summary.c2
3 files changed, 14 insertions, 3 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index e5c917a5ea..f1fb366845 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-16 Iain Holmes <iain@ximian.com>
+
+ * e-summary.c (e_summary_new): Don't call a draw.
+
+ * e-summary-mail.c (e_summary_mail_init): Make sure html is NULL.
+
2001-10-14 Zbigniew Chyla <cyba@gnome.pl>
* e-summary-calendar.c (generate_html): Made temporary buffer for
diff --git a/my-evolution/e-summary-mail.c b/my-evolution/e-summary-mail.c
index fbb9a28de9..b3696dc5fb 100644
--- a/my-evolution/e-summary-mail.c
+++ b/my-evolution/e-summary-mail.c
@@ -118,7 +118,7 @@ e_summary_mail_generate_html (ESummary *summary)
ESummaryMail *mail;
GString *string;
GList *p;
- gchar *s;
+ char *s, *old;
g_return_if_fail (summary != NULL);
g_return_if_fail (IS_E_SUMMARY (summary));
@@ -137,8 +137,12 @@ e_summary_mail_generate_html (ESummary *summary)
}
g_string_append (string, "</table></dd></dl>");
- g_free (mail->html);
+
+ old = mail->html;
mail->html = string->str;
+
+ g_free (old);
+
g_string_free (string, FALSE);
}
@@ -391,6 +395,7 @@ e_summary_mail_init (ESummary *summary,
mail = g_new0 (ESummaryMail, 1);
summary->mail = mail;
+ mail->html = NULL;
CORBA_exception_init (&ev);
mail->folder_info = oaf_activate_from_id (MAIL_IID, 0, NULL, &ev);
if (BONOBO_EX (&ev)) {
diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c
index 98f13aa1e7..f7da1d9a62 100644
--- a/my-evolution/e-summary.c
+++ b/my-evolution/e-summary.c
@@ -548,7 +548,7 @@ e_summary_new (const GNOME_Evolution_Shell shell)
e_summary_rdf_init (summary);
e_summary_weather_init (summary);
- e_summary_draw (summary);
+/* e_summary_draw (summary); */
return GTK_WIDGET (summary);
}