2007-07-26 mcrha Fix for bug #273386

svn path=/trunk/; revision=33846

4 files changed, 25 insertions, 5 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0f0e6bda5d..59dd5c4cf8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,17 @@
+2007-07-26  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #273386
+
+	* em-format-html.c: (efh_format_timeout):
+	Clear preview and show text "Formatting message" at the beginning.
+
+	* em-format-html-display.c: (efhd_attachment_show):
+	Changed debug output to print also pointer address.
+	* em-format.c: (emf_clear_puri_node):
+	Added debug output to see which memory is going to be freed.
+	* em-format-html.c: (efh_url_requested), (efh_format_headers):
+	Warnings cleanup.
+
 2007-07-26  Sankar P  <psankar@novell.com>
 
 	* Committed on behalf of  Atos Origin Communication Systems 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index a6c9561826..6287c41252 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -121,7 +121,7 @@
 #define localtime_r(tp,tmp) (localtime(tp)?(*(tmp)=*localtime(tp),(tmp)):0)
 #endif
 
-#define d(x)
+#define d(x) 
 
 #define EFHD_TABLE_OPEN "<table>"
 
@@ -1421,7 +1421,7 @@ efhd_attachment_show(EPopup *ep, EPopupItem *item, void *data)
 {
 	struct _attach_puri *info = data;
 
-	d(printf("show attachment button called\n"));
+	d(printf("show attachment button called %p\n", info));
 
 	info->shown = ~info->shown;
 	em_format_set_inline(info->puri.format, info->puri.part_id, info->shown);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index f7617b59f9..f2eb568595 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -579,7 +579,7 @@ efh_url_requested(GtkHTML *html, const char *url, GtkHTMLStream *handle, EMForma
 		job = em_format_html_job_new(efh, emfh_gethttp, g_strdup(url));
 	} else if  (g_ascii_strncasecmp(url, "/", 1) == 0) {
 		char *data = NULL;
-		guint length = 0;
+		gsize length = 0;
 		gboolean status;
 		
 		status = g_file_get_contents (url, &data, &length, NULL);
@@ -1371,6 +1371,11 @@ efh_format_timeout(struct _format_msg *m)
 		mail_msg_free(m);
 		p->last_part = NULL;
 	} else {
+		hstream = gtk_html_begin(efh->html);
+		gtk_html_stream_printf(hstream, "<h5>%s</h5>",
+						_("Formatting Message..."));
+		gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK);
+
 		hstream = NULL;
 		m->estream = (EMHTMLStream *)em_html_stream_new(efh->html, hstream);
 
@@ -1765,8 +1770,8 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 	const char *photo_name = NULL;
 	CamelInternetAddress *cia = NULL;
 	gboolean face_decoded  = FALSE;
-	char *face_header_value;
-	int face_header_len;
+	char *face_header_value = NULL;
+	int face_header_len = 0;
 	
 	ct = camel_mime_part_get_content_type((CamelMimePart *)part);
 	charset = camel_content_type_param (ct, "charset");
diff --git a/mail/em-format.c b/mail/em-format.c
index 2dc626bb85..40e2661706 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -489,6 +489,7 @@ emf_clear_puri_node(struct _EMFormatPURITree *node)
 		pw = (EMFormatPURI *)node->uri_list.head;
 		pn = pw->next;
 		while (pn) {
+			d(printf ("freeing pw %p format:%p\n", pw, pw->format));
 			if (pw->free)
 				pw->free(pw);
 			g_free(pw->uri);