diff options
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/em-composer-utils.c | 2 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 14 |
3 files changed, 24 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 74edc6e7e8..fd35b59830 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,13 @@ +2004-09-23 Not Zed <NotZed@Ximian.com> + + * em-folder-tree.c (emft_get_folder_info__desc): describe the + get-folder process. This also makes it cancellable. + + ** See bug #64972. + + * em-composer-utils.c (em_utils_reply_to_message): pass the folder + to guess_account. + 2004-09-03 Not Zed <NotZed@Ximian.com> ** See bug #65058. diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index b6b0474b3f..20df960507 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1750,7 +1750,7 @@ em_utils_reply_to_message(CamelFolder *folder, const char *uid, CamelMimeMessage g_return_if_fail(message != NULL); - account = guess_account (message, NULL); + account = guess_account (message, folder); flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN; switch (mode) { diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 5c8c384af8..c516a53735 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1708,6 +1708,18 @@ struct _EMFolderTreeGetFolderInfo { CamelFolderInfo *fi; }; +static char * +emft_get_folder_info__desc(struct _mail_msg *mm, int done) +{ + struct _EMFolderTreeGetFolderInfo *m = (struct _get_folderinfo_msg *)mm; + char *ret, *name; + + name = camel_service_get_name((CamelService *)m->store, TRUE); + ret = g_strdup_printf(_("Scanning folders in \"%s\""), name); + g_free(name); + return ret; +} + static void emft_get_folder_info__get (struct _mail_msg *mm) { @@ -1819,7 +1831,7 @@ emft_get_folder_info__free (struct _mail_msg *mm) } static struct _mail_msg_op get_folder_info_op = { - NULL, + emft_get_folder_info__desc, emft_get_folder_info__get, emft_get_folder_info__got, emft_get_folder_info__free, |