[evolution-patches] 64972, maildir reply not getting right from account

[Not Zed <notzed ximian com>]

This should set the right from account when replying to maildir/whatever mail.

I'm not sure if the folder wasn't passed just because it didn't used to be available from that function, or some explicit reason to do with newsgroup replies.  I think the former.

In an unrelated patch, It also adds a description to the getfolderinfo thing, the string is copied from mail-ops.c:get_folder_info so it isn't a string change.  This is so the mailer isn't silent when its busy doing this, and it also means the cancel button works for these tasks.

 Michael

--

Michael Zucchi <notzed ximian com> "born to die, live to work, it's all downhill from here" Novell's Evolution and Free Software Developer

Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3444.2.9
diff -u -3 -r1.3444.2.9 ChangeLog
--- mail/ChangeLog	22 Sep 2004 01:31:16 -0000	1.3444.2.9
+++ mail/ChangeLog	23 Sep 2004 07:05:33 -0000
@@ -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.
Index: mail/em-composer-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-composer-utils.c,v
retrieving revision 1.21
diff -u -3 -r1.21 em-composer-utils.c
--- mail/em-composer-utils.c	4 Aug 2004 15:20:57 -0000	1.21
+++ mail/em-composer-utils.c	23 Sep 2004 07:05:34 -0000
@@ -1749,7 +1749,7 @@
 
 	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) {
Index: mail/em-folder-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
retrieving revision 1.125.4.2
diff -u -3 -r1.125.4.2 em-folder-tree.c
--- mail/em-folder-tree.c	1 Sep 2004 14:27:22 -0000	1.125.4.2
+++ mail/em-folder-tree.c	23 Sep 2004 07:05:35 -0000
@@ -1697,6 +1697,18 @@
 	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)
 {
@@ -1808,7 +1820,7 @@
 }
 
 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,