diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-ops.c | 20 | ||||
| -rw-r--r-- | mail/mail-tools.c | 2 |
3 files changed, 27 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 319ac75258..8cd76d1c1c 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2000-08-28 Peter Williams <peterw@helixcode.com> + + * mail-ops.c (do_transfer_messages): Add status messages. + (do_flag_messages): Same. + (do_scan_subfolders): Same. + (do_forward_messages): Same. + (do_view_messages): Same. + 2000-08-28 Ettore Perazzoli <ettore@helixcode.com> * mail-view.c (mail_view_create): Use `gnome_app_set_toolbar()' diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 851bc591de..847019ecd4 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -543,14 +543,18 @@ do_transfer_messages (gpointer in_data, gpointer op_data, CamelException *ex) transfer_messages_input_t *input = (transfer_messages_input_t *) in_data; CamelFolder *dest; gint i; + gchar *desc; void (*func) (CamelFolder *, const char *, CamelFolder *, CamelException *); - if (input->delete_from_source) + if (input->delete_from_source) { func = camel_folder_move_message_to; - else + desc = _("Moving"); + } else { func = camel_folder_copy_message_to; + desc = _("Copying"); + } dest = mail_tool_uri_to_folder (input->dest_uri, ex); if (camel_exception_is_set (ex)) @@ -561,6 +565,9 @@ do_transfer_messages (gpointer in_data, gpointer op_data, CamelException *ex) camel_folder_freeze (dest); for (i = 0; i < input->uids->len; i++) { + mail_op_set_message (_("%s message %d of %d (uid \"%s\")"), desc, + i + 1, input->uids->len, (char *) input->uids->pdata[i]); + (func) (input->source, input->uids->pdata[i], dest, ex); @@ -680,6 +687,9 @@ do_flag_messages (gpointer in_data, gpointer op_data, CamelException *ex) mail_tool_camel_lock_down (); for (i = 0; i < input->uids->len; i++) { + mail_op_set_message ("Marking message %d of %d", i + 1, + input->uids->len); + if (input->invert) { const CamelMessageInfo *info; @@ -856,6 +866,7 @@ do_scan_subfolders (gpointer in_data, gpointer op_data, CamelException *ex) mail_tool_camel_lock_down (); for (i = 0; i < lsub->len; i++) { + mail_op_set_message (_("Found subfolder \"%s\""), (char *) lsub->pdata[i]); info = g_new (scan_subfolders_folderinfo_t, 1); info->path = g_strdup_printf ("/%s", (char *) lsub->pdata[i]); info->uri = g_strdup_printf ("%s%s%s", input->source_uri, splice, @@ -1147,6 +1158,8 @@ do_forward_messages (gpointer in_data, gpointer op_data, CamelException *ex) mail_tool_camel_lock_up (); for (i = 0; i < input->uids->len; i++) { + mail_op_set_message (_("Retrieving message number %d of %d (uid \"%s\")"), + i + 1, input->uids->len, (char *) input->uids->pdata[i]); message = camel_folder_get_message (input->source, input->uids->pdata[i], ex); @@ -1942,6 +1955,9 @@ do_view_messages (gpointer in_data, gpointer op_data, CamelException *ex) for (i = 0; i < input->uids->len; i++) { CamelMimeMessage *message; + mail_op_set_message (_("Retrieving message %d of %d (uid \"%s\")"), + i + 1, input->uids->len, input->uids->pdata[i]); + mail_tool_camel_lock_up (); message = camel_folder_get_message (input->folder, input->uids->pdata[i], ex); mail_tool_camel_lock_down (); diff --git a/mail/mail-tools.c b/mail/mail-tools.c index b540c595e2..eb20a2ef79 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -322,7 +322,7 @@ mail_tool_move_folder_contents (CamelFolder *source, CamelFolder *dest, gboolean /* Append it to dest */ - mail_op_set_message ("Writing message %d of %d", i, uids->len); + mail_op_set_message ("Writing message %d of %d", i + 1, uids->len); info = camel_folder_get_message_info (source, uids->pdata[i]); camel_folder_append_message (dest, msg, info, ex); |