From affa9b892f22cc550e09ef760b8d8345997893a3 Mon Sep 17 00:00:00 2001 From: Sarfraaz Ahmed Date: Thu, 21 Jul 2005 14:46:34 +0000 Subject: Rescan the tree before fetching the folder list. Similar Dont add the 2005-07-21 Sarfraaz Ahmed * exchange-calendar.c (e_exchange_calendar_get_calendars): Rescan the tree before fetching the folder list. * exchange-contacts.c (e_exchange_contacts_get_contacts): Similar * exchange-config-listener.c (account_added): Dont add the sources here now. Its now taken care while the folders are being created in e-d-s. * exchange-folder.c (org_gnome_exchange_folder_subscription): Dont add the esources here. svn path=/trunk/; revision=29834 --- plugins/exchange-operations/ChangeLog | 10 ++++++++++ plugins/exchange-operations/exchange-calendar.c | 1 + plugins/exchange-operations/exchange-config-listener.c | 1 - plugins/exchange-operations/exchange-contacts.c | 1 + plugins/exchange-operations/exchange-folder.c | 9 +++++---- 5 files changed, 17 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 7b8deec265..35b78be998 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,13 @@ +2005-07-21 Sarfraaz Ahmed + + * exchange-calendar.c (e_exchange_calendar_get_calendars): Rescan the + tree before fetching the folder list. + * exchange-contacts.c (e_exchange_contacts_get_contacts): Similar + * exchange-config-listener.c (account_added): Dont add the sources here + now. Its now taken care while the folders are being created in e-d-s. + * exchange-folder.c (org_gnome_exchange_folder_subscription): Dont add + the esources here. + 2005-07-19 Shakti Sen * exchange-permissions-dialog.c (display_role, get_widgets): diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index d078089910..ab3726d990 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -84,6 +84,7 @@ e_exchange_calendar_get_calendars (ECalSourceType *ftype) calendar_list = g_ptr_array_new (); + exchange_account_rescan_tree (account); folder_array = exchange_account_get_folders (account); for (i=0; ilen; ++i) { diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index ffacddf911..41134c0887 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -874,7 +874,6 @@ account_added (EAccountList *account_list, EAccount *account) exchange_account_connect (exchange_account, NULL, &result); if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS) exchange_operations_report_error (exchange_account, result); - add_new_sources (exchange_account); } struct account_update_data { diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index 623699a31c..a0a9bf87a4 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -71,6 +71,7 @@ e_exchange_contacts_get_contacts (void) prefix_len = strlen (uri_prefix); contacts_list = g_ptr_array_new (); + exchange_account_rescan_tree (account); folder_array = exchange_account_get_folders (account); for (i=0; ilen; ++i) { diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index c22c1e90dd..4c20c54136 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -388,7 +388,7 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target) if (!folder) { return; } - +#if 0 hier = e_folder_exchange_get_hierarchy (folder); folder_display_name = g_strdup_printf ("%s's %s", hier->owner_name, folder_name); folder_type = (gchar *) e_folder_get_type_string (folder); @@ -405,9 +405,10 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target) !(strcmp (folder_type, "contacts/public")) || !(strcmp (folder_type, "contacts/ldap"))) { add_folder_esource (account, EXCHANGE_CONTACTS_FOLDER, folder_display_name, physical_uri); -} + } -g_free (folder_display_name); -exchange_account_open_folder (account, g_strdup_printf ("/%s", user_email_address)); + g_free (folder_display_name); +#endif + exchange_account_open_folder (account, g_strdup_printf ("/%s", user_email_address)); } -- cgit v1.2.3