diff options
| -rw-r--r-- | plugins/exchange-operations/ChangeLog | 9 | ||||
| -rw-r--r-- | plugins/exchange-operations/exchange-folder-subscription.c | 3 | ||||
| -rw-r--r-- | plugins/exchange-operations/org-gnome-exchange-operations.error.xml | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 5386d2bbfd..1ab777f81a 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,12 @@ +2008-07-11 Bharath Acharya <abharath@novell.com> + + ** Fix for bug #542149 + + * exchange-folder-subscription.c: (subscribe_to_folder): Display an + error message to restart if user tries to subscribe to other's mailbox. + * org-gnome-exchange-operations.error.xml: Added the corresponding + error message. + 2008-06-16 Milan Crha <mcrha@redhat.com> ** Fix for bug #273627 diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index 021a06434b..9706dd29ab 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -237,9 +237,12 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data) user_email_address, folder_name, &folder); g_free (folder_name); + gtk_widget_hide (dialog); switch (result) { case EXCHANGE_ACCOUNT_FOLDER_OK: exchange_account_rescan_tree (subscription_info->account); + if (!g_ascii_strcasecmp (e_folder_get_type_string (folder), "mail")) + e_error_run (NULL, ERROR_DOMAIN ":folder-restart-evo", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS: e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL); diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml index 0aa4b6fb79..c162f365ec 100644 --- a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml +++ b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml @@ -221,6 +221,10 @@ username, and password, and try again.</_secondary> <_primary>Folder already exists</_primary> </error> + <error id="folder-restart-evo" type="error"> + <_primary>Evolution requires a restart to load the subscribed user's mailbox</_primary> + </error> + <error id="folder-doesnt-exist-error" type="error"> <_primary>Folder does not exist</_primary> </error> |