fix camel provider api changes.

2004-02-19  Not Zed  <NotZed@Ximian.com>

        * mail-send-recv.c (get_receive_type):
        * mail-config.c (mail_config_get_account_by_source_url)
        (mail_config_get_account_by_transport_url):
        * mail-component.c (mail_component_load_store_by_uri):
        * mail-account-gui.c (mail_account_gui_setup)
        (mail_account_gui_save):
        * em-utils.c (em_utils_empty_trash, em_uri_from_camel):
        * em-folder-tree-model.c (account_changed):
        * em-folder-selector.c (em_folder_selector_get_selected_uri): fix
        camel provider api changes.

svn path=/trunk/; revision=24795

10 files changed, 26 insertions, 21 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 65a98e0337..efa25fe3bc 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,16 @@
+2004-02-19  Not Zed  <NotZed@Ximian.com>
+
+	* mail-send-recv.c (get_receive_type): 
+	* mail-config.c (mail_config_get_account_by_source_url) 
+	(mail_config_get_account_by_transport_url): 
+	* mail-component.c (mail_component_load_store_by_uri): 
+	* mail-account-gui.c (mail_account_gui_setup) 
+	(mail_account_gui_save): 
+	* em-utils.c (em_utils_empty_trash, em_uri_from_camel): 
+	* em-folder-tree-model.c (account_changed):
+	* em-folder-selector.c (em_folder_selector_get_selected_uri): fix
+	camel provider api changes.
+
 2004-02-18  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* em-composer-prefs.c (sig_fill_list): Changed the name to not
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 2d7c528df5..aeafa1abfc 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -296,13 +296,10 @@ em_folder_selector_get_selected_uri (EMFolderSelector *emfs)
 	
 	if (uri && emfs->name_entry) {
 		CamelProvider *provider;
-		CamelException ex;
 		CamelURL *url;
 		char *newpath;
 		
-		camel_exception_init (&ex);
-		provider = camel_session_get_provider (session, uri, &ex);
-		camel_exception_clear (&ex);
+		provider = camel_provider_get(uri, NULL);
 		
 		name = gtk_entry_get_text (emfs->name_entry);
 		
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 3d3b0f09d3..91defd775b 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -123,7 +123,6 @@ static void
 em_folder_tree_model_class_init (EMFolderTreeModelClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	int i;
 	
 	parent_class = g_type_class_ref (GTK_TYPE_TREE_STORE);
 	
@@ -368,7 +367,7 @@ account_changed (EAccountList *accounts, EAccount *account, gpointer user_data)
 		return;
 	
 	camel_exception_init (&ex);
-	if (!(provider = camel_session_get_provider (session, uri, &ex))) {
+	if (!(provider = camel_provider_get(uri, &ex))) {
 		camel_exception_clear (&ex);
 		return;
 	}
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 0961994c96..1ac9aeb50f 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2445,7 +2445,7 @@ em_utils_empty_trash (GtkWidget *parent)
 		
 		/* make sure this is a valid source */
 		if (account->enabled && account->source->url) {
-			provider = camel_session_get_provider (session, account->source->url, &ex);
+			provider = camel_provider_get(account->source->url, &ex);
 			if (provider) {
 				/* make sure this store is a remote store */
 				if (provider->flags & CAMEL_PROVIDER_IS_STORAGE &&
@@ -2507,7 +2507,7 @@ char *em_uri_from_camel(const char *curi)
 	char *euri, *tmp;
 	CamelProvider *provider;
 
-	provider = camel_session_get_provider(session, curi, NULL);
+	provider = camel_provider_get(curi, NULL);
 	if (provider == NULL) {
 		d(printf("em uri from camel failed '%s'\n", curi));
 		return g_strdup(curi);
@@ -2597,7 +2597,7 @@ char *em_uri_to_camel(const char *euri)
 	}
 
 	service = account->source;
-	provider = camel_session_get_provider(session, service->url, NULL);
+	provider = camel_provider_get(service->url, NULL);
 
 	curl = camel_url_new(service->url, NULL);
 	if (provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index 11cdb56f94..02385b7cb4 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -137,7 +137,7 @@ editor_response_cb (GtkWidget *widget, int button, gpointer user_data)
 static void
 mail_account_editor_changed (GtkWidget *widget, MailAccountEditor *editor)
 {
-	gtk_dialog_set_response_sensitive (GTK_WIDGET (editor), GTK_RESPONSE_APPLY, TRUE);
+	gtk_dialog_set_response_sensitive((GtkDialog *)editor, GTK_RESPONSE_APPLY, TRUE);
 }
 
 static void
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 6e35041438..8f211ac850 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -1693,7 +1693,7 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top)
 	/* Construct source/transport option menus */
 	stores = gtk_menu_new ();
 	transports = gtk_menu_new ();
-	providers = camel_session_list_providers (session, TRUE);
+	providers = camel_provider_list(TRUE);
 	
 	/* sort the providers, remote first */
 	providers = g_list_sort (providers, (GCompareFunc) provider_compare);
@@ -1990,7 +1990,7 @@ mail_account_gui_save (MailAccountGui *gui)
 	/* source */
 	save_service (&gui->source, gui->extra_config, new->source);
 	if (new->source->url)
-		provider = camel_session_get_provider (session, new->source->url, NULL);
+		provider = camel_provider_get(new->source->url, NULL);
 	
 	new->source->auto_check = gtk_toggle_button_get_active (gui->source_auto_check);
 	if (new->source->auto_check)
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 5915f19c89..d5bf6a34ea 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -750,7 +750,7 @@ mail_component_load_store_by_uri (MailComponent *component, const char *uri, con
 	 * it.
 	 */
 	
-	prov = camel_session_get_provider (session, uri, &ex);
+	prov = camel_provider_get(uri, &ex);
 	if (prov == NULL) {
 		/* EPFIXME: real error dialog */
 		g_warning ("couldn't get service %s: %s\n", uri,
@@ -823,7 +823,7 @@ mail_component_remove_store_by_uri (MailComponent *component, const char *uri)
 
 	MAIL_COMPONENT_DEFAULT(component);
 	
-	if (!(prov = camel_session_get_provider (session, uri, NULL)))
+	if (!(prov = camel_provider_get(uri, NULL)))
 		return;
 	
 	if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE))
diff --git a/mail/mail-config.c b/mail/mail-config.c
index ac3d20a5bb..99419f7250 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -782,7 +782,7 @@ mail_config_get_account_by_source_url (const char *source_url)
 	
 	g_return_val_if_fail (source_url != NULL, NULL);
 	
-	provider = camel_session_get_provider (session, source_url, NULL);
+	provider = camel_provider_get(source_url, NULL);
 	if (!provider)
 		return NULL;
 	
@@ -830,7 +830,7 @@ mail_config_get_account_by_transport_url (const char *transport_url)
 	
 	g_return_val_if_fail (transport_url != NULL, NULL);
 	
-	provider = camel_session_get_provider (session, transport_url, NULL);
+	provider = camel_provider_get(transport_url, NULL);
 	if (!provider)
 		return NULL;
 	
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 7d3ac53e3b..3c33253932 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -884,7 +884,6 @@ static void do_op_status(struct _mail_msg *mm)
 	
 	if (data->activity_id == 0) {
 		char *what;
-		int display;
 		
 		/* its being created/removed?  well leave it be */
 		if (data->activity_state == 1 || data->activity_state == 3) {
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index c85b519876..38bbb1b41e 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -265,16 +265,13 @@ format_url(const char *internal_url)
 static send_info_t get_receive_type(const char *url)
 {
 	CamelProvider *provider;
-	CamelException ex;
 
 	/* HACK: since mbox is ALSO used for native evolution trees now, we need to
 	   fudge this to treat it as a special 'movemail' source */
 	if (!strncmp(url, "mbox:", 5))
 		return SEND_RECEIVE;
 
-	camel_exception_init(&ex);
-	provider = camel_session_get_provider (session, url, &ex);
-	camel_exception_clear(&ex);
+	provider = camel_provider_get(url, NULL);
 	if (!provider)
 		return SEND_INVALID;