From 47e69c05fc223b2770a224a9acf9698b3bac5c3e Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Fri, 26 Jan 2001 00:10:00 +0000 Subject: GNOME_Evolution_Mail.oafinfo svn path=/trunk/; revision=7831 --- mail/GNOME_Evolution_Mail.oaf.in | 27 ++++++++++++++++++++++++++- mail/GNOME_Evolution_Mail.oafinfo | 27 ++++++++++++++++++++++++++- mail/mail-accounts.c | 3 ++- mail/mail-display.c | 2 ++ mail/mail-format.c | 6 ++++-- mail/message-list.c | 17 ++++++++++++----- 6 files changed, 72 insertions(+), 10 deletions(-) (limited to 'mail') diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in index 7a88405b82..b976e15a1c 100644 --- a/mail/GNOME_Evolution_Mail.oaf.in +++ b/mail/GNOME_Evolution_Mail.oaf.in @@ -119,7 +119,6 @@ location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"> - @@ -129,4 +128,30 @@ value="Imports Outlook Express 4 files into Evolution"/> + + + + + + + + + + + + + + + + + + + diff --git a/mail/GNOME_Evolution_Mail.oafinfo b/mail/GNOME_Evolution_Mail.oafinfo index 7a88405b82..b976e15a1c 100644 --- a/mail/GNOME_Evolution_Mail.oafinfo +++ b/mail/GNOME_Evolution_Mail.oafinfo @@ -119,7 +119,6 @@ location="OAFIID:GNOME_Evolution_Mail_Outlook_ImporterFactory"> - @@ -129,4 +128,30 @@ value="Imports Outlook Express 4 files into Evolution"/> + + + + + + + + + + + + + + + + + + + diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index 29200a5c5a..2c0d5714d4 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -367,7 +367,8 @@ construct (MailAccountsDialog *dialog) gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Account Manager")); gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 300); - gnome_dialog_append_button (GNOME_DIALOG (dialog), GNOME_STOCK_BUTTON_OK); + gnome_dialog_append_button (GNOME_DIALOG (dialog), + GNOME_STOCK_BUTTON_OK); dialog->mail_accounts = GTK_CLIST (glade_xml_get_widget (gui, "clistAccounts")); gtk_signal_connect (GTK_OBJECT (dialog->mail_accounts), "select-row", diff --git a/mail/mail-display.c b/mail/mail-display.c index 31ec089f46..28587fe1a3 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -878,6 +878,7 @@ mail_display_redisplay (MailDisplay *md, gboolean unscroll) md->stream = NULL; } + /** * mail_display_set_message: * @mail_display: the mail display object @@ -984,6 +985,7 @@ mail_display_new (void) gtk_signal_connect (GTK_OBJECT (html), "link_clicked", GTK_SIGNAL_FUNC (on_link_clicked), mail_display); + gtk_container_add (GTK_CONTAINER (scroll), html); gtk_widget_show (GTK_WIDGET (html)); diff --git a/mail/mail-format.c b/mail/mail-format.c index faea36f633..8f6d4d5d61 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -494,7 +494,9 @@ attachment_header (CamelMimePart *part, const char *mime_type, return; /* Start the table, create the pop-up object. */ - mail_html_write (md->html, md->stream, "
" + mail_html_write (md->html, md->stream, "" + "
" "" "", get_cid (part, md), mime_type); @@ -529,7 +531,7 @@ attachment_header (CamelMimePart *part, const char *mime_type, } #endif - mail_html_write (md->html, md->stream, "
"); + mail_html_write (md->html, md->stream, "
"); } static gboolean diff --git a/mail/message-list.c b/mail/message-list.c index 46e3b772a5..cf81a89a40 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2332,6 +2332,7 @@ static void hide_save_state(MessageList *ml) fclose(out); } + g_free (filename); MESSAGE_LIST_UNLOCK(ml, hide_lock); } @@ -2409,7 +2410,7 @@ static void regen_list_regen(struct _mail_msg *mm) if (m->ml->hidden) { for (i=0;ilen;i++) { if (g_hash_table_lookup(m->ml->hidden, uids->pdata[i]) == 0) - g_ptr_array_add(uidnew, uids->pdata[i]); + g_ptr_array_add(uidnew, g_strdup (uids->pdata[i])); } } @@ -2429,13 +2430,14 @@ static void regen_list_regen(struct _mail_msg *mm) start = MAX(start, 0); end = MIN(end, uidnew->len); for (i=start;ipdata[i]); + g_ptr_array_add(uid2, g_strdup (uidnew->pdata[i])); } g_ptr_array_free(uidnew, TRUE); uidnew = uid2; } m->realuids = uids; + m->uids = uidnew; } else { m->realuids = NULL; @@ -2470,16 +2472,21 @@ 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_ptr_array_free(m->uids, TRUE); + 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); */ + } } 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 */ -- cgit