Evolution Exchange Connector: UI freeze clarification

[Praveen Kumar <kpraveen novell com>]

Hello -

I am attaching a patch that fixes the bug 311712 in the Exchange
Connector component of Evolution. The current version at HEAD doesn't
report error on failure of folder subscription. The attached patch fixes
it by popping up the error dialog. These error dialogs are not new to
the application as they (dialogs with same error messages) are used at
various other places. But they are new to the part of code that was
fixed. I am wondering if this would affect the UI freeze. Can you please
let me know your suggestion on committing this fix to the HEAD?

Thanks -
Praveen.

Index: plugins/exchange-operations/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/ChangeLog,v
retrieving revision 1.35
diff -u -p -r1.35 ChangeLog
--- plugins/exchange-operations/ChangeLog	27 Jul 2005 09:12:38 -0000	1.35
+++ plugins/exchange-operations/ChangeLog	27 Jul 2005 12:16:06 -0000
@@ -1,3 +1,8 @@
+2005-07-27  Praveen Kumar <kpraveen novell com>
+
+	* exchange-folder.c (org_gnome_exchange_folder_subscription) : Handle
+	error conditions if folder subscription fails. Fixes bug 311712
+	
 2005-07-27  Harry Lu  <harry lu sun com>
 
 	Only show the unsubscribe menu if it is an exchange folder.
Index: plugins/exchange-operations/exchange-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder.c,v
retrieving revision 1.5
diff -u -p -r1.5 exchange-folder.c
--- plugins/exchange-operations/exchange-folder.c	27 Jul 2005 09:12:38 -0000	1.5
+++ plugins/exchange-operations/exchange-folder.c	27 Jul 2005 12:16:07 -0000
@@ -33,6 +33,8 @@
 #include <mail/em-popup.h>
 #include <mail/em-menu.h>
 #include <libedataserverui/e-source-selector.h>
+#include <e-util/e-error.h>
+
 #include "exchange-operations.h"
 #include "addressbook/gui/widgets/eab-popup.h"
 #include "exchange-folder-subscription.h"
@@ -396,33 +398,38 @@ org_gnome_exchange_folder_subscription (
 
 	create_folder_subscription_dialog (account->account_name, &user_email_address, &folder_name);
 
-	if (user_email_address && folder_name)
+	if (user_email_address && folder_name) {
 		result = exchange_account_discover_shared_folder (account, user_email_address, folder_name, &folder);
+		
+		switch (result) {
+		case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS:
+			e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL);
+			return;
+		case EXCHANGE_ACCOUNT_FOLDER_DOES_NOT_EXIST:
+			e_error_run (NULL, ERROR_DOMAIN ":folder-doesnt-exist-error", NULL);
+			return;
+		case EXCHANGE_ACCOUNT_FOLDER_UNKNOWN_TYPE:
+			e_error_run (NULL, ERROR_DOMAIN ":folder-unknown-type", NULL);
+		return;
+		case EXCHANGE_ACCOUNT_FOLDER_PERMISSION_DENIED:
+			e_error_run (NULL, ERROR_DOMAIN ":folder-perm-error", NULL);
+			return;
+		case EXCHANGE_ACCOUNT_FOLDER_OFFLINE:
+			e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL);
+			return;
+		case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION:
+			e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL);
+			return;
+		case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:		
+			e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
+			return;		
+		}
+	}
 
 	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);
-	physical_uri = (gchar *) e_folder_get_physical_uri (folder);
-	if (!(strcmp (folder_type, "calendar")) ||
-	    !(strcmp (folder_type, "calendar/public"))) {
-			add_folder_esource (account, EXCHANGE_CALENDAR_FOLDER, folder_display_name, physical_uri);
-	}
-	else if (!(strcmp (folder_type, "tasks")) ||
-		 !(strcmp (folder_type, "tasks/public"))) {
-			add_folder_esource (account, EXCHANGE_TASKS_FOLDER, folder_display_name, physical_uri);
-	}
-	else if (!(strcmp (folder_type, "contacts")) ||
-		 !(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);
-#endif
 	exchange_account_open_folder (account, g_strdup_printf ("/%s", user_email_address));
 }