Make the drafts and sent folder buttons be EvolutionFolderSelectorButtons.

	* mail-account-gui.c (mail_account_gui_new): Make the drafts and
	sent folder buttons be EvolutionFolderSelectorButtons. Remove the
	code to deal with drafts_folder_name and sent_folder_name, since
	they were only used to construct the button and aren't needed now.
	(mail_account_gui_save): Remove drafts/sent name references.
	(mail_account_gui_destroy): Likewise
	(folder_selected): Handle the "selected" signal on the folder
	selector button by updating the URI in the MailAccountGui.
	(mail_account_gui_folder_selector_button_new): Glade custom widget
	constructor.

	* mail-callbacks.c (transfer_msg): Update for
	evolution_shell_client_user_select_folder change.

	* message-browser.c (transfer_msg): Likewise. (Sigh. Why is this
	cut+pasted?)

	* mail-config.glade: Make the drafts/sent folder buttons custom
	widgets.

	* mail-config.c (account_copy): Remove drafts/sent folder name
	handling.
	(account_destroy): Likewise.
	(config_read): Likewise.
	(mail_config_write): Likewise.

	* Mail.idl (MailConfig:Account): remove drafts_folder_name and
	sent_folder_name.

svn path=/trunk/; revision=16353

1 files changed, 0 insertions, 30 deletions

diff --git a/mail/mail-config.c b/mail/mail-config.c
index 145f70868f..6e2963ad22 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -253,9 +253,7 @@ account_copy (const MailConfigAccount *account)
 	new->source = service_copy (account->source);
 	new->transport = service_copy (account->transport);
 	
-	new->drafts_folder_name = g_strdup (account->drafts_folder_name);
 	new->drafts_folder_uri = g_strdup (account->drafts_folder_uri);
-	new->sent_folder_name = g_strdup (account->sent_folder_name);
 	new->sent_folder_uri = g_strdup (account->sent_folder_uri);
 	
 	new->always_cc = account->always_cc;
@@ -286,9 +284,7 @@ account_destroy (MailConfigAccount *account)
 	service_destroy (account->source);
 	service_destroy (account->transport);
 	
-	g_free (account->drafts_folder_name);
 	g_free (account->drafts_folder_uri);
-	g_free (account->sent_folder_name);
 	g_free (account->sent_folder_uri);
 	
 	g_free (account->cc_addrs);
@@ -632,14 +628,6 @@ config_read (void)
 			config->corrupt = TRUE;
 		}
 		
-		path = g_strdup_printf ("/Mail/Accounts/account_drafts_folder_name_%d", i);
-		val = bonobo_config_get_string (config->db, path, NULL);
-		g_free (path);
-		if (val && *val)
-			account->drafts_folder_name = val;
-		else
-			g_free (val);
-		
 		path = g_strdup_printf ("/Mail/Accounts/account_drafts_folder_uri_%d", i);
 		val = bonobo_config_get_string (config->db, path, NULL);
 		g_free (path);
@@ -648,14 +636,6 @@ config_read (void)
 		else
 			g_free (val);
 		
-		path = g_strdup_printf ("/Mail/Accounts/account_sent_folder_name_%d", i);
-		val = bonobo_config_get_string (config->db, path, NULL);
-		g_free (path);
-		if (val && *val)
-			account->sent_folder_name = val;
-		else
-			g_free (val);
-		
 		path = g_strdup_printf ("/Mail/Accounts/account_sent_folder_uri_%d", i);
 		val = bonobo_config_get_string (config->db, path, NULL);
 		g_free (path);
@@ -1071,21 +1051,11 @@ mail_config_write (void)
 		bonobo_config_set_string_wrapper (config->db, path, account->name, NULL);
 		g_free (path);
 		
-		path = g_strdup_printf ("/Mail/Accounts/account_drafts_folder_name_%d", i);
-		bonobo_config_set_string_wrapper (config->db, path, 
-						  account->drafts_folder_name, NULL);
-		g_free (path);
-		
 		path = g_strdup_printf ("/Mail/Accounts/account_drafts_folder_uri_%d", i);
 		bonobo_config_set_string_wrapper (config->db, path, 
 						  account->drafts_folder_uri, NULL);
 		g_free (path);
 		
-		path = g_strdup_printf ("/Mail/Accounts/account_sent_folder_name_%d", i);
-		bonobo_config_set_string_wrapper (config->db, path, 
-						  account->sent_folder_name, NULL);
-		g_free (path);
-		
 		path = g_strdup_printf ("/Mail/Accounts/account_sent_folder_uri_%d", i);
 		bonobo_config_set_string_wrapper (config->db, path, 
 						  account->sent_folder_uri, NULL);