From d53b9af629fcf4b77417edb0e4207fb1e2f28e0f Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@helixcode.com>
Date: Sun, 7 Jan 2001 23:12:11 +0000
Subject: Updated to reflect changes to the mail-config API.
 (create_msg_composer):

2001-01-07  Jeffrey Stedfast  <fejj@helixcode.com>

	* mail-callbacks.c (check_send_configuration): Updated to reflect
	changes to the mail-config API.
	(create_msg_composer): Same.
	(forward_get_composer): Same.
	(send_queued_mail): Same.
	(composer_send_cb): Same.

	* mail-account-editor.c: Updated to build cleanly.  *
	mail-config-druid.c: Same.  * mail-accounts.c: Same.

	* folder-browser-factory.c (control_activate): Updated for API
	changes in mail-config.

	* folder-browser.c (done_message_selected): Updated for API
	changed in mail-config.
	(folder_browser_gui_init): Same.
	(got_folder): Same.

	* component-factory.c (owner_set_cb): After using the sources
	list, free it as it is no longer a const GSList as with the older
	mail-config code.

	* mail-config.c: Totally rewritten.

svn path=/trunk/; revision=7294
---
 mail/component-factory.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'mail/component-factory.c')

diff --git a/mail/component-factory.c b/mail/component-factory.c
index f89a9dbc80..d280388e58 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -171,12 +171,12 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	      const char *evolution_homedir,
 	      gpointer user_data)
 {
-	GSList *sources;
 	GNOME_Evolution_Shell corba_shell;
+	GSList *sources;
 	int i;
 
 	g_print ("evolution-mail: Yeeeh! We have an owner!\n");	/* FIXME */
-	
+
 	evolution_dir = g_strdup (evolution_homedir);
 	mail_session_init ();
 	mail_config_init ();
@@ -189,15 +189,18 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 
 	sources = mail_config_get_sources ();
 	mail_load_storages (corba_shell, sources);
-	sources = mail_config_get_news ();
+	/* only this one gets free'd because it's created on-the-fly */
+	g_slist_free (sources);
+	
+	sources = (GSList *) mail_config_get_news ();
 	mail_load_storages (corba_shell, sources);
 
 	mail_local_storage_startup (shell_client, evolution_dir);
 
-	for (i=0;i<sizeof(standard_folders)/sizeof(standard_folders[0]);i++) {
+	for (i = 0; i < sizeof (standard_folders) / sizeof (standard_folders[0]); i++) {
 		char *uri = g_strdup_printf ("file://%s/local/%s", evolution_dir, standard_folders[i].name);
-		mail_msg_wait(mail_get_folder(uri, got_folder, standard_folders[i].folder));
-		g_free(uri);
+		mail_msg_wait (mail_get_folder (uri, got_folder, standard_folders[i].folder));
+		g_free (uri);
 	}
 
 	mail_session_enable_interaction (TRUE);
-- 
cgit v1.2.3