diff options
Diffstat (limited to 'mail/mail-callbacks.c')
| -rw-r--r-- | mail/mail-callbacks.c | 1552 |
1 files changed, 436 insertions, 1116 deletions
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 5570430d1b..026769d005 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -24,7 +24,6 @@ * USA */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -32,6 +31,8 @@ #include <errno.h> #include <time.h> #include <libgnome/gnome-paper.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-dialog-util.h> #include <libgnomeui/gnome-stock.h> #include <libgnome/gnome-paper.h> #include <libgnomeprint/gnome-print-master.h> @@ -41,10 +42,8 @@ #include <gal/e-table/e-table.h> #include <gal/widgets/e-gui-utils.h> #include <gal/widgets/e-unicode.h> -#include <e-util/e-dialog-utils.h> #include <filter/filter-editor.h> #include "mail.h" -#include "folder-browser-window.h" #include "message-browser.h" #include "mail-callbacks.h" #include "mail-config.h" @@ -60,8 +59,6 @@ #include "mail-folder-cache.h" #include "folder-browser.h" #include "subscribe-dialog.h" -#include "message-tag-editor.h" -#include "message-tag-followup.h" #include "e-messagebox.h" #include "Evolution.h" @@ -69,13 +66,59 @@ #include "evolution-shell-client.h" +#ifndef HAVE_MKSTEMP +#include <fcntl.h> +#include <sys/stat.h> +#endif #define FB_WINDOW(fb) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (fb), GTK_TYPE_WINDOW)) +/* These e_gnome_dialog* functions are to handle the brokenness that is gnome-dialog */ +static void +e_gnome_dialog_parent_destroyed (GtkWidget *parent, GtkWidget *dialog) +{ + gnome_dialog_close (GNOME_DIALOG (dialog)); +} + +static void +e_gnome_dialog_set_parent (GnomeDialog *dialog, GtkWindow *parent) +{ + gnome_dialog_set_parent (dialog, parent); + gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", + e_gnome_dialog_parent_destroyed, + dialog, GTK_OBJECT (dialog)); +} + +static GtkWidget * +e_gnome_warning_dialog_parented (const char *warning, GtkWindow *parent) +{ + GtkWidget *dialog; + + dialog = gnome_warning_dialog_parented (warning, parent); + gtk_signal_connect (GTK_OBJECT (parent), "destroy", + e_gnome_dialog_parent_destroyed, dialog); + + return dialog; +} + +static GtkWidget * +e_gnome_ok_cancel_dialog_parented (const char *message, GnomeReplyCallback callback, + gpointer data, GtkWindow *parent) +{ + GtkWidget *dialog; + + dialog = gnome_ok_cancel_dialog_parented (message, callback, data, parent); + gtk_signal_connect (GTK_OBJECT (parent), "destroy", + e_gnome_dialog_parent_destroyed, dialog); + + return dialog; +} + + struct post_send_data { CamelFolder *folder; gchar *uid; - guint32 flags, set; + guint32 flags; }; static void @@ -131,7 +174,7 @@ check_send_configuration (FolderBrowser *fb) /* Check general */ if (!mail_config_is_configured () && !configure_mail (fb)) - return FALSE; + return FALSE; /* Get the default account */ account = mail_config_get_default_account (); @@ -168,6 +211,33 @@ check_send_configuration (FolderBrowser *fb) return TRUE; } +void +send_receive_mail (GtkWidget *widget, gpointer user_data) +{ + FolderBrowser *fb = FOLDER_BROWSER (user_data); + const MailConfigAccount *account; + + if (FOLDER_BROWSER_IS_DESTROYED (fb)) + return; + + if (!mail_config_is_configured () && !configure_mail (fb)) + return; + + account = mail_config_get_default_account (); + if (!account || !account->transport) { + GtkWidget *dialog; + + dialog = gnome_error_dialog_parented (_("You have not set a mail transport method"), + FB_WINDOW (fb)); + gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE); + gtk_widget_show (dialog); + + return; + } + + mail_send_receive (fb->folder); +} + static void msgbox_destroyed (GtkWidget *widget, gpointer data) { @@ -184,7 +254,7 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip gboolean show_again = TRUE; GString *str; GtkWidget *mbox; - int i, button; + gint i, button; if (!mail_config_get_confirm_unwanted_html ()) { g_message ("doesn't want to see confirm html messages!"); @@ -285,13 +355,13 @@ ask_confirm_for_only_bcc (EMsgComposer *composer, gboolean hidden_list_case) if (!mail_config_get_prompt_only_bcc ()) return TRUE; - + /* If the user is mailing a hidden contact list, it is possible for them to create a message with only Bcc recipients without really realizing it. To try to avoid being totally confusing, I've changed this dialog to provide slightly different text in that case, to better explain what the hell is going on. */ - + if (hidden_list_case) { first_text = _("Since the contact list you are sending to " "is configured to hide the list's addresses, " @@ -316,7 +386,7 @@ ask_confirm_for_only_bcc (EMsgComposer *composer, gboolean hidden_list_case) button = gnome_dialog_run_and_close (GNOME_DIALOG (mbox)); mail_config_set_prompt_only_bcc (show_again); - + g_free (message_text); if (button == 0) @@ -350,15 +420,15 @@ composer_sent_cb (char *uri, CamelMimeMessage *message, gboolean sent, void *dat if (sent) { if (send->psd) { camel_folder_set_message_flags (send->psd->folder, send->psd->uid, - send->psd->flags, send->psd->set); + send->psd->flags, send->psd->flags); } gtk_widget_destroy (GTK_WIDGET (send->composer)); } else { e_msg_composer_set_enable_autosave (send->composer, TRUE); gtk_widget_show (GTK_WIDGET (send->composer)); + gtk_object_unref (GTK_OBJECT (send->composer)); } - gtk_object_unref (GTK_OBJECT (send->composer)); g_free (send); camel_object_unref (CAMEL_OBJECT (message)); } @@ -366,51 +436,69 @@ composer_sent_cb (char *uri, CamelMimeMessage *message, gboolean sent, void *dat static CamelMimeMessage * composer_get_message (EMsgComposer *composer) { + static char *recipient_type[] = { + CAMEL_RECIPIENT_TYPE_TO, + CAMEL_RECIPIENT_TYPE_CC, + CAMEL_RECIPIENT_TYPE_BCC + }; + const CamelInternetAddress *iaddr; const MailConfigAccount *account; - CamelMimeMessage *message = NULL; - EDestination **recipients, **recipients_bcc; - char *subject; - int i; - int hidden = 0, shown = 0; - int num = 0, num_bcc = 0; - - /* We should do all of the validity checks based on the composer, and not on - the created message, as extra interaction may occur when we get the message - (e.g. to get a passphrase to sign a message) */ - - /* get the message recipients */ - recipients = e_msg_composer_get_recipients(composer); - - /* see which ones are visible/present, etc */ + CamelMimeMessage *message; + const char *subject; + int num_addrs, i; + EDestination **recipients; + + message = e_msg_composer_get_message (composer); + if (message == NULL) + return NULL; + + recipients = e_msg_composer_get_recipients (composer); + + /* Check for invalid recipients */ if (recipients) { - for (i=0; recipients[i] != NULL;i++) { - const char *addr = e_destination_get_address(recipients[i]); - - if (addr && addr[0]) { - num++; - if (e_destination_is_evolution_list(recipients[i]) - && !e_destination_list_show_addresses(recipients[i])) { - hidden++; - } else { - shown++; + gboolean have_invalid = FALSE; + gchar *msg, *new_msg; + GtkWidget *message_box; + + for (i = 0; recipients[i] && !have_invalid; ++i) { + if (!e_destination_is_valid (recipients[i])) + have_invalid = TRUE; + } + + if (have_invalid) { + msg = g_strdup (_("This message contains invalid recipients:")); + for (i = 0; recipients[i]; ++i) { + if (!e_destination_is_valid (recipients[i])) { + new_msg = g_strdup_printf ("%s\n %s", msg, + e_destination_get_address (recipients[i])); + g_free (msg); + msg = new_msg; } } - } - } - - recipients_bcc = e_msg_composer_get_bcc(composer); - if (recipients_bcc) { - for (i=0; recipients_bcc[i] != NULL;i++) { - const char *addr = e_destination_get_address(recipients_bcc[i]); - if (addr && addr[0]) - num_bcc++; + new_msg = e_utf8_from_locale_string (msg); + g_free (msg); + msg = new_msg; + + message_box = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_WARNING, GNOME_STOCK_BUTTON_OK, NULL); + g_free (msg); + + gnome_dialog_run_and_close (GNOME_DIALOG (message_box)); + + camel_object_unref (CAMEL_OBJECT (message)); + message = NULL; + goto finished; } - e_destination_freev (recipients_bcc); } - + + /* Check for recipients */ + for (num_addrs = 0, i = 0; i < 3; i++) { + iaddr = camel_mime_message_get_recipients (message, recipient_type[i]); + num_addrs += iaddr ? camel_address_length (CAMEL_ADDRESS (iaddr)) : 0; + } + /* I'm sensing a lack of love, er, I mean recipients. */ - if (num == 0) { + if (num_addrs == 0) { GtkWidget *message_box; message_box = gnome_message_box_new (_("You must specify recipients in order to " @@ -420,13 +508,33 @@ composer_get_message (EMsgComposer *composer) NULL); gnome_dialog_run_and_close (GNOME_DIALOG (message_box)); + + camel_object_unref (CAMEL_OBJECT (message)); + message = NULL; goto finished; } - if (num == num_bcc || shown == 0) { - /* this means that the only recipients are Bcc's */ - if (!ask_confirm_for_only_bcc (composer, shown == 0)) + if (iaddr && num_addrs == camel_address_length (CAMEL_ADDRESS (iaddr))) { + /* this means that the only recipients are Bcc's */ + + /* OK, this is an abusive hack. If someone sends a mail with a + hidden contact list on to to: line and no other recipients, + they will unknowingly create a message with only bcc: recipients. + We try to detect this and pass a flag to ask_confirm_for_only_bcc, + so that it can present the user with a dialog whose text has been + modified to reflect this situation. */ + + const gchar *to_header = camel_medium_get_header (CAMEL_MEDIUM (message), CAMEL_RECIPIENT_TYPE_TO); + gboolean hidden_list_case = FALSE; + + if (to_header && !strcmp (to_header, "Undisclosed-Recipient:;")) + hidden_list_case = TRUE; + + if (!ask_confirm_for_only_bcc (composer, hidden_list_case)) { + camel_object_unref (CAMEL_OBJECT (message)); + message = NULL; goto finished; + } } /* Only show this warning if our default is to send html. If it isn't, we've @@ -437,50 +545,44 @@ composer_get_message (EMsgComposer *composer) && mail_config_get_confirm_unwanted_html ()) { gboolean html_problem = FALSE; for (i = 0; recipients[i] != NULL && !html_problem; ++i) { - if (!e_destination_get_html_mail_pref (recipients[i])) + if (! e_destination_get_html_mail_pref (recipients[i])) html_problem = TRUE; } if (html_problem) { - html_problem = !ask_confirm_for_unwanted_html_mail (composer, recipients); - if (html_problem) + html_problem = ! ask_confirm_for_unwanted_html_mail (composer, recipients); + if (html_problem) { + camel_object_unref (CAMEL_OBJECT (message)); + message = NULL; goto finished; + } } } /* Check for no subject */ - subject = e_msg_composer_get_subject(composer); + subject = camel_mime_message_get_subject (message); if (subject == NULL || subject[0] == '\0') { if (!ask_confirm_for_empty_subject (composer)) { - g_free(subject); + camel_object_unref (CAMEL_OBJECT (message)); + message = NULL; goto finished; } } - g_free(subject); - - /* actually get the message now, this will sign/encrypt etc */ - message = e_msg_composer_get_message (composer); - if (message == NULL) - goto finished; /* Add info about the sending account */ account = e_msg_composer_get_preferred_account (composer); - if (account) { camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Account", account->name); camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Transport", account->transport->url); camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc", account->sent_folder_uri); - if (account->id->organization) - camel_medium_set_header (CAMEL_MEDIUM (message), "Organization", account->id->organization); } /* Get the message recipients and 'touch' them, boosting their use scores */ + recipients = e_msg_composer_get_recipients (composer); e_destination_touchv (recipients); finished: - e_destination_freev (recipients); - return message; } @@ -517,17 +619,13 @@ composer_send_cb (EMsgComposer *composer, gpointer data) gtk_object_ref (GTK_OBJECT (composer)); gtk_widget_hide (GTK_WIDGET (composer)); e_msg_composer_set_enable_autosave (composer, FALSE); - mail_send_mail (transport->url, message, composer_sent_cb, send); } static void -append_mail_cleanup (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, - int ok, char *appended_uid, void *data) +append_mail_cleanup (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, void *data) { camel_message_info_free (info); - if (appended_uid) - g_free (appended_uid); } void @@ -541,7 +639,6 @@ composer_postpone_cb (EMsgComposer *composer, gpointer data) message = composer_get_message (composer); if (message == NULL) return; - info = camel_message_info_new (); info->flags = CAMEL_MESSAGE_SEEN; @@ -549,146 +646,27 @@ composer_postpone_cb (EMsgComposer *composer, gpointer data) camel_object_unref (CAMEL_OBJECT (message)); if (psd) - camel_folder_set_message_flags (psd->folder, psd->uid, psd->flags, psd->set); + camel_folder_set_message_flags (psd->folder, psd->uid, psd->flags, psd->flags); gtk_widget_destroy (GTK_WIDGET (composer)); } -struct _save_draft_info { - EMsgComposer *composer; - int quit; -}; - -static void -save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, - char *appended_uid, void *data) -{ - struct _save_draft_info *sdi = data; - char *old_uid; - - if (!ok) - goto done; - - old_uid = gtk_object_get_data (GTK_OBJECT (sdi->composer), "draft_uid"); - if (old_uid) { - /* delete the original draft message */ - camel_folder_set_message_flags (folder, old_uid, - CAMEL_MESSAGE_DELETED, - CAMEL_MESSAGE_DELETED); - } - - if (appended_uid) { - gtk_object_set_data_full (GTK_OBJECT (sdi->composer), - "draft_uid", appended_uid, - (GtkDestroyNotify) g_free); - } else { - gtk_object_set_data (GTK_OBJECT (sdi->composer), - "draft_uid", NULL); - } - - if (sdi->quit) - gtk_widget_destroy (GTK_WIDGET (sdi->composer)); - - done: - gtk_object_unref (GTK_OBJECT (sdi->composer)); - g_free (info); - g_free (sdi); -} - -static void -use_default_drafts_cb (int reply, gpointer data) -{ - extern CamelFolder *drafts_folder; - CamelFolder **folder = data; - - if (reply == 0) { - *folder = drafts_folder; - camel_object_ref (CAMEL_OBJECT (*folder)); - } -} - -static void -save_draft_folder (char *uri, CamelFolder *folder, gpointer data) -{ - CamelFolder **save = data; - - if (folder) { - *save = folder; - camel_object_ref (CAMEL_OBJECT (folder)); - } -} - -void -composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer user_data) -{ - extern char *default_drafts_folder_uri; - extern CamelFolder *drafts_folder; - CamelMimeMessage *msg; - CamelMessageInfo *info; - const MailConfigAccount *account; - struct _save_draft_info *sdi; - CamelFolder *folder = NULL; - - account = e_msg_composer_get_preferred_account (composer); - if (account && account->drafts_folder_uri && - strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { - int id; - - id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); - mail_msg_wait (id); - - if (!folder) { - GtkWidget *dialog; - - dialog = gnome_ok_cancel_dialog_parented (_("Unable to open the drafts folder for this account.\n" - "Would you like to use the default drafts folder?"), - use_default_drafts_cb, &folder, GTK_WINDOW (composer)); - gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); - if (!folder) - return; - } - } else { - folder = drafts_folder; - camel_object_ref (CAMEL_OBJECT (folder)); - } - - msg = e_msg_composer_get_message_draft (composer); - - info = g_new0 (CamelMessageInfo, 1); - info->flags = CAMEL_MESSAGE_DRAFT | CAMEL_MESSAGE_SEEN; - - sdi = g_malloc (sizeof (struct _save_draft_info)); - sdi->composer = composer; - gtk_object_ref (GTK_OBJECT (composer)); - sdi->quit = quit; - - mail_append_mail (folder, msg, info, save_draft_done, sdi); - camel_object_unref (CAMEL_OBJECT (folder)); - camel_object_unref (CAMEL_OBJECT (msg)); -} - static GtkWidget * -create_msg_composer (const MailConfigAccount *account, const char *url) +create_msg_composer (const char *url) { - EMsgComposer *composer; + const MailConfigAccount *account; gboolean send_html; + EMsgComposer *composer; - /* Make sure that we've actually been passed in an account. If one has - * not been passed in, grab the default account. - */ - if (account == NULL) { - account = mail_config_get_default_account (); - } - + account = mail_config_get_default_account (); send_html = mail_config_get_send_html (); - + composer = url ? e_msg_composer_new_from_url (url) : e_msg_composer_new (); if (composer) { e_msg_composer_hdrs_set_from_account (E_MSG_COMPOSER_HDRS (composer->hdrs), account->name); e_msg_composer_set_send_html (composer, send_html); - e_msg_composer_unset_changed (composer); - e_msg_composer_drop_editor_undo (composer); + e_msg_composer_show_sig_file (composer); return GTK_WIDGET (composer); } else return NULL; @@ -697,17 +675,13 @@ create_msg_composer (const MailConfigAccount *account, const char *url) void compose_msg (GtkWidget *widget, gpointer user_data) { - const MailConfigAccount *account; FolderBrowser *fb = FOLDER_BROWSER (user_data); GtkWidget *composer; if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb)) return; - /* Figure out which account we want to initially compose from */ - account = mail_config_get_account_by_source_url (fb->uri); - - composer = create_msg_composer (account, NULL); + composer = create_msg_composer (NULL); if (!composer) return; @@ -715,8 +689,6 @@ compose_msg (GtkWidget *widget, gpointer user_data) GTK_SIGNAL_FUNC (composer_send_cb), NULL); gtk_signal_connect (GTK_OBJECT (composer), "postpone", GTK_SIGNAL_FUNC (composer_postpone_cb), NULL); - gtk_signal_connect (GTK_OBJECT (composer), "save-draft", - GTK_SIGNAL_FUNC (composer_save_draft_cb), NULL); gtk_widget_show (composer); } @@ -732,8 +704,7 @@ send_to_url (const char *url) if (!check_send_configuration (NULL)) return; - /* Tell create_msg_composer to use the default email profile */ - composer = create_msg_composer (NULL, url); + composer = create_msg_composer (url); if (!composer) return; @@ -741,118 +712,102 @@ send_to_url (const char *url) GTK_SIGNAL_FUNC (composer_send_cb), NULL); gtk_signal_connect (GTK_OBJECT (composer), "postpone", GTK_SIGNAL_FUNC (composer_postpone_cb), NULL); - gtk_signal_connect (GTK_OBJECT (composer), "save-draft", - GTK_SIGNAL_FUNC (composer_save_draft_cb), NULL); - + gtk_widget_show (composer); } static GList * list_add_addresses (GList *list, const CamelInternetAddress *cia, const GSList *accounts, - GHashTable *rcpt_hash, const MailConfigAccount **me) + GHashTable *rcpt_hash, const MailConfigAccount **me, + const char *ignore_addr) { - const MailConfigAccount *account; - GHashTable *account_hash; const char *name, *addr; const GSList *l; + gboolean notme; int i; - account_hash = g_hash_table_new (g_strcase_hash, g_strcase_equal); - l = accounts; - while (l) { - account = l->data; - g_hash_table_insert (account_hash, (char *) account->id->address, (void *) account); - l = l->next; - } - for (i = 0; camel_internet_address_get (cia, i, &name, &addr); i++) { - /* Here I'll check to see if the cc:'d address is the address - of the sender, and if so, don't add it to the cc: list; this - is to fix Bugzilla bug #455. */ - account = g_hash_table_lookup (account_hash, addr); - if (account && me && !*me) - *me = account; - - if (!account && !g_hash_table_lookup (rcpt_hash, addr)) { - EDestination *dest; + /* Make sure we don't want to ignore this address */ + if (!ignore_addr || g_strcasecmp (ignore_addr, addr)) { - dest = e_destination_new (); - e_destination_set_name (dest, name); - e_destination_set_email (dest, addr); + /* Here I'll check to see if the cc:'d address is the address + of the sender, and if so, don't add it to the cc: list; this + is to fix Bugzilla bug #455. */ + notme = TRUE; + l = accounts; + while (l) { + const MailConfigAccount *acnt = l->data; + + if (!g_strcasecmp (acnt->id->address, addr)) { + notme = FALSE; + if (me && !*me) + *me = acnt; + break; + } + + l = l->next; + } - list = g_list_append (list, dest); - g_hash_table_insert (rcpt_hash, (char *) addr, GINT_TO_POINTER (1)); - } + if (notme && !g_hash_table_lookup (rcpt_hash, addr)) { + EDestination *dest; + + dest = e_destination_new (); + e_destination_set_name (dest, name); + e_destination_set_email (dest, addr); + + list = g_list_append (list, dest); + g_hash_table_insert (rcpt_hash, (char *) addr, GINT_TO_POINTER (1)); + } + } } - g_hash_table_destroy (account_hash); - return list; } static const MailConfigAccount * guess_me (const CamelInternetAddress *to, const CamelInternetAddress *cc, const GSList *accounts) { - const MailConfigAccount *account; - GHashTable *account_hash; - const char *addr; + const char *name, *addr; const GSList *l; + gboolean notme; + char *full; int i; - /* "optimization" */ - if (!to && !cc) - return NULL; - - account_hash = g_hash_table_new (g_strcase_hash, g_strcase_equal); - l = accounts; - while (l) { - account = l->data; - g_hash_table_insert (account_hash, (char *) account->id->address, (void *) account); - l = l->next; - } - if (to) { - for (i = 0; camel_internet_address_get (to, i, NULL, &addr); i++) { - account = g_hash_table_lookup (account_hash, addr); - if (account) - goto found; + for (i = 0; camel_internet_address_get (to, i, &name, &addr); i++) { + full = camel_internet_address_format_address (name, addr); + l = accounts; + while (l) { + const MailConfigAccount *acnt = l->data; + + if (!g_strcasecmp (acnt->id->address, addr)) { + notme = FALSE; + return acnt; + } + + l = l->next; + } } } if (cc) { - for (i = 0; camel_internet_address_get (cc, i, NULL, &addr); i++) { - account = g_hash_table_lookup (account_hash, addr); - if (account) - goto found; + for (i = 0; camel_internet_address_get (cc, i, &name, &addr); i++) { + full = camel_internet_address_format_address (name, addr); + l = accounts; + while (l) { + const MailConfigAccount *acnt = l->data; + + if (!g_strcasecmp (acnt->id->address, addr)) { + notme = FALSE; + return acnt; + } + + l = l->next; + } } } - account = NULL; - - found: - - g_hash_table_destroy (account_hash); - - return account; -} - -inline static void -mail_ignore (EMsgComposer *composer, const gchar *name, const gchar *address) -{ - e_msg_composer_ignore (composer, name && *name ? name : address); -} - -static void -mail_ignore_address (EMsgComposer *composer, const CamelInternetAddress *addr) -{ - const gchar *name, *address; - gint i, max; - - max = camel_address_length (CAMEL_ADDRESS (addr)); - for (i = 0; i < max; i++) { - camel_internet_address_get (addr, i, &name, &address); - mail_ignore (composer, name, address); - } + return NULL; } static EMsgComposer * @@ -861,36 +816,47 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char const CamelInternetAddress *reply_to, *sender, *to_addrs, *cc_addrs; const char *name = NULL, *address = NULL, *source = NULL; const char *message_id, *references, *reply_addr = NULL; - char *text = NULL, *subject, date_str[100], *format; + char *text, *subject, date_str[100], *format; const MailConfigAccount *me = NULL; const GSList *accounts = NULL; GList *to = NULL, *cc = NULL; EDestination **tov, **ccv; EMsgComposer *composer; - CamelMimePart *part; time_t date; const int max_subject_length = 1024; - composer = e_msg_composer_new (); + composer = e_msg_composer_new (); + e_msg_composer_add_message_attachments (composer, message, TRUE); + if (!composer) return NULL; - e_msg_composer_add_message_attachments (composer, message, TRUE); + sender = camel_mime_message_get_from (message); + if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) { + camel_internet_address_get (sender, 0, &name, &address); + } else { + name = _("an unknown sender"); + } + + date = camel_mime_message_get_date (message, NULL); + + strftime (date_str, sizeof (date_str), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), + localtime (&date)); + format = e_utf8_from_locale_string (date_str); + text = mail_tool_quote_message (message, format, name && *name ? name : address); + g_free (format); + + if (text) { + e_msg_composer_set_body_text (composer, text); + g_free (text); + } /* Set the recipients */ accounts = mail_config_get_accounts (); to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO); cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC); - mail_ignore_address (composer, to_addrs); - mail_ignore_address (composer, cc_addrs); - /* default 'me' to the source account... */ - source = camel_mime_message_get_source (message); - if (source) - me = mail_config_get_account_by_source_url (source); - - determine_recipients: if (mode == REPLY_LIST) { CamelMessageInfo *info; const char *mlist; @@ -900,13 +866,9 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char mlist = camel_message_info_mlist (info); if (mlist) { - EDestination *dest; - /* look through the recipients to find the *real* mailing list address */ len = strlen (mlist); - printf ("we are looking for the mailing list called: %s\n", mlist); - to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO); max = camel_address_length (CAMEL_ADDRESS (to_addrs)); for (i = 0; i < max; i++) { @@ -926,42 +888,28 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char } if (address && i != max) { + EDestination *dest; + dest = e_destination_new (); e_destination_set_name (dest, name); e_destination_set_email (dest, address); to = g_list_append (to, dest); - } else { - /* mailing list address wasn't found */ - if (strchr (mlist, '@')) { - /* mlist string has an @, maybe it's valid? */ - dest = e_destination_new (); - e_destination_set_email (dest, mlist); - - to = g_list_append (to, dest); - } else { - /* give up and just reply to all recipients? */ - mode = REPLY_ALL; - goto determine_recipients; - } } } - if (!me) - me = guess_me (to_addrs, cc_addrs, accounts); + me = guess_me (to_addrs, cc_addrs, accounts); } else { GHashTable *rcpt_hash; - rcpt_hash = g_hash_table_new (g_strcase_hash, g_strcase_equal); + rcpt_hash = g_hash_table_new (g_str_hash, g_str_equal); reply_to = camel_mime_message_get_reply_to (message); if (!reply_to) reply_to = camel_mime_message_get_from (message); if (reply_to) { - int i; - - for (i = 0; camel_internet_address_get (reply_to, i, &name, &reply_addr); i++) { - /* Get the Reply-To address so we can ignore references to it in the Cc: list */ + /* Get the Reply-To address so we can ignore references to it in the Cc: list */ + if (camel_internet_address_get (reply_to, 0, &name, &reply_addr)) { EDestination *dest; dest = e_destination_new (); @@ -969,54 +917,24 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char e_destination_set_email (dest, reply_addr); to = g_list_append (to, dest); g_hash_table_insert (rcpt_hash, (char *) reply_addr, GINT_TO_POINTER (1)); - mail_ignore (composer, name, reply_addr); } } if (mode == REPLY_ALL) { - cc = list_add_addresses (cc, to_addrs, accounts, rcpt_hash, me ? NULL : &me); - cc = list_add_addresses (cc, cc_addrs, accounts, rcpt_hash, me ? NULL : &me); + cc = list_add_addresses (cc, to_addrs, accounts, rcpt_hash, &me, NULL); + cc = list_add_addresses (cc, cc_addrs, accounts, rcpt_hash, me ? NULL : &me, reply_addr); } else { - if (!me) - me = guess_me (to_addrs, cc_addrs, accounts); + me = guess_me (to_addrs, cc_addrs, accounts); } g_hash_table_destroy (rcpt_hash); } - /* set body text here as we want all ignored words to take effect */ - switch (mail_config_get_default_reply_style ()) { - case MAIL_CONFIG_REPLY_DO_NOT_QUOTE: - /* do nothing */ - break; - case MAIL_CONFIG_REPLY_ATTACH: - /* attach the original message as an attachment */ - part = mail_tool_make_message_attachment (message); - e_msg_composer_attach (composer, part); - camel_object_unref (CAMEL_OBJECT (part)); - break; - case MAIL_CONFIG_REPLY_QUOTED: - default: - /* do what any sane user would want when replying... */ - sender = camel_mime_message_get_from (message); - if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) { - camel_internet_address_get (sender, 0, &name, &address); - } else { - name = _("an unknown sender"); - } - - date = camel_mime_message_get_date (message, NULL); - strftime (date_str, sizeof (date_str), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"), - localtime (&date)); - format = e_utf8_from_locale_string (date_str); - text = mail_tool_quote_message (message, format, name && *name ? name : address); - mail_ignore (composer, name, address); - g_free (format); - if (text) { - e_msg_composer_set_body_text (composer, text); - g_free (text); - } - break; + if (me == NULL) { + /* as a last resort, set the replying account (aka me) + to the account this was fetched from */ + source = camel_mime_message_get_source (message); + me = mail_config_get_account_by_source_url (source); } /* Set the subject of the new message. */ @@ -1076,8 +994,6 @@ mail_generate_reply (CamelFolder *folder, CamelMimeMessage *message, const char e_msg_composer_add_header (composer, "References", references); } - e_msg_composer_drop_editor_undo (composer); - return composer; } @@ -1086,8 +1002,7 @@ requeue_mail_reply (CamelFolder *folder, char *uid, CamelMimeMessage *msg, void { int mode = GPOINTER_TO_INT (data); - if (msg != NULL) - mail_reply (folder, msg, uid, mode); + mail_reply (folder, msg, uid, mode); } void @@ -1109,8 +1024,7 @@ mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, int mod psd->folder = folder; camel_object_ref (CAMEL_OBJECT (psd->folder)); psd->uid = g_strdup (uid); - psd->flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN; - psd->set = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN; + psd->flags = CAMEL_MESSAGE_ANSWERED; composer = mail_generate_reply (folder, msg, uid, mode); if (!composer) @@ -1120,8 +1034,6 @@ mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, int mod GTK_SIGNAL_FUNC (composer_send_cb), psd); gtk_signal_connect (GTK_OBJECT (composer), "postpone", GTK_SIGNAL_FUNC (composer_postpone_cb), psd); - gtk_signal_connect (GTK_OBJECT (composer), "save-draft", - GTK_SIGNAL_FUNC (composer_save_draft_cb), NULL); gtk_signal_connect (GTK_OBJECT (composer), "destroy", GTK_SIGNAL_FUNC (free_psd), psd); @@ -1134,10 +1046,13 @@ reply_to_sender (GtkWidget *widget, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); + /* FIXME: make this always load the message based on cursor */ + if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb)) return; - mail_reply(fb->folder, NULL, fb->message_list->cursor_uid, REPLY_SENDER); + mail_reply (fb->folder, fb->mail_display->current_message, + fb->message_list->cursor_uid, REPLY_SENDER); } void @@ -1148,7 +1063,10 @@ reply_to_list (GtkWidget *widget, gpointer user_data) if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb)) return; - mail_reply (fb->folder, NULL, fb->message_list->cursor_uid, REPLY_LIST); + /* FIXME: make this always load the message based on cursor */ + + mail_reply (fb->folder, fb->mail_display->current_message, + fb->message_list->cursor_uid, REPLY_LIST); } void @@ -1159,7 +1077,10 @@ reply_to_all (GtkWidget *widget, gpointer user_data) if (FOLDER_BROWSER_IS_DESTROYED (fb) || !check_send_configuration (fb)) return; - mail_reply(fb->folder, NULL, fb->message_list->cursor_uid, REPLY_ALL); + /* FIXME: make this always load the message based on cursor */ + + mail_reply (fb->folder, fb->mail_display->current_message, + fb->message_list->cursor_uid, REPLY_ALL); } void @@ -1204,8 +1125,6 @@ forward_get_composer (CamelMimeMessage *message, const char *subject) GTK_SIGNAL_FUNC (composer_send_cb), NULL); gtk_signal_connect (GTK_OBJECT (composer), "postpone", GTK_SIGNAL_FUNC (composer_postpone_cb), NULL); - gtk_signal_connect (GTK_OBJECT (composer), "save-draft", - GTK_SIGNAL_FUNC (composer_save_draft_cb), NULL); e_msg_composer_set_headers (composer, account->name, NULL, NULL, NULL, subject); } else { g_warning ("Could not create composer"); @@ -1232,6 +1151,7 @@ do_forward_non_attached (CamelFolder *folder, char *uid, CamelMimeMessage *messa CamelDataWrapper *wrapper; e_msg_composer_set_body_text (composer, text); + e_msg_composer_show_sig_file (composer); wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message)); if (CAMEL_IS_MULTIPART (wrapper)) @@ -1239,7 +1159,6 @@ do_forward_non_attached (CamelFolder *folder, char *uid, CamelMimeMessage *messa gtk_widget_show (GTK_WIDGET (composer)); e_msg_composer_unset_changed (composer); - e_msg_composer_drop_editor_undo (composer); } g_free (text); } @@ -1250,27 +1169,21 @@ do_forward_non_attached (CamelFolder *folder, char *uid, CamelMimeMessage *messa static void forward_message (FolderBrowser *fb, MailConfigForwardStyle style) { - GPtrArray *uids; - int i; - if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; if (!check_send_configuration (fb)) return; - uids = g_ptr_array_new (); - message_list_foreach (fb->message_list, enumerate_msg, uids); - - for (i = 0; i < uids->len; i++) { - mail_get_message (fb->folder, uids->pdata[i], - do_forward_non_attached, - GINT_TO_POINTER (style), + if (fb->mail_display && fb->mail_display->current_message) { + do_forward_non_attached (fb->folder, NULL, + fb->mail_display->current_message, + GINT_TO_POINTER (style)); + } else { + mail_get_message (fb->folder, fb->message_list->cursor_uid, + do_forward_non_attached, GINT_TO_POINTER (style), mail_thread_new); - g_free (uids->pdata[i]); } - - g_ptr_array_free (uids, TRUE); } void @@ -1296,7 +1209,6 @@ do_forward_attach (CamelFolder *folder, GPtrArray *messages, CamelMimePart *part e_msg_composer_attach (composer, part); gtk_widget_show (GTK_WIDGET (composer)); e_msg_composer_unset_changed (composer); - e_msg_composer_drop_editor_undo (composer); } } } @@ -1327,96 +1239,6 @@ forward (GtkWidget *widget, gpointer user_data) forward_message (user_data, style); } -static EMsgComposer * -redirect_get_composer (CamelMimeMessage *message) -{ - const MailConfigAccount *account = NULL; - const CamelInternetAddress *to_addrs, *cc_addrs; - const GSList *accounts = NULL; - EMsgComposer *composer; - - g_return_val_if_fail (message != NULL, NULL); - - accounts = mail_config_get_accounts (); - to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO); - cc_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC); - - account = guess_me (to_addrs, cc_addrs, accounts); - - if (!account) { - const char *source; - - source = camel_mime_message_get_source (message); - account = mail_config_get_account_by_source_url (source); - } - - if (!account) - account = mail_config_get_default_account (); - - /* QMail will refuse to send a message if it finds one of - it's Delivered-To headers in the message, so remove all - Delivered-To headers. Fixes bug #23635. */ - while (camel_medium_get_header (CAMEL_MEDIUM (message), "Delivered-To")) - camel_medium_remove_header (CAMEL_MEDIUM (message), "Delivered-To"); - - composer = e_msg_composer_new_redirect (message, account->name); - if (composer) { - gtk_signal_connect (GTK_OBJECT (composer), "send", - GTK_SIGNAL_FUNC (composer_send_cb), NULL); - gtk_signal_connect (GTK_OBJECT (composer), "postpone", - GTK_SIGNAL_FUNC (composer_postpone_cb), NULL); - gtk_signal_connect (GTK_OBJECT (composer), "save-draft", - GTK_SIGNAL_FUNC (composer_save_draft_cb), NULL); - } else { - g_warning ("Could not create composer"); - } - - return composer; -} - -static void -do_redirect (CamelFolder *folder, char *uid, CamelMimeMessage *message, void *data) -{ - EMsgComposer *composer; - - if (!message) - return; - - composer = redirect_get_composer (message); - if (composer) { - CamelDataWrapper *wrapper; - - wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message)); - if (CAMEL_IS_MULTIPART (wrapper)) - e_msg_composer_add_message_attachments (composer, message, FALSE); - - gtk_widget_show (GTK_WIDGET (composer)); - e_msg_composer_unset_changed (composer); - e_msg_composer_drop_editor_undo (composer); - } -} - -void -redirect (GtkWidget *widget, gpointer user_data) -{ - FolderBrowser *fb = (FolderBrowser *) user_data; - - if (FOLDER_BROWSER_IS_DESTROYED (fb)) - return; - - if (!check_send_configuration (fb)) - return; - - if (fb->mail_display && fb->mail_display->current_message) { - do_redirect (fb->folder, NULL, - fb->mail_display->current_message, - NULL); - } else { - mail_get_message (fb->folder, fb->message_list->cursor_uid, - do_redirect, NULL, mail_thread_new); - } -} - static void transfer_msg_done (gboolean ok, void *data) { @@ -1431,10 +1253,10 @@ transfer_msg_done (gboolean ok, void *data) are hidden, select the previous */ if ((row + 1 == e_tree_row_count (fb->message_list->tree)) && mail_config_get_hide_deleted ()) - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS, + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_PREVIOUS, 0, CAMEL_MESSAGE_DELETED, FALSE); else - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE); } @@ -1444,35 +1266,38 @@ transfer_msg_done (gboolean ok, void *data) static void transfer_msg (FolderBrowser *fb, gboolean delete_from_source) { - static const char *allowed_types[] = { "mail", "vtrash", NULL }; + const char *allowed_types[] = { "mail", "vtrash", NULL }; extern EvolutionShellClient *global_shell_client; - GNOME_Evolution_Folder *folder; - static char *last_uri = NULL; + char *uri, *physical, *path, *desc; + static char *last = NULL; GPtrArray *uids; - char *desc; if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - if (last_uri == NULL) - last_uri = g_strdup (""); + if (last == NULL) + last = g_strdup (""); if (delete_from_source) desc = _("Move message(s) to"); else desc = _("Copy message(s) to"); + uri = NULL; + physical = NULL; evolution_shell_client_user_select_folder (global_shell_client, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (fb))), - desc, last_uri, allowed_types, - &folder); - if (!folder) + desc, last, + allowed_types, &uri, &physical); + if (!uri) return; - if (strcmp (last_uri, folder->evolutionUri) != 0) { - g_free (last_uri); - last_uri = g_strdup (folder->evolutionUri); + path = strchr (uri, '/'); + if (path && strcmp (last, path) != 0) { + g_free (last); + last = g_strdup_printf ("evolution:%s", path); } + g_free (uri); uids = g_ptr_array_new (); message_list_foreach (fb->message_list, enumerate_msg, uids); @@ -1480,13 +1305,12 @@ transfer_msg (FolderBrowser *fb, gboolean delete_from_source) if (delete_from_source) { gtk_object_ref (GTK_OBJECT (fb)); mail_transfer_messages (fb->folder, uids, delete_from_source, - folder->physicalUri, 0, - transfer_msg_done, fb); + physical, 0, transfer_msg_done, fb); } else { mail_transfer_messages (fb->folder, uids, delete_from_source, - folder->physicalUri, 0, NULL, NULL); + physical, 0, NULL, NULL); } - CORBA_free (folder); + g_free(physical); } void @@ -1555,26 +1379,27 @@ void addrbook_sender (GtkWidget *widget, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); - const char *addr_str; - CamelMessageInfo *info; + CamelMimeMessage *msg = NULL; + const CamelInternetAddress *addr; + gchar *addr_str; GtkWidget *win; GtkWidget *control; GtkWidget *socket; - GPtrArray *uids; - int i; - + + /* FIXME: make this use the cursor message id */ + if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - - uids = g_ptr_array_new(); - message_list_foreach(fb->message_list, enumerate_msg, uids); - if (uids->len != 1) - goto done; - - info = camel_folder_get_message_info(fb->folder, uids->pdata[0]); - if (info == NULL - || (addr_str = camel_message_info_from(info)) == NULL) - goto done; + + msg = fb->mail_display->current_message; + if (msg == NULL) + return; + + addr = camel_mime_message_get_from (msg); + if (addr == NULL) + return; + + addr_str = camel_address_format (CAMEL_ADDRESS (addr)); win = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (win), _("Sender")); @@ -1596,11 +1421,6 @@ addrbook_sender (GtkWidget *widget, gpointer user_data) gtk_container_add (GTK_CONTAINER (win), control); gtk_widget_show_all (win); - -done: - for (i=0; i < uids->len; i++) - g_free(uids->pdata[i]); - g_ptr_array_free(uids, TRUE); } void @@ -1633,13 +1453,9 @@ select_all (BonoboUIComponent *uih, void *user_data, const char *path) if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - if (GTK_WIDGET_HAS_FOCUS (fb->mail_display->html)) { - gtk_html_select_all (fb->mail_display->html); - } else { - etsm = e_tree_get_selection_model (fb->message_list->tree); - - e_selection_model_select_all (etsm); - } + etsm = e_tree_get_selection_model (fb->message_list->tree); + + e_selection_model_select_all (etsm); } /* Thread selection */ @@ -1664,7 +1480,7 @@ thread_select_foreach (ETreePath path, gpointer user_data) thread_select_info_t *tsi = (thread_select_info_t *) user_data; ETreeModel *tm = tsi->ml->model; ETreePath node; - + /* @path part of the initial selection. If it has children, * we select them as well. If it doesn't, we select its siblings and * their children (ie, the current node must be inside the thread @@ -1723,11 +1539,9 @@ invert_selection (BonoboUIComponent *uih, void *user_data, const char *path) if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - if (GTK_WIDGET_HAS_FOCUS (fb->message_list)) { - etsm = e_tree_get_selection_model (fb->message_list->tree); - - e_selection_model_invert_selection (etsm); - } + etsm = e_tree_get_selection_model (fb->message_list->tree); + + e_selection_model_invert_selection (etsm); } /* flag all selected messages. Return number flagged */ @@ -1769,24 +1583,18 @@ toggle_flags (FolderBrowser *fb, guint32 mask) message_list_foreach (fb->message_list, enumerate_msg, uids); camel_folder_freeze (fb->folder); for (i = 0; i < uids->len; i++) { - guint32 flags; + int flags; - flags = ~(camel_folder_get_message_flags (fb->folder, uids->pdata[i])); - - /* if we're flagging a message important, always undelete it too */ - if (mask & flags & CAMEL_MESSAGE_FLAGGED) { - flags &= ~CAMEL_MESSAGE_DELETED; - mask |= CAMEL_MESSAGE_DELETED; - } - - /* if we're flagging a message deleted, always mark it seen too */ - if (mask & flags & CAMEL_MESSAGE_DELETED) { - flags |= CAMEL_MESSAGE_SEEN; - mask |= CAMEL_MESSAGE_SEEN; + flags = camel_folder_get_message_flags (fb->folder, uids->pdata[i]); + + if (flags & mask) + camel_folder_set_message_flags (fb->folder, uids->pdata[i], mask, 0); + else { + if ((mask & CAMEL_MESSAGE_FLAGGED) && (flags & CAMEL_MESSAGE_DELETED)) + camel_folder_set_message_flags (fb->folder, uids->pdata[i], CAMEL_MESSAGE_DELETED, 0); + camel_folder_set_message_flags (fb->folder, uids->pdata[i], mask, mask); } - - camel_folder_set_message_flags (fb->folder, uids->pdata[i], mask, flags); - + g_free (uids->pdata[i]); } camel_folder_thaw (fb->folder); @@ -1840,7 +1648,8 @@ mark_all_as_seen (BonoboUIComponent *uih, void *user_data, const char *path) void mark_as_important (BonoboUIComponent *uih, void *user_data, const char *path) { - flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED|CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_FLAGGED); + flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_DELETED, 0); + flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED); } void @@ -1855,170 +1664,6 @@ toggle_as_important (BonoboUIComponent *uih, void *user_data, const char *path) toggle_flags (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_FLAGGED); } - -struct _tag_editor_data { - MessageTagEditor *editor; - FolderBrowser *fb; - GPtrArray *uids; -}; - -static void -tag_editor_ok (GtkWidget *button, gpointer user_data) -{ - struct _tag_editor_data *data = user_data; - const char *name, *value; - int i; - - if (FOLDER_BROWSER_IS_DESTROYED (data->fb)) - goto done; - - name = message_tag_editor_get_name (data->editor); - if (!name) - goto done; - - value = message_tag_editor_get_value (data->editor); - - camel_folder_freeze (data->fb->folder); - for (i = 0; i < data->uids->len; i++) { - camel_folder_set_message_user_tag (data->fb->folder, data->uids->pdata[i], name, value); - } - camel_folder_thaw (data->fb->folder); - - done: - gtk_widget_destroy (GTK_WIDGET (data->editor)); -} - -static void -tag_editor_cancel (GtkWidget *button, gpointer user_data) -{ - struct _tag_editor_data *data = user_data; - - gtk_widget_destroy (GTK_WIDGET (data->editor)); -} - -static void -tag_editor_destroy (GnomeDialog *dialog, gpointer user_data) -{ - struct _tag_editor_data *data = user_data; - - gtk_object_unref (GTK_OBJECT (data->fb)); - g_ptr_array_free (data->uids, TRUE); - g_free (data); -} - -void -flag_for_followup (BonoboUIComponent *uih, void *user_data, const char *path) -{ - FolderBrowser *fb = FOLDER_BROWSER (user_data); - struct _tag_editor_data *data; - GtkWidget *editor; - GPtrArray *uids; - int i; - - if (FOLDER_BROWSER_IS_DESTROYED (fb)) - return; - - uids = g_ptr_array_new (); - message_list_foreach (fb->message_list, enumerate_msg, uids); - - editor = (GtkWidget *) message_tag_followup_new (); - - data = g_new (struct _tag_editor_data, 1); - data->editor = MESSAGE_TAG_EDITOR (editor); - gtk_widget_ref (GTK_WIDGET (fb)); - data->fb = fb; - data->uids = uids; - - for (i = 0; i < uids->len; i++) { - CamelMessageInfo *info; - - info = camel_folder_get_message_info (fb->folder, uids->pdata[i]); - message_tag_followup_append_message (MESSAGE_TAG_FOLLOWUP (editor), - camel_message_info_from (info), - camel_message_info_subject (info)); - } - - gnome_dialog_button_connect (GNOME_DIALOG (editor), 0, tag_editor_ok, data); - gnome_dialog_button_connect (GNOME_DIALOG (editor), 1, tag_editor_cancel, data); - gnome_dialog_set_close (GNOME_DIALOG (editor), TRUE); - - /* special-case... */ - if (uids->len == 1) { - const char *tag_value; - - tag_value = camel_folder_get_message_user_tag (fb->folder, uids->pdata[0], "follow-up"); - if (tag_value) - message_tag_editor_set_value (MESSAGE_TAG_EDITOR (editor), tag_value); - } - - gtk_signal_connect (GTK_OBJECT (editor), "destroy", - tag_editor_destroy, data); - - gtk_widget_show (editor); -} - -void -flag_followup_completed (BonoboUIComponent *uih, void *user_data, const char *path) -{ - FolderBrowser *fb = FOLDER_BROWSER (user_data); - GPtrArray *uids; - time_t now; - int i; - - if (FOLDER_BROWSER_IS_DESTROYED (fb)) - return; - - uids = g_ptr_array_new (); - message_list_foreach (fb->message_list, enumerate_msg, uids); - - now = time (NULL); - - camel_folder_freeze (fb->folder); - for (i = 0; i < uids->len; i++) { - struct _FollowUpTag *tag; - const char *tag_value; - char *value; - - tag_value = camel_folder_get_message_user_tag (fb->folder, uids->pdata[i], "follow-up"); - if (!tag_value) - continue; - - tag = message_tag_followup_decode (tag_value); - tag->completed = now; - - value = message_tag_followup_encode (tag); - g_free (tag); - - camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "follow-up", value); - g_free (value); - } - camel_folder_thaw (fb->folder); - - g_ptr_array_free (uids, TRUE); -} - -void -flag_followup_clear (BonoboUIComponent *uih, void *user_data, const char *path) -{ - FolderBrowser *fb = FOLDER_BROWSER (user_data); - GPtrArray *uids; - int i; - - if (FOLDER_BROWSER_IS_DESTROYED (fb)) - return; - - uids = g_ptr_array_new (); - message_list_foreach (fb->message_list, enumerate_msg, uids); - - camel_folder_freeze (fb->folder); - for (i = 0; i < uids->len; i++) { - camel_folder_set_message_user_tag (fb->folder, uids->pdata[i], "follow-up", NULL); - } - camel_folder_thaw (fb->folder); - - g_ptr_array_free (uids, TRUE); -} - void zoom_in (BonoboUIComponent *uih, void *user_data, const char *path) { @@ -2063,8 +1708,10 @@ do_edit_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, voi for (i = 0; i < messages->len; i++) { EMsgComposer *composer; - char *uid; + XEvolution *hdrs; + hdrs = mail_tool_remove_xevolution_headers (messages->pdata[i]); + mail_tool_destroy_xevolution (hdrs); camel_medium_remove_header (CAMEL_MEDIUM (messages->pdata[i]), "X-Mailer"); composer = e_msg_composer_new_with_message (messages->pdata[i]); @@ -2075,12 +1722,6 @@ do_edit_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, voi gtk_signal_connect (GTK_OBJECT (composer), "postpone", composer_postpone_cb, NULL); - uid = g_strdup (uids->pdata[i]); - gtk_object_set_data_full (GTK_OBJECT (composer), "draft_uid", uid, (GtkDestroyNotify) g_free); - - gtk_signal_connect (GTK_OBJECT (composer), "save-draft", - composer_save_draft_cb, NULL); - gtk_widget_show (GTK_WIDGET (composer)); } } @@ -2339,12 +1980,6 @@ save_msg (GtkWidget *widget, gpointer user_data) } void -colour_msg (GtkWidget *widget, gpointer user_data) -{ - /* FIXME: implement me? */ -} - -void delete_msg (GtkWidget *button, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); @@ -2352,8 +1987,6 @@ delete_msg (GtkWidget *button, gpointer user_data) if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - if (!(fb->folder->permanent_flags & CAMEL_MESSAGE_DELETED)) - return; deleted = flag_messages (fb, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN); @@ -2367,10 +2000,10 @@ delete_msg (GtkWidget *button, gpointer user_data) are hidden, select the previous */ if ((row+1 == e_tree_row_count (fb->message_list->tree)) && mail_config_get_hide_deleted ()) - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS, + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_PREVIOUS, 0, CAMEL_MESSAGE_DELETED, FALSE); else - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE); } } @@ -2381,212 +2014,58 @@ undelete_msg (GtkWidget *button, gpointer user_data) flag_messages (FOLDER_BROWSER (user_data), CAMEL_MESSAGE_DELETED, 0); } - -#if 0 -static gboolean -confirm_goto_next_folder (FolderBrowser *fb) -{ - GtkWidget *dialog, *label, *checkbox; - int button; - - if (!mail_config_get_confirm_goto_next_folder ()) - return mail_config_get_goto_next_folder (); - - dialog = gnome_dialog_new (_("Go to next folder with unread messages?"), - GNOME_STOCK_BUTTON_YES, - GNOME_STOCK_BUTTON_NO, - NULL); - - e_gnome_dialog_set_parent (GNOME_DIALOG (dialog), FB_WINDOW (fb)); - - label = gtk_label_new (_("There are no more new messages in this folder.\n" - "Would you like to go to the next folder?")); - - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 4); - - checkbox = gtk_check_button_new_with_label (_("Do not ask me again.")); - gtk_object_ref (GTK_OBJECT (checkbox)); - gtk_widget_show (checkbox); - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), checkbox, TRUE, TRUE, 4); - - button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox))) - mail_config_set_confirm_goto_next_folder (FALSE); - - gtk_object_unref (GTK_OBJECT (checkbox)); - - if (button == 0) { - mail_config_set_goto_next_folder (TRUE); - return TRUE; - } else { - mail_config_set_goto_next_folder (FALSE); - return FALSE; - } -} - -static CamelFolderInfo * -find_current_folder (CamelFolderInfo *root, const char *current_uri) -{ - CamelFolderInfo *node, *current = NULL; - - node = root; - while (node) { - if (!strcmp (current_uri, node->url)) { - current = node; - break; - } - - current = find_current_folder (node->child, current_uri); - if (current) - break; - - node = node->sibling; - } - - return current; -} - -static CamelFolderInfo * -find_next_folder_r (CamelFolderInfo *node) -{ - CamelFolderInfo *next; - - while (node) { - if (node->unread_message_count > 0) - return node; - - next = find_next_folder_r (node->child); - if (next) - return next; - - node = node->sibling; - } - - return NULL; -} - -static CamelFolderInfo * -find_next_folder (CamelFolderInfo *current) -{ - CamelFolderInfo *next; - - /* first search subfolders... */ - next = find_next_folder_r (current->child); - if (next) - return next; - - /* now search siblings... */ - next = find_next_folder_r (current->sibling); - if (next) - return next; - - /* now go up one level (if we can) and search... */ - if (current->parent && current->parent->sibling) { - return find_next_folder_r (current->parent->sibling); - } else { - return NULL; - } -} - -static void -do_evil_kludgy_goto_next_folder_hack (FolderBrowser *fb) -{ - CamelFolderInfo *root, *current, *node; - CORBA_Environment ev; - CamelStore *store; - - store = camel_folder_get_parent_store (fb->folder); - - /* FIXME: loop over all available mail stores? */ - - root = camel_store_get_folder_info (store, "", CAMEL_STORE_FOLDER_INFO_RECURSIVE | - CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL); - - if (!root) - return; - - current = find_current_folder (root, fb->uri); - g_assert (current != NULL); - - node = find_next_folder (current); - if (node) { - g_warning ("doin' my thang..."); - CORBA_exception_init (&ev); - GNOME_Evolution_ShellView_changeCurrentView (fb->shell_view, "evolution:/local/Inbox", &ev); - if (ev._major != CORBA_NO_EXCEPTION) - g_warning ("got an exception"); - CORBA_exception_free (&ev); - } else { - g_warning ("can't find a folder with unread mail?"); - } - - camel_store_free_folder_info (store, root); -} -#endif - void next_msg (GtkWidget *button, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); + int row; if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE); + row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree)); + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT, 0, 0, FALSE); } void next_unread_msg (GtkWidget *button, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); + int row; if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - if (!message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN, TRUE)) { -#if 0 - if (confirm_goto_next_folder (fb)) - do_evil_kludgy_goto_next_folder_hack (fb); -#endif - } + row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree)); + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT, + 0, CAMEL_MESSAGE_SEEN, TRUE); } void next_flagged_msg (GtkWidget *button, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); + int row; if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_NEXT, + row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree)); + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_NEXT, CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED, FALSE); } void -next_thread (GtkWidget *button, gpointer user_data) -{ - FolderBrowser *fb = FOLDER_BROWSER (user_data); - - if (FOLDER_BROWSER_IS_DESTROYED (fb)) - return; - - message_list_select_next_thread (fb->message_list); -} - -void previous_msg (GtkWidget *button, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); + int row; if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS, + row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree)); + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_PREVIOUS, 0, 0, FALSE); } @@ -2594,11 +2073,13 @@ void previous_unread_msg (GtkWidget *button, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); + int row; if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS, + row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree)); + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_PREVIOUS, 0, CAMEL_MESSAGE_SEEN, TRUE); } @@ -2606,24 +2087,34 @@ void previous_flagged_msg (GtkWidget *button, gpointer user_data) { FolderBrowser *fb = FOLDER_BROWSER (user_data); + int row; if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - message_list_select (fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS, + row = e_tree_row_of_node (fb->message_list->tree, e_tree_get_cursor (fb->message_list->tree)); + message_list_select (fb->message_list, row, MESSAGE_LIST_SELECT_PREVIOUS, CAMEL_MESSAGE_FLAGGED, CAMEL_MESSAGE_FLAGGED, TRUE); } +struct _expunged_folder_data { + FolderBrowser *fb; + gboolean hidedeleted; +}; + static void expunged_folder (CamelFolder *f, void *data) { - FolderBrowser *fb = data; + FolderBrowser *fb = ((struct _expunged_folder_data *) data)->fb; + gboolean hidedeleted = ((struct _expunged_folder_data *) data)->hidedeleted; if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; fb->expunging = NULL; - gtk_widget_set_sensitive (GTK_WIDGET (fb->message_list), TRUE); + message_list_set_hidedeleted (fb->message_list, hidedeleted); + + g_free (data); } static gboolean @@ -2654,9 +2145,6 @@ confirm_expunge (FolderBrowser *fb) gtk_widget_show (checkbox); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), checkbox, TRUE, TRUE, 4); - /* Set the 'No' button as the default */ - gnome_dialog_set_default (GNOME_DIALOG (dialog), 1); - button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog)); if (button == 0 && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox))) @@ -2679,10 +2167,15 @@ expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path) return; if (fb->folder && (fb->expunging == NULL || fb->folder != fb->expunging) && confirm_expunge (fb)) { + struct _expunged_folder_data *data; CamelMessageInfo *info; + data = g_malloc (sizeof (*data)); + data->fb = fb; + data->hidedeleted = fb->message_list->hidedeleted; + /* hide the deleted messages so user can't click on them while we expunge */ - gtk_widget_set_sensitive (GTK_WIDGET (fb->message_list), FALSE); + message_list_set_hidedeleted (fb->message_list, TRUE); /* Only blank the mail display if the message being viewed is one of those to be expunged */ @@ -2690,11 +2183,11 @@ expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path) info = camel_folder_get_message_info (fb->folder, fb->loaded_uid); if (!info || info->flags & CAMEL_MESSAGE_DELETED) - mail_display_set_message (fb->mail_display, NULL, NULL); + mail_display_set_message (fb->mail_display, NULL); } fb->expunging = fb->folder; - mail_expunge_folder (fb->folder, expunged_folder, fb); + mail_expunge_folder (fb->folder, expunged_folder, data); } } @@ -2784,84 +2277,52 @@ vfolder_edit_vfolders (BonoboUIComponent *uih, void *user_data, const char *path } -/* static void -header_print_cb (GtkHTML *html, GnomePrintContext *print_context, - double x, double y, double width, double height, gpointer user_data) -{ - printf ("header_print_cb %f,%f x %f,%f\n", x, y, width, height); - - gnome_print_newpath (print_context); - gnome_print_setlinewidth (print_context, 12.0); - gnome_print_setrgbcolor (print_context, 1.0, 0.0, 0.0); - gnome_print_moveto (print_context, x, y); - gnome_print_lineto (print_context, x+width, y-height); - gnome_print_strokepath (print_context); -} */ - -struct footer_info { - GnomeFont *local_font; - gint page_num, pages; -}; - -static void -footer_print_cb (GtkHTML *html, GnomePrintContext *print_context, - double x, double y, double width, double height, gpointer user_data) -{ - struct footer_info *info = (struct footer_info *) user_data; - - if (info->local_font) { - gchar *text = g_strdup_printf (_("Page %d of %d"), info->page_num, info->pages); - gdouble tw = gnome_font_get_width_string (info->local_font, text); - - gnome_print_newpath (print_context); - gnome_print_setrgbcolor (print_context, .0, .0, .0); - gnome_print_moveto (print_context, x + width - tw, y - gnome_font_get_ascender (info->local_font)); - gnome_print_setfont (print_context, info->local_font); - gnome_print_show (print_context, text); - - g_free (text); - info->page_num++; - } -} +static MailAccountsDialog *accounts_dialog = NULL; static void -footer_info_free (struct footer_info *info) +accounts_dialog_close (GtkWidget *widget, gpointer user_data) { - if (info->local_font) - gnome_font_unref (info->local_font); - g_free (info); + accounts_dialog = NULL; } -static struct footer_info * -footer_info_new (GtkHTML *html, GnomePrintContext *pc, gdouble *line) +void +providers_config (BonoboUIComponent *uih, void *user_data, const char *path) { - struct footer_info *info; - - info = g_new (struct footer_info, 1); - info->local_font = gnome_font_new_closest ("Helvetica", GNOME_FONT_BOOK, FALSE, 10); - if (info->local_font) { - *line = gnome_font_get_ascender (info->local_font) + gnome_font_get_descender (info->local_font); + FolderBrowser *fb = FOLDER_BROWSER (user_data); + + if (FOLDER_BROWSER_IS_DESTROYED (fb)) + return; + + if (!accounts_dialog) { + accounts_dialog = mail_accounts_dialog_new (fb->shell); + gtk_widget_set_parent_window (GTK_WIDGET (accounts_dialog), + GTK_WIDGET (FB_WINDOW (fb))->window); + gtk_signal_connect (GTK_OBJECT (accounts_dialog), "destroy", + accounts_dialog_close, NULL); + gnome_dialog_set_close (GNOME_DIALOG (accounts_dialog), TRUE); + gtk_widget_show (GTK_WIDGET (accounts_dialog)); + } else { + gdk_window_raise (GTK_WIDGET (accounts_dialog)->window); + gtk_widget_grab_focus (GTK_WIDGET (accounts_dialog)); } - info->page_num = 1; - info->pages = gtk_html_print_get_pages_num (html, pc, 0.0, *line); - - return info; } +/* + * FIXME: This routine could be made generic, by having a closure + * function plus data, and having the whole process be taken care + * of for you + */ static void do_mail_print (FolderBrowser *fb, gboolean preview) { - GtkHTML *html; GnomePrintContext *print_context; GnomePrintMaster *print_master; GnomePrintDialog *dialog; GnomePrinter *printer = NULL; GnomePaper *paper; - gdouble line = 0.0; int copies = 1; int collate = FALSE; - struct footer_info *info; - + if (!preview) { dialog = GNOME_PRINT_DIALOG (gnome_print_dialog_new (_("Print Message"), GNOME_PRINT_DIALOG_COPIES)); @@ -2890,31 +2351,14 @@ do_mail_print (FolderBrowser *fb, gboolean preview) if (printer) gnome_print_master_set_printer (print_master, printer); - paper = (GnomePaper *) gnome_paper_with_name (_("US-Letter")); - + paper = gnome_paper_with_name (_("US-Letter")); if (!paper) - paper = (GnomePaper *) gnome_paper_with_name (gnome_paper_name_default ()); + paper = gnome_paper_with_name (gnome_paper_name_default ()); gnome_print_master_set_paper (print_master, paper); gnome_print_master_set_copies (print_master, copies, collate); print_context = gnome_print_master_get_context (print_master); - - html = GTK_HTML (gtk_html_new ()); - mail_display_initialize_gtkhtml (fb->mail_display, html); - - /* Set our 'printing' flag to true and render. This causes us - to ignoring any adjustments we made to accomodate the - user's theme. */ - fb->mail_display->printing = TRUE; - - mail_display_render (fb->mail_display, html, TRUE); - gtk_html_print_set_master (html, print_master); - - info = footer_info_new (html, print_context, &line); - gtk_html_print_with_header_footer (html, print_context, 0.0, line, NULL, footer_print_cb, info); - footer_info_free (info); - - fb->mail_display->printing = FALSE; - + gtk_html_print_set_master (fb->mail_display->html, print_master); + gtk_html_print (fb->mail_display->html, print_context); gnome_print_master_close (print_master); if (preview){ @@ -2932,76 +2376,9 @@ do_mail_print (FolderBrowser *fb, gboolean preview) _("Printing of message failed")); } } - - /* FIXME: We are leaking the GtkHTML object */ -} - -/* This is pretty evil. FolderBrowser's API should be extended to allow these sorts of - things to be done in a more natural way. */ - -/* <evil_code> */ - -struct blarg_this_sucks { - FolderBrowser *fb; - gboolean preview; -}; - -static void -done_message_selected (CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *data) -{ - struct blarg_this_sucks *blarg = data; - FolderBrowser *fb = blarg->fb; - gboolean preview = blarg->preview; - const char *followup; - - g_free (blarg); - - followup = camel_folder_get_message_user_tag (folder, uid, "follow-up"); - - mail_display_set_message (fb->mail_display, (CamelMedium *) msg, followup); - - g_free (fb->loaded_uid); - fb->loaded_uid = fb->loading_uid; - fb->loading_uid = NULL; - - do_mail_print (fb, preview); -} - -/* Ack! Most of this is copied from folder-browser.c */ -static void -do_mail_fetch_and_print (FolderBrowser *fb, gboolean preview) -{ - if (!fb->preview_shown) { - /* If the preview pane is closed, we have to do some - extra magic to load the message. */ - struct blarg_this_sucks *blarg = g_new (struct blarg_this_sucks, 1); - - blarg->fb = fb; - blarg->preview = preview; - - fb->loading_id = 0; - - /* if we are loading, then set a pending, but leave the loading, coudl cancel here (?) */ - if (fb->loading_uid) { - g_free (fb->pending_uid); - fb->pending_uid = g_strdup (fb->new_uid); - } else { - if (fb->new_uid) { - fb->loading_uid = g_strdup (fb->new_uid); - mail_get_message (fb->folder, fb->loading_uid, done_message_selected, blarg, mail_thread_new); - } else { - mail_display_set_message (fb->mail_display, NULL, NULL); - g_free (blarg); - } - } - } else { - do_mail_print (fb, preview); - } + gtk_object_unref (GTK_OBJECT (print_master)); } -/* </evil_code> */ - - void print_msg (GtkWidget *button, gpointer user_data) { @@ -3010,7 +2387,7 @@ print_msg (GtkWidget *button, gpointer user_data) if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - do_mail_fetch_and_print (fb, FALSE); + do_mail_print (fb, FALSE); } void @@ -3021,7 +2398,7 @@ print_preview_msg (GtkWidget *button, gpointer user_data) if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - do_mail_fetch_and_print (fb, TRUE); + do_mail_print (fb, TRUE); } /******************** Begin Subscription Dialog ***************************/ @@ -3069,63 +2446,6 @@ configure_folder (BonoboUIComponent *uih, void *user_data, const char *path) } static void -do_view_digest (CamelFolder *folder, char *uid, CamelMimeMessage *message, void *data) -{ - FolderBrowser *folder_browser = FOLDER_BROWSER (data); - - if (FOLDER_BROWSER_IS_DESTROYED (folder_browser)) - return; - - if (message) { - CamelFolder *digest; - CamelStore *store; - FolderBrowser *fb; - GtkWidget *window; - - store = camel_digest_store_new ("digest:/"); - - digest = camel_digest_folder_new (store, message); - camel_object_unref (CAMEL_OBJECT (store)); - if (!digest) - return; - - camel_folder_set_message_flags (folder, uid, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); - - fb = (FolderBrowser *) folder_browser_new (folder_browser->shell, NULL); - folder_browser_set_message_preview (fb, TRUE); - folder_browser_set_folder (fb, digest, "digest:/"); - camel_object_unref (CAMEL_OBJECT (digest)); - gtk_widget_show (GTK_WIDGET (fb)); - - window = folder_browser_window_new (fb); - gtk_widget_show (window); - } -} - -void -view_digest (GtkWidget *widget, gpointer user_data) -{ - FolderBrowser *fb = FOLDER_BROWSER (user_data); - GPtrArray *uids; - int i; - - if (FOLDER_BROWSER_IS_DESTROYED (fb)) - return; - - uids = g_ptr_array_new (); - message_list_foreach (fb->message_list, enumerate_msg, uids); - - if (uids->len > 10 && !are_you_sure (_("Are you sure you want to open all %d messages in separate windows?"), uids, fb)) - return; - - for (i = 0; i < uids->len; i++) { - mail_get_message (fb->folder, uids->pdata [i], do_view_digest, fb, mail_thread_queued); - g_free (uids->pdata [i]); - } - g_ptr_array_free (uids, TRUE); -} - -static void do_view_message (CamelFolder *folder, char *uid, CamelMimeMessage *message, void *data) { FolderBrowser *fb = FOLDER_BROWSER (data); @@ -3157,7 +2477,7 @@ view_msg (GtkWidget *widget, gpointer user_data) if (uids->len > 10 && !are_you_sure (_("Are you sure you want to open all %d messages in separate windows?"), uids, fb)) return; - + for (i = 0; i < uids->len; i++) { mail_get_message (fb->folder, uids->pdata [i], do_view_message, fb, mail_thread_queued); g_free (uids->pdata [i]); |