aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-01-26 08:29:20 +0800
committerIain Holmes <iain@src.gnome.org>2001-01-26 08:29:20 +0800
commit6af5ca43fa2725b1254a90085dd1c6b856c41b24 (patch)
tree7b85e95b41e642890a4ead2c7734bf641f363653 /mail
parentc62c751ec8ded2f05e8cf9d24e01ef534100ba4e (diff)
downloadgsoc2013-evolution-6af5ca43fa2725b1254a90085dd1c6b856c41b24.tar
gsoc2013-evolution-6af5ca43fa2725b1254a90085dd1c6b856c41b24.tar.gz
gsoc2013-evolution-6af5ca43fa2725b1254a90085dd1c6b856c41b24.tar.bz2
gsoc2013-evolution-6af5ca43fa2725b1254a90085dd1c6b856c41b24.tar.lz
gsoc2013-evolution-6af5ca43fa2725b1254a90085dd1c6b856c41b24.tar.xz
gsoc2013-evolution-6af5ca43fa2725b1254a90085dd1c6b856c41b24.tar.zst
gsoc2013-evolution-6af5ca43fa2725b1254a90085dd1c6b856c41b24.zip
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
Diffstat (limited to 'mail')
-rw-r--r--mail/mail-format.c6
-rw-r--r--mail/message-list.c17
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 */