[evolution-patches] fix for bug #45412 (drafts & sent not settable)



as long as the user wanted to use the local Sent or Drafts folder *or*
if he only cared to use a folder on his/her imap server - it worked.
otherwise it doesn't. This patch allows the user to set *any* local
folder as his sent/drafts folder as well as any folder on the imap
server.

should be applied to both branches

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com
? 45412.patch
? em-marshal.c
? em-marshal.h
? log
? namespace.sh
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2782.2.34
diff -u -r1.2782.2.34 ChangeLog
--- ChangeLog	4 Sep 2003 23:12:40 -0000	1.2782.2.34
+++ ChangeLog	9 Sep 2003 20:28:20 -0000
@@ -1,3 +1,9 @@
+2003-09-09  Jeffrey Stedfast  <fejj ximian com>
+
+	* mail-account-gui.c (mail_account_gui_save): Allow the user to
+	select any local folder as a Drafts or Sent folder as well. Fixes
+	bug #45412.
+
 2003-09-04  Not Zed  <NotZed Ximian com>
 
 	* em-utils.c (confirm_expunge): rename it to emu_confirm_expunge
Index: mail-account-gui.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-account-gui.c,v
retrieving revision 1.134.8.1
diff -u -r1.134.8.1 mail-account-gui.c
--- mail-account-gui.c	12 Aug 2003 21:17:52 -0000	1.134.8.1
+++ mail-account-gui.c	9 Sep 2003 20:28:24 -0000
@@ -1926,7 +1926,7 @@
 	/* Check to make sure that the Drafts folder uri is "valid" before assigning it */
 	url = source_url && gui->drafts_folder_uri ? camel_url_new (gui->drafts_folder_uri, NULL) : NULL;
 	if (mail_config_get_account_by_source_url (gui->drafts_folder_uri) ||
-	    (url && provider->url_equal (source_url, url))) {
+	    (url && (provider->url_equal (source_url, url) || !strcmp (url->protocol, "file")))) {
 		new->drafts_folder_uri = g_strdup (gui->drafts_folder_uri);
 	} else {
 		/* assign defaults - the uri is unknown to us (probably pointed to an old source url) */
@@ -1939,7 +1939,7 @@
 	/* Check to make sure that the Sent folder uri is "valid" before assigning it */
 	url = source_url && gui->sent_folder_uri ? camel_url_new (gui->sent_folder_uri, NULL) : NULL;
 	if (mail_config_get_account_by_source_url (gui->sent_folder_uri) ||
-	    (url && provider->url_equal (source_url, url))) {
+	    (url && (provider->url_equal (source_url, url) || !strcmp (url->protocol, "file")))) {
 		new->sent_folder_uri = g_strdup (gui->sent_folder_uri);
 	} else {
 		/* assign defaults - the uri is unknown to us (probably pointed to an old source url) */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]