diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 10 | ||||
| -rw-r--r-- | mail/mail-mt.c | 3 |
3 files changed, 19 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 57ada8d5d4..c215c46989 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2005-01-20 Jeffrey Stedfast <fejj@novell.com> + + * em-folder-tree.c (emft_copy_folders__desc): Added a description + function for copying folders (so we don't get a "Working 0x..." + status message). + + * mail-mt.c (do_op_status): Always g_free(what) since we always + strdup it. + 2005-01-20 Not Zed <NotZed@Ximian.com> ** See bug #55831. diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index ccf4d9c001..4375b9bcc0 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1999,6 +1999,14 @@ struct _EMCopyFolders { int delete; }; +static char * +emft_copy_folders__desc (struct _mail_msg *mm, int complete) +{ + struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; + + return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); +} + static void emft_copy_folders__copy (struct _mail_msg *mm) { @@ -2136,7 +2144,7 @@ emft_copy_folders__free (struct _mail_msg *mm) } static struct _mail_msg_op copy_folders_op = { - NULL, + emft_copy_folders__desc, emft_copy_folders__copy, NULL, emft_copy_folders__free, diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 78d773f417..7baa6aef33 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -963,8 +963,7 @@ static void do_op_status(struct _mail_msg *mm) data->activity_id = e_activity_handler_operation_started (activity_handler, "evolution-mail", progress_icon, what, TRUE); - if (msg->ops->describe_msg) - g_free (what); + g_free (what); MAIL_MT_LOCK (mail_msg_lock); if (data->activity_state == 3) { |