[evolution-groupwise/gnome-3-2] Bug #656273 - Groupwise addressbook doesn't work

[Vibha Yadav <yvibha src gnome org>]

commit f0cf68c76f5f9b9bc327270602f05bdd561c76d0
Author: Vibha Yadav <yvibha suse com>
Date:   Fri Dec 2 17:26:04 2011 +0530

    Bug #656273 - Groupwise addressbook doesn't work
    
    Calling up notify_auth_required() if backend is online.
    setting up source property properly for backend authentication.

 src/addressbook/e-book-backend-groupwise.c |    2 ++
 src/plugins/camel-gw-listener.c            |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-groupwise.c b/src/addressbook/e-book-backend-groupwise.c
index dbf5bbc..c4cd056 100644
--- a/src/addressbook/e-book-backend-groupwise.c
+++ b/src/addressbook/e-book-backend-groupwise.c
@@ -3591,6 +3591,8 @@ e_book_backend_groupwise_open (EBookBackend *backend,
 	e_data_book_respond_open (book, opid, NULL /* Success */);
 	if (!priv->is_online)
 		e_book_backend_notify_opened (backend, NULL /* Success */);
+	else
+		e_book_backend_notify_auth_required(backend, TRUE, NULL);
 }
 
 static void
diff --git a/src/plugins/camel-gw-listener.c b/src/plugins/camel-gw-listener.c
index 2397df8..6773725 100644
--- a/src/plugins/camel-gw-listener.c
+++ b/src/plugins/camel-gw-listener.c
@@ -746,7 +746,7 @@ add_addressbook_sources (EAccount *account)
 		e_source_set_property (source, "auth", "plain/password");
 		e_source_set_property (source, "auth-domain", "Groupwise");
 		e_source_set_property (source, "port", port_string);
-		e_source_set_property(source, "user", url->user);
+		e_source_set_property(source, "username", url->user);
 		/* mark system address book for offline usage */
 		/* FIXME: add isPersonal flag to container and use that isFrequentContact
 		 * properties, instead of using writable to distinguish between the
@@ -873,6 +873,7 @@ modify_addressbook_sources (EAccount *account,
 				for (; sources != NULL; sources = g_slist_next (sources)) {
 					source = E_SOURCE (sources->data);
 					e_source_set_property (source, "port", port_string);
+					e_source_set_property (source, "username", url->user);
 					e_source_set_property (source, "use_ssl", use_ssl);
 				}