[evolution-mapi] Fix double connection in EBookBackend from the previous commit
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-mapi] Fix double connection in EBookBackend from the previous commit
- Date: Tue, 17 Jul 2012 10:23:20 +0000 (UTC)
commit c5001b6187603424f49ccaf40fd0e83b62594666
Author: Milan Crha <mcrha redhat com>
Date: Tue Jul 17 12:22:35 2012 +0200
Fix double connection in EBookBackend from the previous commit
src/addressbook/e-book-backend-mapi.c | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index 6adab9e..e3be67b 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -496,7 +496,6 @@ ebbm_open (EBookBackendMAPI *ebma,
EBookBackendMAPIPrivate *priv = ebma->priv;
ESource *source = e_backend_get_source (E_BACKEND (ebma));
ESourceOffline *offline_extension;
- CamelMapiSettings *settings;
const gchar *cache_dir;
GError *error = NULL;
@@ -505,8 +504,6 @@ ebbm_open (EBookBackendMAPI *ebma,
return;
}
- settings = ebbm_get_collection_settings (ebma);
-
offline_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_OFFLINE);
priv->marked_for_offline = e_source_offline_get_stay_synchronized (offline_extension);
@@ -551,17 +548,6 @@ ebbm_open (EBookBackendMAPI *ebma,
e_book_backend_notify_online (E_BOOK_BACKEND (ebma), TRUE);
e_book_backend_mapi_ensure_connected (ebma, cancellable, &error);
- if (!camel_mapi_settings_get_kerberos (settings) ||
- ebbm_connect_user (ebma, cancellable, NULL, &error) != E_SOURCE_AUTHENTICATION_ACCEPTED) {
- ESourceRegistry *registry;
-
- registry = e_book_backend_get_registry (E_BOOK_BACKEND (ebma));
-
- e_source_registry_authenticate_sync (
- registry, source,
- E_SOURCE_AUTHENTICATOR (ebma),
- cancellable, &error);
- }
if (error && perror)
g_propagate_error (perror, g_error_copy (error));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]