Migrate from CamelException to GError.

1 files changed, 5 insertions, 7 deletions

diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 3418404e06..6fd0c7ea82 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -303,17 +303,15 @@ e_mail_store_add_by_uri (const gchar *uri,
 {
 	CamelService *service;
 	CamelProvider *provider;
-	CamelException ex;
+	GError *local_error = NULL;
 
 	g_return_val_if_fail (uri != NULL, NULL);
 	g_return_val_if_fail (display_name != NULL, NULL);
 
-	camel_exception_init (&ex);
-
 	/* Load the service, but don't connect.  Check its provider,
 	 * and if this belongs in the folder tree model, add it. */
 
-	provider = camel_provider_get (uri, &ex);
+	provider = camel_provider_get (uri, &local_error);
 	if (provider == NULL)
 		goto fail;
 
@@ -321,7 +319,7 @@ e_mail_store_add_by_uri (const gchar *uri,
 		return NULL;
 
 	service = camel_session_get_service (
-		session, uri, CAMEL_PROVIDER_STORE, &ex);
+		session, uri, CAMEL_PROVIDER_STORE, &local_error);
 	if (service == NULL)
 		goto fail;
 
@@ -335,8 +333,8 @@ fail:
 	/* FIXME: Show an error dialog. */
 	g_warning (
 		"Couldn't get service: %s: %s", uri,
-		camel_exception_get_description (&ex));
-	camel_exception_clear (&ex);
+		local_error->message);
+	g_error_free (local_error);
 
 	return NULL;
 }