diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/providers/groupwise/camel-gw-listener.c | 9 | ||||
| -rw-r--r-- | plugins/groupwise-account-setup/camel-gw-listener.c | 9 |
3 files changed, 16 insertions, 8 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 711a953e4a..079ba07eaf 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2004-01-28 Sivaih Nallagatla <snallagatla@novell.com> + + * providers/groupwise/camel-gw-listener.c (account_changed) + (modify_esources) : add port and /soap parts to relative uri while + updating it when account changed + 2004-01-27 Radek Doulik <rodo@ximian.com> * providers/imap/camel-imap-folder.c (camel_imap_folder_new): set diff --git a/camel/providers/groupwise/camel-gw-listener.c b/camel/providers/groupwise/camel-gw-listener.c index 0738b35efa..da11be41fb 100644 --- a/camel/providers/groupwise/camel-gw-listener.c +++ b/camel/providers/groupwise/camel-gw-listener.c @@ -232,7 +232,7 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name, /* looks up for e-source with having same info as old_account_info and changes its values passed in new values */ static void -modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const char* new_group_name, const char* new_relative_uri) +modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const char* new_group_name, const char *username, const char* new_relative_uri) { ESourceList *list; ESourceGroup *group; @@ -270,6 +270,7 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const cha e_source_group_set_name (group, new_group_name); e_source_set_relative_uri (source, new_relative_uri); + e_source_set_property (source, "username", username); e_source_list_sync (list, NULL); found_group = TRUE; break; @@ -517,9 +518,9 @@ account_changed (EAccountList *account_listener, EAccount *account) if (strcmp (existing_account_info->name, account->name) != 0 || strcmp (existing_account_info->source_url, account->source->url) != 0) { url = camel_url_new (account->source->url, NULL); - relative_uri = g_strdup_printf ("%s@%s", url->user, url->host); - modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, relative_uri); - modify_esource ("/apps/evolution/tasks/sources", existing_account_info, account->name, relative_uri); + relative_uri = g_strdup_printf ("%s:7181/soap", url->host); + modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, url->user, relative_uri); + modify_esource ("/apps/evolution/tasks/sources", existing_account_info, account->name, url->user, relative_uri); g_free (existing_account_info->name); g_free (existing_account_info->source_url); existing_account_info->name = g_strdup (account->name); diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 0738b35efa..da11be41fb 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -232,7 +232,7 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name, /* looks up for e-source with having same info as old_account_info and changes its values passed in new values */ static void -modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const char* new_group_name, const char* new_relative_uri) +modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const char* new_group_name, const char *username, const char* new_relative_uri) { ESourceList *list; ESourceGroup *group; @@ -270,6 +270,7 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const cha e_source_group_set_name (group, new_group_name); e_source_set_relative_uri (source, new_relative_uri); + e_source_set_property (source, "username", username); e_source_list_sync (list, NULL); found_group = TRUE; break; @@ -517,9 +518,9 @@ account_changed (EAccountList *account_listener, EAccount *account) if (strcmp (existing_account_info->name, account->name) != 0 || strcmp (existing_account_info->source_url, account->source->url) != 0) { url = camel_url_new (account->source->url, NULL); - relative_uri = g_strdup_printf ("%s@%s", url->user, url->host); - modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, relative_uri); - modify_esource ("/apps/evolution/tasks/sources", existing_account_info, account->name, relative_uri); + relative_uri = g_strdup_printf ("%s:7181/soap", url->host); + modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, url->user, relative_uri); + modify_esource ("/apps/evolution/tasks/sources", existing_account_info, account->name, url->user, relative_uri); g_free (existing_account_info->name); g_free (existing_account_info->source_url); existing_account_info->name = g_strdup (account->name); |