fix error file build/path changes

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

        * Makefile.am: fix error file build/path changes

svn path=/trunk/; revision=29367

6 files changed, 32 insertions, 86 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7fe7be6b2e..6c9fd3977d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-16  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am: fix error file build/path changes
+
 2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
 	* e-component-registry.c(component_info_new) (component_info_free)(query_components):
 	  e-component-registry.h:
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 35a1c315ef..2b9367fc87 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -169,11 +169,9 @@ server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
-error_DATA = shell-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
+error_DATA = shell.error
 errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
+@EVO_PLUGIN_RULE@
 
 glade_DATA =						\
 	e-active-connection-dialog.glade
@@ -235,8 +233,7 @@ EXTRA_DIST = 					\
 	$(IDLS)					\
 	$(server_in_files)			\
 	GNOME_Evolution_Test.server.in.in	\
-	$(error_DATA)				\
-	$(error_i18n)				\
+	shell.error.xml				\
 	$(glade_DATA)				\
 	$(schema_in_files)			\
 	ChangeLog.pre-1-4			\
@@ -257,7 +254,7 @@ evolution.pure: evolution
 
 endif
 
-BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(testserver_DATA) $(DATASERVER_IDL_GENERATED) $(error_i18n)
+BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA) $(testserver_DATA) $(DATASERVER_IDL_GENERATED) $(error_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 8e70e7d0ed..44b05d0a2a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -32,7 +32,7 @@
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-bconf-map.h"
 #include "e-util/e-fsutils.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "e-shell-constants.h"
 #include "e-shell-offline-handler.h"
diff --git a/shell/main.c b/shell/main.c
index 11ee72a607..dc3910cd33 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -74,7 +74,7 @@
 #include "Evolution-DataServer.h"
 
 #include <gal/widgets/e-cursors.h>
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include <fcntl.h>
 #include <signal.h>
diff --git a/shell/shell-errors.xml.h b/shell/shell-errors.xml.h
deleted file mode 100644
index 8f32940169..0000000000
--- a/shell/shell-errors.xml.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* shell:upgrade-nospace primary */
-char *s = N_("Insufficient disk space for upgrade.");
-/* shell:upgrade-nospace secondary */
-char *s = N_("Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
-	"\n"
-	"You will need to make more space available in your home directory before you can continue.");
-/* shell:upgrade-failed primary */
-char *s = N_("Upgrade from previous version failed:\n"
-	"{0}");
-/* shell:upgrade-failed secondary */
-char *s = N_("{1}\n"
-	"\n"
-	"If you choose to continue, you may not have access to some of your old data.\n"
-	"");
-char *s = N_("Continue");
-/* shell:upgrade-remove-1-4 title */
-char *s = N_("Delete old data from version {0}?");
-/* shell:upgrade-remove-1-4 primary */
-char *s = N_("Delete old data from version {0}?");
-/* shell:upgrade-remove-1-4 secondary */
-char *s = N_("The previous version of evolution stored its data in a different location.\n"
-	"\n"
-	"If you choose to remove this data, the entire contents of the \"evolution\" directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of \"evolution\" at your convenience.\n"
-	"");
-char *s = N_("_Remind Me Later");
-char *s = N_("_Keep Data");
-/* shell:upgrade-remove-1-4-confirm title */
-char *s = N_("Really delete old data?");
-/* shell:upgrade-remove-1-4-confirm primary */
-char *s = N_("Really delete old data?");
-/* shell:upgrade-remove-1-4-confirm secondary */
-char *s = N_("The entire contents of the \"evolution\" directory is about to be be permanently removed.\n"
-	"\n"
-	"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
-	"\n"
-	"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
-	"");
-/* shell:noshell title */
-char *s = N_("Cannot start Evolution");
-/* shell:noshell primary */
-char *s = N_("Evolution can not start.");
-/* shell:noshell secondary */
-char *s = N_("Your system configuration does not match your Evolution configuration.\n"
-	"\n"
-	"Click help for details");
-/* shell:noshell-reason title */
-char *s = N_("Cannot start Evolution");
-/* shell:noshell-reason primary */
-char *s = N_("Evolution can not start.");
-/* shell:noshell-reason secondary */
-char *s = N_("Your system configuration does not match your Evolution configuration:\n"
-	"\n"
-	"{0}\n"
-	"\n"
-	"Click help for details.");
diff --git a/shell/shell-errors.xml b/shell/shell.error.xml
index 8e7d8678c6..390516a1de 100644
--- a/shell/shell-errors.xml
+++ b/shell/shell.error.xml
@@ -2,67 +2,67 @@
 <error-list domain="shell">
 
  <error id="upgrade-nospace" type="error">
-  <primary>Insufficient disk space for upgrade.</primary>
-  <secondary>Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.
+  <_primary>Insufficient disk space for upgrade.</_primary>
+  <_secondary xml:space="preserve">Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.
 
-You will need to make more space available in your home directory before you can continue.</secondary>
+You will need to make more space available in your home directory before you can continue.</_secondary>
   <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
  </error>
 
  <error id="upgrade-failed" type="error">
-  <primary>Upgrade from previous version failed:
-{0}</primary>
-  <secondary>{1}
+  <_primary>Upgrade from previous version failed:
+{0}</_primary>
+  <_secondary xml:space="preserve">{1}
 
 If you choose to continue, you may not have access to some of your old data.
-</secondary>
+</_secondary>
   <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
-  <button stock="gtk-ok" label="Continue" response="GTK_RESPONSE_OK"/>
+  <button stock="gtk-ok" _label="Continue" response="GTK_RESPONSE_OK"/>
  </error>
 
  <error id="upgrade-remove-1-4" type="question" default="GTK_RESPONSE_CANCEL">
   <title>Delete old data from version {0}?</title>
-  <primary>Delete old data from version {0}?</primary>
-  <secondary>The previous version of evolution stored its data in a different location.
+  <_primary>Delete old data from version {0}?</_primary>
+  <_secondary xml:space="preserve">The previous version of evolution stored its data in a different location.
 
 If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently.  If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.
-</secondary>
-  <button label="_Remind Me Later" response="GTK_RESPONSE_CANCEL"/>
-  <button label="_Keep Data" response="GTK_RESPONSE_ACCEPT"/>
+</_secondary>
+  <button _label="_Remind Me Later" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Keep Data" response="GTK_RESPONSE_ACCEPT"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
  </error>
 
  <error id="upgrade-remove-1-4-confirm" type="warning" default="GTK_RESPONSE_CANCEL">
   <title>Really delete old data?</title>
-  <primary>Really delete old data?</primary>
-  <secondary>The entire contents of the &quot;evolution&quot; directory is about to be be permanently removed.
+  <_primary>Really delete old data?</_primary>
+  <_secondary xml:space="preserve">The entire contents of the &quot;evolution&quot; directory is about to be be permanently removed.
 
 It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.
 
 Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.
-</secondary>
+</_secondary>
   <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
  </error>
 
  <error id="noshell" type="error">
   <title>Cannot start Evolution</title>
-  <primary>Evolution can not start.</primary>
-  <secondary>Your system configuration does not match your Evolution configuration.
+  <_primary>Evolution can not start.</_primary>
+  <_secondary xml:space="preserve">Your system configuration does not match your Evolution configuration.
 
-Click help for details</secondary>
+Click help for details</_secondary>
   <help uri="http://support.ximian.com/q?54"/>
   <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
  </error>
 
  <error id="noshell-reason" type="error">
   <title>Cannot start Evolution</title>
-  <primary>Evolution can not start.</primary>
-  <secondary>Your system configuration does not match your Evolution configuration:
+  <_primary>Evolution can not start.</_primary>
+  <_secondary xml:space="preserve">Your system configuration does not match your Evolution configuration:
 
 {0}
 
-Click help for details.</secondary>
+Click help for details.</_secondary>
   <help uri="http://support.ximian.com/q?54"/>
   <button stock="gtk-quit" response="GTK_RESPONSE_CANCEL"/>
  </error>