Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/ChangeLog,v
retrieving revision 1.59
diff -u -p -r1.59 ChangeLog
--- ChangeLog	3 Oct 2005 11:33:31 -0000	1.59
+++ ChangeLog	7 Oct 2005 10:47:38 -0000
@@ -1,3 +1,10 @@
+2005-10-07  Shakti Sen <shprasad@novell.com>
+
+	* exchange-folder.c (org_gnome_exchange_folder_subscription): Throws
+	an appropriate error message.
+
+	Fixes bug #234359.
+
 2005-10-03  Shakti Sen <shprasad@novell.com>
 
 	* exchange-folder-permission.c (org_gnome_exchange_folder_permissions),
Index: exchange-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder.c,v
retrieving revision 1.15
diff -u -p -r1.15 exchange-folder.c
--- exchange-folder.c	3 Oct 2005 11:33:31 -0000	1.15
+++ exchange-folder.c	7 Oct 2005 10:47:38 -0000
@@ -598,7 +598,7 @@ org_gnome_exchange_folder_subscription (
 			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);
+			e_error_run (NULL, ERROR_DOMAIN ":gal-setup-error", NULL);
 			return;
 		case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:		
 			e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
Index: org-gnome-exchange-operations.error.xml
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-exchange-operations.error.xml,v
retrieving revision 1.2
diff -u -p -r1.2 org-gnome-exchange-operations.error.xml
--- org-gnome-exchange-operations.error.xml	25 Jul 2005 06:12:03 -0000	1.2
+++ org-gnome-exchange-operations.error.xml	7 Oct 2005 10:47:38 -0000
@@ -227,6 +227,11 @@ username, and password, and try again.</
   <_primary>Unsupported operation</_primary>
  </error>
 
+ <error id="gal-setup-error" type="error">
+  <_primary>Unsupported operation</_primary>
+  <_secondary>This either means you have entered an incorrect URI, or the Global Catelog server is unreachable.</_secondary>
+ </error>
+
  <error id="folder-generic-error" type="error">
   <_primary>Generic error</_primary>
  </error>
