evolution r35779 - trunk/plugins/exchange-operations

[abharath svn gnome org]

Author: abharath
Date: Sun Jul 20 17:15:08 2008
New Revision: 35779
URL: http://svn.gnome.org/viewvc/evolution?rev=35779&view=rev

Log:
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.


Modified:
   trunk/plugins/exchange-operations/ChangeLog
   trunk/plugins/exchange-operations/exchange-folder-subscription.c
   trunk/plugins/exchange-operations/org-gnome-exchange-operations.error.xml

Modified: trunk/plugins/exchange-operations/exchange-folder-subscription.c
==============================================================================
--- trunk/plugins/exchange-operations/exchange-folder-subscription.c	(original)
+++ trunk/plugins/exchange-operations/exchange-folder-subscription.c	Sun Jul 20 17:15:08 2008
@@ -237,9 +237,12 @@
 									  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);

Modified: trunk/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
==============================================================================
--- trunk/plugins/exchange-operations/org-gnome-exchange-operations.error.xml	(original)
+++ trunk/plugins/exchange-operations/org-gnome-exchange-operations.error.xml	Sun Jul 20 17:15:08 2008
@@ -221,6 +221,10 @@
   <_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>