Yes, some more screw ups...

This cvs thing, I don't get it, I wrap my hand in plastic to try to look through it.

svn path=/trunk/; revision=7833

2 files changed, 7 insertions, 16 deletions

diff --git a/mail/mail-format.c b/mail/mail-format.c
index 8f6d4d5d61..faea36f633 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -494,9 +494,7 @@ attachment_header (CamelMimePart *part, const char *mime_type,
 		return;
 
 	/* Start the table, create the pop-up object. */
-	mail_html_write (md->html, md->stream, "<table bgcolor=\"#EEEEEE\" width=\"100%%\" "
-			 "cellspacing=0 border=1>"
-			 "<tr><td><table><tr valign=top><td>"
+	mail_html_write (md->html, md->stream, "<table><tr><td>"
 			 "<object classid=\"popup:%s\" type=\"%s\">"
 			 "</object></td><td><font size=-1>",
 			 get_cid (part, md), mime_type);
@@ -531,7 +529,7 @@ attachment_header (CamelMimePart *part, const char *mime_type,
 	}
 #endif
 
-	mail_html_write (md->html, md->stream, "</font></td></tr></table></td></tr></table>");
+	mail_html_write (md->html, md->stream, "</font></td></tr></table>");
 }
 
 static gboolean
diff --git a/mail/message-list.c b/mail/message-list.c
index cf81a89a40..46e3b772a5 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2332,7 +2332,6 @@ static void hide_save_state(MessageList *ml)
 		fclose(out);
 	}
 
-	g_free (filename);
 	MESSAGE_LIST_UNLOCK(ml, hide_lock);
 }
 
@@ -2410,7 +2409,7 @@ static void regen_list_regen(struct _mail_msg *mm)
 		if (m->ml->hidden) {
 			for (i=0;i<uids->len;i++) {
 				if (g_hash_table_lookup(m->ml->hidden, uids->pdata[i]) == 0)
-					g_ptr_array_add(uidnew, g_strdup (uids->pdata[i]));
+					g_ptr_array_add(uidnew, uids->pdata[i]);
 			}
 		}
 
@@ -2430,14 +2429,13 @@ static void regen_list_regen(struct _mail_msg *mm)
 			start = MAX(start, 0);
 			end = MIN(end, uidnew->len);
 			for (i=start;i<end;i++) {
-				g_ptr_array_add(uid2, g_strdup (uidnew->pdata[i]));
+				g_ptr_array_add(uid2, uidnew->pdata[i]);
 			}
 
 			g_ptr_array_free(uidnew, TRUE);
 			uidnew = uid2;
 		}
 		m->realuids = uids;
-
 		m->uids = uidnew;
 	} else {
 		m->realuids = NULL;
@@ -2472,21 +2470,16 @@ static void regen_list_free(struct _mail_msg *mm)
 	/* work out if we have aux uid's to free, otherwise free the real ones */
 	uids = m->realuids;
 	if (uids) {
-		if (m->uids) {
-			g_print ("Freeing\n");
-			camel_folder_free_uids(m->ml->folder, m->uids);
-			g_print ("Freed\n");
-/*  			g_ptr_array_free(m->uids, TRUE); */
-		}
+		if (m->uids)
+			g_ptr_array_free(m->uids, TRUE);
 	} else
 		uids = m->uids;
 
 	if (uids) {
 		if (m->search)
 			camel_folder_search_free(m->ml->folder, uids);
-		else {
+		else
 			camel_folder_free_uids(m->ml->folder, uids);
-		}
 	}
 
 	/* update what we have as our search string */