[evolution-kolab] Adapt to CamelService API changes.

[Matthew Barnes <mbarnes src gnome org>]

commit 1e85aff5990c969696796fbce96ada80156601a7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Aug 12 15:33:04 2012 -0400

    Adapt to CamelService API changes.
    
    camel_service_get_settings() is now camel_service_ref_settings()
    and it returns a new CamelSettings reference which the caller must
    release with g_object_unref().

 src/libekolab/camel-kolab-imapx-store.c |    4 +++-
 src/libekolab/camel-kolab-session.c     |    7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/src/libekolab/camel-kolab-imapx-store.c b/src/libekolab/camel-kolab-imapx-store.c
index ff235a8..16f0de0 100644
--- a/src/libekolab/camel-kolab-imapx-store.c
+++ b/src/libekolab/camel-kolab-imapx-store.c
@@ -610,12 +610,14 @@ kolab_imapx_store_get_name (CamelService *service,
 
 	g_assert (CAMEL_IS_KOLAB_IMAPX_STORE (service));
 
-	settings = camel_service_get_settings (service);
+	settings = camel_service_ref_settings (service);
 
 	network_settings = CAMEL_NETWORK_SETTINGS (settings);
 	host = camel_network_settings_dup_host (network_settings);
 	user = camel_network_settings_dup_user (network_settings);
 
+	g_object_unref (settings);
+
 	if (brief)
 		name = g_strdup_printf (_("Kolab server %s"), host);
 	else
diff --git a/src/libekolab/camel-kolab-session.c b/src/libekolab/camel-kolab-session.c
index 90cb5da..9fceba9 100644
--- a/src/libekolab/camel-kolab-session.c
+++ b/src/libekolab/camel-kolab-session.c
@@ -203,7 +203,6 @@ kolab_session_authenticate_sync (CamelSession *session,
 	CamelServiceAuthType *authtype = NULL;
 	CamelAuthenticationResult result;
 	CamelProvider *provider;
-	CamelSettings *settings;
 	const gchar *password;
 	guint32 password_flags;
 	GError *local_error = NULL;
@@ -220,7 +219,6 @@ kolab_session_authenticate_sync (CamelSession *session,
 	 * subclasses to follow.  Instead we mimic most of its logic here. */
 
 	provider = camel_service_get_provider (service);
-	settings = camel_service_get_settings (service);
 
 	/* APOP is one case where a non-SASL mechanism name is passed, so
 	 * don't bail if the CamelServiceAuthType struct comes back NULL. */
@@ -278,12 +276,15 @@ kolab_session_authenticate_sync (CamelSession *session,
 	password = camel_service_get_password (service);
 
 	if (password == NULL) {
+		CamelSettings *settings;
 		CamelNetworkSettings *network_settings;
 		const gchar *host;
 		const gchar *user;
 		gchar *prompt;
 		gchar *new_passwd;
 
+		settings = camel_service_ref_settings (service);
+
 		network_settings = CAMEL_NETWORK_SETTINGS (settings);
 		host = camel_network_settings_get_host (network_settings);
 		user = camel_network_settings_get_user (network_settings);
@@ -292,6 +293,8 @@ kolab_session_authenticate_sync (CamelSession *session,
 		                                              user,
 		                                              host);
 
+		g_object_unref (settings);
+
 		new_passwd = camel_session_get_password (session, service, prompt, "password",
 		                                         password_flags, &local_error);
 		camel_service_set_password (service, new_passwd);