diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/providers/groupwise/camel-gw-listener.c | 11 | ||||
| -rw-r--r-- | plugins/groupwise-account-setup/camel-gw-listener.c | 11 |
3 files changed, 16 insertions, 12 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 1b52464147..d5fd5d7f17 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2004-04-11 Sivaiah Nallagatla <snallagatla@novell.com> + + * providers/groupwise/camel-gw-listener.c + (add_addressbook_sources) (modify_addressbook_sources) : add + bookname to uri + 2004-04-09 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-provider.c: Fix capitalisation of the diff --git a/camel/providers/groupwise/camel-gw-listener.c b/camel/providers/groupwise/camel-gw-listener.c index 5ca7e7ee64..850719486a 100644 --- a/camel/providers/groupwise/camel-gw-listener.c +++ b/camel/providers/groupwise/camel-gw-listener.c @@ -353,16 +353,15 @@ add_addressbook_sources (EAccount *account) soap_port = camel_url_get_param (url, "soap_port"); if (!soap_port) soap_port = "7181"; - relative_uri = g_strdup_printf ("%s:%s/soap", url->host, soap_port); + relative_uri = g_strdup_printf ("%s:%s/soap?Frequent Contacts", url->host, soap_port); list = e_source_list_new_for_gconf (gconf_client_get_default (), "/apps/evolution/addressbook/sources" ); group = e_source_group_new (account->name, "groupwise://"); e_source_list_add_group (list, group, -1); source = e_source_new ("Frequent Contacts", relative_uri); - e_source_set_property (source, "auth", "ldap/simple-binddn"); - e_source_set_property(source, "binddn", url->user); + e_source_set_property (source, "auth", "Password"); + e_source_set_property(source, "user", url->user); e_source_group_add_source (group, source, -1); - e_source_list_sync (list, NULL); - + g_object_unref (source); g_object_unref (group); g_object_unref (list); @@ -391,7 +390,7 @@ modify_addressbook_sources ( EAccount *account, const char *old_account_name) soap_port = camel_url_get_param (url, "soap_port"); if (!soap_port) soap_port = "7181"; - relative_uri = g_strdup_printf ("%s:%s/soap", url->host, soap_port); + relative_uri = g_strdup_printf ("%s:%s/soap?Frequent Contacts", url->host, soap_port); found_group = FALSE; for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 5ca7e7ee64..850719486a 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -353,16 +353,15 @@ add_addressbook_sources (EAccount *account) soap_port = camel_url_get_param (url, "soap_port"); if (!soap_port) soap_port = "7181"; - relative_uri = g_strdup_printf ("%s:%s/soap", url->host, soap_port); + relative_uri = g_strdup_printf ("%s:%s/soap?Frequent Contacts", url->host, soap_port); list = e_source_list_new_for_gconf (gconf_client_get_default (), "/apps/evolution/addressbook/sources" ); group = e_source_group_new (account->name, "groupwise://"); e_source_list_add_group (list, group, -1); source = e_source_new ("Frequent Contacts", relative_uri); - e_source_set_property (source, "auth", "ldap/simple-binddn"); - e_source_set_property(source, "binddn", url->user); + e_source_set_property (source, "auth", "Password"); + e_source_set_property(source, "user", url->user); e_source_group_add_source (group, source, -1); - e_source_list_sync (list, NULL); - + g_object_unref (source); g_object_unref (group); g_object_unref (list); @@ -391,7 +390,7 @@ modify_addressbook_sources ( EAccount *account, const char *old_account_name) soap_port = camel_url_get_param (url, "soap_port"); if (!soap_port) soap_port = "7181"; - relative_uri = g_strdup_printf ("%s:%s/soap", url->host, soap_port); + relative_uri = g_strdup_printf ("%s:%s/soap?Frequent Contacts", url->host, soap_port); found_group = FALSE; for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { |