aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/exchange-operations
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2005-12-12 16:16:54 +0800
committerSushma Rai <rsushma@src.gnome.org>2005-12-12 16:16:54 +0800
commit0bf183b70276a6d7028d068741a66dafd21157ff (patch)
tree8cae9a3859bda361b37b3ff580eedcc469afb126 /plugins/exchange-operations
parent570c6e6525366d4b0c464590ba7394d9504e5277 (diff)
downloadgsoc2013-evolution-0bf183b70276a6d7028d068741a66dafd21157ff.tar
gsoc2013-evolution-0bf183b70276a6d7028d068741a66dafd21157ff.tar.gz
gsoc2013-evolution-0bf183b70276a6d7028d068741a66dafd21157ff.tar.bz2
gsoc2013-evolution-0bf183b70276a6d7028d068741a66dafd21157ff.tar.lz
gsoc2013-evolution-0bf183b70276a6d7028d068741a66dafd21157ff.tar.xz
gsoc2013-evolution-0bf183b70276a6d7028d068741a66dafd21157ff.tar.zst
gsoc2013-evolution-0bf183b70276a6d7028d068741a66dafd21157ff.zip
Using the proper error code, and also removed hard coded URL from
translatable string. svn path=/trunk/; revision=30755
Diffstat (limited to 'plugins/exchange-operations')
-rw-r--r--plugins/exchange-operations/ChangeLog9
-rw-r--r--plugins/exchange-operations/exchange-account-setup.c4
-rw-r--r--plugins/exchange-operations/org-gnome-exchange-operations.error.xml6
3 files changed, 15 insertions, 4 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 3aae236573..98baae1519 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-12 Sushma Rai <rsushma@novell.com>
+
+ * exchange-account-setup.c (print_error): Passing the support URL to
+ e_error_run(), so that hardcoded URL won't be marked for translation.
+ See #272514.
+ * org-gnome-exchange-operations.error.xml: Uisng the correct error code
+ "connect-exchange-error". Changed the primary message to more
+ appropriate one. Also removed hard coded URL.
+
2005-12-12 Harish Krishnaswamy <kharish@novell.com>
* Makefile.am: Add primary CLEANFILES,
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index cac2c33395..c4f5bc3ed8 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -407,7 +407,9 @@ print_error (const char *owa_url, E2kAutoconfigResult result)
break;
case E2K_AUTOCONFIG_CANT_BPROPFIND:
- e_error_run (NULL, ERROR_DOMAIN ":connect-exchange-error", NULL);
+ e_error_run (NULL, ERROR_DOMAIN ":connect-exchange-error",
+ "http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html",
+ NULL);
break;
case E2K_AUTOCONFIG_EXCHANGE_5_5:
diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
index 44200da47b..4563d52857 100644
--- a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
+++ b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml
@@ -115,8 +115,8 @@ supports Microsoft Exchange 2000 and 2003 only.</_secondary>
<_secondary>Your current usage is : {0}KB. Try to clear up some space by deleting some mails.</_secondary>
</error>
- <error id="connector-exchange-error" type="error">
- <_primary>Exchange Connector access error.</_primary>
+ <error id="connect-exchange-error" type="error">
+ <_primary>Could not connect to Exchange server.</_primary>
<_secondary xml:space="preserve">Exchange Connector requires access to certain
functionality on the Exchange Server that appears
to be disabled or blocked. (This is usually
@@ -127,7 +127,7 @@ you to be able to use Ximian Connector.
For information to provide to your Exchange
administrator, please follow the link below:
-http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html
+{0}
</_secondary>
</error>