From 401a1b85c6a5c5988cda3a2075e8320ed1d58daf Mon Sep 17 00:00:00 2001
From: Sushma Rai <rsushma@src.gnome.org>
Date: Mon, 24 Jul 2006 10:26:02 +0000
Subject: Handling the errors EXCHANGE_ACCOUNT_FOLDER_GC_NOTREACHABLE and
 EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER. Added an error code folder-no-gc-error
 and corresponding error string. Fixes #234359.

svn path=/trunk/; revision=32403
---
 plugins/exchange-operations/ChangeLog                            | 9 +++++++++
 plugins/exchange-operations/exchange-folder-subscription.c       | 6 ++++++
 .../exchange-operations/org-gnome-exchange-operations.error.xml  | 5 +++++
 3 files changed, 20 insertions(+)

diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 014968dc71..e20b955c63 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-24  Sushma Rai  <rsushma@novell.com>
+
+	* exchange-folder-subscription.c (subscribe_to_folder): Handling the 
+	errors EXCHANGE_ACCOUNT_FOLDER_GC_NOTREACHABLE and 
+	EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER.
+
+	* org-gnome-exchange-operations.error.xml: Added an error code 
+	folder-no-gc-error and corresponding error string. Fixes #234359. 
+
 2006-07-22  Sushma Rai  <rsushma@novell.com>
 
 	* exchange-folder-subscription.c (subscribe_to_folder): Checking if a 
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 2c75af875b..19f84d1cdc 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -259,6 +259,12 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 				case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION:
 					e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL);
 					break;
+				case EXCHANGE_ACCOUNT_FOLDER_GC_NOTREACHABLE:
+					e_error_run (NULL, ERROR_DOMAIN ":folder-no-gc-error", NULL);
+					break;
+				case EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER:
+					e_error_run (NULL, ERROR_DOMAIN ":no-user-error", user_email_address, NULL);
+					break;
 				case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 					e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
 					break;
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
index adbb2010cd..be43a0e57c 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
@@ -232,6 +232,11 @@ username, and password, and try again.</_secondary>
   <_primary>Unsupported operation</_primary>
  </error>
 
+ <error id="folder-no-gc-error" type="error">
+  <_primary>Global Catalog Server is not reachable</_primary>
+  <_secondary>Please make sure the Global Catalog Sever name is correct.</_secondary> 
+ </error>
+
  <error id="folder-generic-error" type="error">
   <_primary>Generic error</_primary>
  </error>
-- 
cgit v1.2.3