[evolution-patches] (Mailer) Fix for bug 312410
- From: Srinivasa Ragavan <sragavan novell com>
- To: Evolution Patches <evolution-patches ximian com>
- Cc:
- Subject: [evolution-patches] (Mailer) Fix for bug 312410
- Date: Thu, 04 Aug 2005 11:35:25 +0530
Hi,
I have fixed the bug. Just forget my crappy work around that i discussed
yesterday :-). When i looked closely i found that it can be done this
way as well. Hope this goes fine with the design.
-Srini.
Index: em-format-html-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
retrieving revision 1.70
diff -u -p -r1.70 em-format-html-display.c
--- em-format-html-display.c 25 Jul 2005 04:23:40 -0000 1.70
+++ em-format-html-display.c 4 Aug 2005 05:56:44 -0000
@@ -679,6 +679,12 @@ efhd_complete(EMFormat *emf)
if (efhd->priv->search_dialog)
efhd_update_matches(efhd);
+
+ efhd->priv->bar_added = FALSE;
+ if (efhd->priv->files) {
+ g_hash_table_destroy (efhd->priv->files);
+ efhd->priv->files = NULL;
+ }
}
/* ********************************************************************** */
@@ -1047,9 +1053,10 @@ static void efhd_format_clone(EMFormat *
efhd->priv->attachment_bar = NULL;
efhd->priv->bar_added = FALSE;
- if (efhd->priv->files)
+ if (efhd->priv->files) {
g_hash_table_destroy(efhd->priv->files);
- efhd->priv->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+ efhd->priv->files = NULL;
+ }
((EMFormatClass *)efhd_parent)->format_clone(emf, folder, uid, msg, src);
}
@@ -1958,6 +1984,8 @@ efhd_message_add_bar(EMFormat *emf, Came
return;
efhd->priv->bar_added = TRUE;
+ efhd->priv->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_add_bar);
camel_stream_printf(stream, "<td><object classid=\"%s\"></object></td>", classid);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]