moved e-error to e-util

2005-05-16  Not Zed  <NotZed@Ximian.com>

        * moved e-error to e-util

        * Makefile.am: renamed error xml file & u18n stuff.

svn path=/trunk/; revision=29361

10 files changed, 115 insertions, 180 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index bcf6623141..3d76917669 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-16  Not Zed  <NotZed@Ximian.com>
+
+	* moved e-error to e-util
+
+	* Makefile.am: renamed error xml file & u18n stuff.
+
 2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
 
 	* gui/components/GNOME_Evolution_Addressbook.server.in.in: Added tooltips
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 4fde08a4a9..c1ff2aa617 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -5,19 +5,16 @@ endif
 SUBDIRS =	\
 	util printing gui importers tools $(CONDUIT_SUBDIR)
 
-error_DATA = addressbook-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
+error_DATA = addressbook.error
 errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
+@EVO_PLUGIN_RULE@
 
 EXTRA_DIST =			\
 	ChangeLog.pre-1-4	\
-	$(error_DATA)
+	addressbook.error.xml
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
-BUILT_SOURCES = $(error_i18n)
-
+BUILT_SOURCES = $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/addressbook/addressbook-errors.xml b/addressbook/addressbook-errors.xml
deleted file mode 100644
index fbcc3a0d78..0000000000
--- a/addressbook/addressbook-errors.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="addressbook">
-
- <error id="ldap-init" type="error" modal="true">
-  <primary>This addressbook could not be opened.</primary>
-  <secondary>This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down.</secondary>
- </error>
-
- <error id="ldap-auth" type="error" modal="true">
-  <primary>Failed to authenticate with LDAP server.</primary>
-  <secondary>Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on.</secondary>
- </error>
-
- <error id="ldap-search-base" type="error" modal="true">
-  <primary>This addressbook server does not have any suggested search bases.</primary>
-  <secondary>This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases.</secondary>
- </error>
-
- <error id="ldap-v3-schema" type="error" modal="true">
-  <primary>This server does not support LDAPv3 schema information.</primary>
- </error>
-
- <error id="ldap-get-schema" type="error" modal="true">
-  <primary>Could not get schema information for LDAP server.</primary>
- </error>
-
- <error id="ldap-invalid-schema" type="error" modal="true">
-  <primary>LDAP server did not respond with valid schema information.</primary>
- </error>
-
- <error id="remove-addressbook" type="error" modal="true">
-  <primary>Could not remove addressbook.</primary>
- </error>
-
- <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
-  <primary>Delete address book '{0}'?</primary>
-  <secondary>This address book will be removed permanently.</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="edit-categories" type="error">
-  <primary>Category editor not available.</primary>
- </error>
-
- <error id="generic-error" type="error">
-  <primary>{0}</primary>
-  <secondary>{1}</secondary>
- </error>
-
- <error id="load-error" type="error">
-  <title>Unable to open addressbook</title>
-  <primary>Error loading addressbook.</primary>
-  <secondary>{0}</secondary>
- </error>
-
- <error id="search-error" type="error">
-  <primary>Unable to perform search.</primary>
-  <secondary>{0}</secondary>
- </error>
-
- <error id="prompt-save" type="question" default="GTK_RESPONSE_YES">
-  <primary>Would you like to save your changes?</primary>
-  <secondary>You have made modifications to this contact. Do you want to save these changes?</secondary>
-  <button label="_Discard" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="prompt-move" type="question" default="GTK_RESPONSE_NO">
-  <primary>Cannot move contact.</primary>
-  <secondary>You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?</secondary>
-  <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
- </error>
-
- <error id="save-error" type="error">
-  <primary>Unable to save {0}.</primary>
-  <secondary>Error saving {0} to {1}: {2}</secondary>
- </error>
-
- <error id="backend-died" type="error">
-  <primary>The Evolution addressbook has quit unexpectedly.</primary>
-  <secondary>Your contacts for {0} will not be available until Evolution is restarted.</secondary>
- </error>
-
- <error id="ask-list-add-exists" type="question" default="GTK_RESPONSE_NO">
-  <primary>Address '{0}' already exists.</primary>
-  <secondary>A contact already exists with this address.  Would you like to add a new card with the same address anyway?</secondary>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-ok" label="_Add" response="GTK_RESPONSE_YES"/>
- </error>
- 
- <error id="server-version" type="warning">
-  <title>Server Version</title> 
-  <primary>Some features may not work properly with your current server</primary> 
-  <secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version</secondary>
- </error>
-
-</error-list>
diff --git a/addressbook/addressbook-errors.xml.h b/addressbook/addressbook-errors.xml.h
deleted file mode 100644
index ea676bce54..0000000000
--- a/addressbook/addressbook-errors.xml.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* addressbook:ldap-init primary */
-char *s = N_("This addressbook could not be opened.");
-/* addressbook:ldap-init secondary */
-char *s = N_("This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down.");
-/* addressbook:ldap-auth primary */
-char *s = N_("Failed to authenticate with LDAP server.");
-/* addressbook:ldap-auth secondary */
-char *s = N_("Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on.");
-/* addressbook:ldap-search-base primary */
-char *s = N_("This addressbook server does not have any suggested search bases.");
-/* addressbook:ldap-search-base secondary */
-char *s = N_("This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases.");
-/* addressbook:ldap-v3-schema primary */
-char *s = N_("This server does not support LDAPv3 schema information.");
-/* addressbook:ldap-get-schema primary */
-char *s = N_("Could not get schema information for LDAP server.");
-/* addressbook:ldap-invalid-schema primary */
-char *s = N_("LDAP server did not respond with valid schema information.");
-/* addressbook:remove-addressbook primary */
-char *s = N_("Could not remove addressbook.");
-/* addressbook:ask-delete-addressbook primary */
-char *s = N_("Delete address book '{0}'?");
-/* addressbook:ask-delete-addressbook secondary */
-char *s = N_("This address book will be removed permanently.");
-/* addressbook:edit-categories primary */
-char *s = N_("Category editor not available.");
-/* addressbook:generic-error primary */
-char *s = N_("{0}");
-/* addressbook:generic-error secondary */
-char *s = N_("{1}");
-/* addressbook:load-error title */
-char *s = N_("Unable to open addressbook");
-/* addressbook:load-error primary */
-char *s = N_("Error loading addressbook.");
-/* addressbook:load-error secondary */
-char *s = N_("{0}");
-/* addressbook:search-error primary */
-char *s = N_("Unable to perform search.");
-/* addressbook:search-error secondary */
-char *s = N_("{0}");
-/* addressbook:prompt-save primary */
-char *s = N_("Would you like to save your changes?");
-/* addressbook:prompt-save secondary */
-char *s = N_("You have made modifications to this contact. Do you want to save these changes?");
-char *s = N_("_Discard");
-/* addressbook:prompt-move primary */
-char *s = N_("Cannot move contact.");
-/* addressbook:prompt-move secondary */
-char *s = N_("You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?");
-/* addressbook:save-error primary */
-char *s = N_("Unable to save contact(s).");
-/* addressbook:save-error secondary */
-char *s = N_("Error saving contacts to {0}: {1}");
-/* addressbook:backend-died primary */
-char *s = N_("The Evolution addressbook has quit unexpectedly.");
-/* addressbook:backend-died secondary */
-char *s = N_("Your contacts for {0} will not be available until Evolution is restarted.");
-/* addressbook:ask-list-add-exists primary */
-char *s = N_("Address '{0}' already exists.");
-/* addressbook:ask-list-add-exists secondary */
-char *s = N_("A contact already exists with this address.  Would you like to add a new card with the same address anyway?");
-char *s = N_("_Add");
-/* addressbook:server-version title */
-char *s = N_("Server Version");
-/* addressbook:server-version primary */
-char *s = N_("Some features may not work properly with your current server");
-/* addressbook:server-version secondary */
-char *s = N_("You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version");
diff --git a/addressbook/addressbook.error.xml b/addressbook/addressbook.error.xml
new file mode 100644
index 0000000000..523d420ce3
--- /dev/null
+++ b/addressbook/addressbook.error.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="addressbook">
+
+ <error id="ldap-init" type="error" modal="true">
+  <_primary>This addressbook could not be opened.</_primary>
+  <_secondary>This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down.</_secondary>
+ </error>
+
+ <error id="ldap-auth" type="error" modal="true">
+  <_primary>Failed to authenticate with LDAP server.</_primary>
+  <_secondary>Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on.</_secondary>
+ </error>
+
+ <error id="ldap-search-base" type="error" modal="true">
+  <_primary>This addressbook server does not have any suggested search bases.</_primary>
+  <_secondary>This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases.</_secondary>
+ </error>
+
+ <error id="ldap-v3-schema" type="error" modal="true">
+  <_primary>This server does not support LDAPv3 schema information.</_primary>
+ </error>
+
+ <error id="ldap-get-schema" type="error" modal="true">
+  <_primary>Could not get schema information for LDAP server.</_primary>
+ </error>
+
+ <error id="ldap-invalid-schema" type="error" modal="true">
+  <_primary>LDAP server did not respond with valid schema information.</_primary>
+ </error>
+
+ <error id="remove-addressbook" type="error" modal="true">
+  <_primary>Could not remove addressbook.</_primary>
+ </error>
+
+ <error id="ask-delete-addressbook" type="question" modal="true" default="GTK_RESPONSE_CANCEL">
+  <_primary>Delete address book '{0}'?</_primary>
+  <_secondary>This address book will be removed permanently.</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button stock="gtk-delete" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="edit-categories" type="error">
+  <_primary>Category editor not available.</_primary>
+ </error>
+
+ <error id="generic-error" type="error">
+  <_primary>{0}</_primary>
+  <_secondary>{1}</_secondary>
+ </error>
+
+ <error id="load-error" type="error">
+  <_title>Unable to open addressbook</_title>
+  <_primary>Error loading addressbook.</_primary>
+  <_secondary>{0}</_secondary>
+ </error>
+
+ <error id="search-error" type="error">
+  <_primary>Unable to perform search.</_primary>
+  <_secondary>{0}</_secondary>
+ </error>
+
+ <error id="prompt-save" type="question" default="GTK_RESPONSE_YES">
+  <_primary>Would you like to save your changes?</_primary>
+  <_secondary>You have made modifications to this contact. Do you want to save these changes?</_secondary>
+  <button _label="_Discard" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button stock="gtk-save" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="prompt-move" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Cannot move contact.</_primary>
+  <_secondary>You are attempting to move a contact from one addressbook to another but it cannot be removed from the source. Do you want to save a copy instead?</_secondary>
+  <button stock="gtk-no" response="GTK_RESPONSE_NO"/>
+  <button stock="gtk-yes" response="GTK_RESPONSE_YES"/>
+ </error>
+
+ <error id="save-error" type="error">
+  <_primary>Unable to save {0}.</_primary>
+  <_secondary>Error saving {0} to {1}: {2}</_secondary>
+ </error>
+
+ <error id="backend-died" type="error">
+  <_primary>The Evolution addressbook has quit unexpectedly.</_primary>
+  <_secondary>Your contacts for {0} will not be available until Evolution is restarted.</_secondary>
+ </error>
+
+ <error id="ask-list-add-exists" type="question" default="GTK_RESPONSE_NO">
+  <_primary>Address '{0}' already exists.</_primary>
+  <_secondary>A contact already exists with this address.  Would you like to add a new card with the same address anyway?</_secondary>
+  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+  <button stock="gtk-ok" _label="_Add" response="GTK_RESPONSE_YES"/>
+ </error>
+ 
+ <error id="server-version" type="warning">
+  <_title>Server Version</_title> 
+  <_primary>Some features may not work properly with your current server</_primary> 
+  <_secondary>You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version</_secondary>
+ </error>
+
+</error-list>
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 4cc2bab348..0ad0d0d714 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -40,7 +40,7 @@
 #include "addressbook-component.h"
 #include "addressbook-config.h"
 
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "evolution-config-control.h"
 
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index c4dcc00d40..7a7d6d801e 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -42,7 +42,7 @@
 #include <libedataserverui/e-source-selector.h>
 #include <libedataserverui/e-passwords.h>
 
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "widgets/misc/e-task-bar.h"
 #include "widgets/misc/e-info-label.h"
 
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index fa1fd8fb60..aa70808942 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -29,7 +29,7 @@
 #include <libebook/e-book.h>
 #include <libedataserverui/e-passwords.h>
 
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "addressbook.h"
 
 #define d(x)
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 2cd7984337..c798267789 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -54,7 +54,7 @@
 #include "addressbook/printing/e-contact-print-envelope.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
 #include "e-util/e-gui-utils.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 #include "widgets/misc/e-dateedit.h"
 #include "widgets/misc/e-image-chooser.h"
 #include "widgets/misc/e-url-entry.h"
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index 4560413c19..c75bbb95d7 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -3,7 +3,7 @@
 #include <config.h>
 #include <string.h>
 #include "e-contact-list-model.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include <gtk/gtkmessagedialog.h>
 #define PARENT_TYPE e_table_model_get_type()