From b9269bd09862b22a89d44a61a5eb728c28ec3761 Mon Sep 17 00:00:00 2001
From: Michael Zucci <zucchi@src.gnome.org>
Date: Fri, 6 May 2005 09:24:13 +0000
Subject: 	fix names so that intltool will parse as xml 	remove use of
 e-error-tool 	tag xml for translations where appropriate

svn path=/trunk/; revision=29304
---
 plugins/itip-formatter/ChangeLog                   |  7 +++++++
 plugins/itip-formatter/Makefile.am                 | 12 +++++------
 .../org-gnome-itip-formatter-errors.xml            |  8 --------
 .../org-gnome-itip-formatter.eplug.in              | 24 ----------------------
 .../org-gnome-itip-formatter.eplug.xml             | 24 ++++++++++++++++++++++
 .../org-gnome-itip-formatter.error.xml             |  8 ++++++++
 6 files changed, 45 insertions(+), 38 deletions(-)
 delete mode 100644 plugins/itip-formatter/org-gnome-itip-formatter-errors.xml
 delete mode 100644 plugins/itip-formatter/org-gnome-itip-formatter.eplug.in
 create mode 100644 plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
 create mode 100644 plugins/itip-formatter/org-gnome-itip-formatter.error.xml

(limited to 'plugins/itip-formatter')

diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 35de67ff8d..0e82acd81c 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-06  Not Zed  <NotZed@Ximian.com>
+
+	* org-gnome-itip-formatter.error.xml: s/-errors.xml/.error.xml/
+
+	* Makefile.am: 
+	* org-gnome-itip-formatter.eplug.xml: s/.in/.xml/ & i18n.
+
 2005-04-08  Chenthill Palanisamy  <pchenthill@novell.com>
 
 	Fixes #74265
diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am
index def2a59f4a..bd53e2a902 100644
--- a/plugins/itip-formatter/Makefile.am
+++ b/plugins/itip-formatter/Makefile.am
@@ -11,13 +11,13 @@ plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la
 liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h
 liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version
 
-error_DATA = org-gnome-itip-formatter-errors.xml
-error_i18n = $(error_DATA:.xml=.xml.h)
+error_DATA = org-gnome-itip-formatter.error
 errordir = $(privdatadir)/errors
-%.xml.h: %.xml
-	$(top_builddir)/e-util/e-error-tool $^
 
-BUILT_SOURCES = $(plugin_DATA) $(error_i18n)
+BUILT_SOURCES = $(plugin_DATA) $(error_DATA)
+
+EXTRA_DIST = $(error_DATA) \
+	org-gnome-itip-formatter.eplug.xml \
+	org-gnome-itip-formatter.error.xml
 
-EXTRA_DIST = $(error_DATA) $(error_i18n) org-gnome-itip-formatter.eplug.in
 
diff --git a/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml b/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml
deleted file mode 100644
index f8f462a1e8..0000000000
--- a/plugins/itip-formatter/org-gnome-itip-formatter-errors.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<error-list domain="org.gnome.itip-formatter">
-
- <error id="add-unknown-attendee" type="question">
-  <primary>This response is not from a current attendee.  Add the sender as an attendee?</primary>
- </error>
-
-</error-list>
diff --git a/plugins/itip-formatter/org-gnome-itip-formatter.eplug.in b/plugins/itip-formatter/org-gnome-itip-formatter.eplug.in
deleted file mode 100644
index 343793f11a..0000000000
--- a/plugins/itip-formatter/org-gnome-itip-formatter.eplug.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<e-plugin-list>
-	<e-plugin id="org.gnome.evolution.itip_formatter" 
-		type="shlib" name="Itip Formatter"
-		location="@PLUGINDIR@/liborg-gnome-itip-formatter.so">
-		<description>Displays text/calendar parts in messages.</description>
-		<author name="JP Rosevear" email="jpr@novell.com"/>
-	
-		<hook class="org.gnome.evolution.mail.format:1.0">
-			<group id="EMFormatHTMLDisplay">
-				<item mime_type="text/calendar" flags="inline_disposition" format="format_itip"/>
-			</group>
-			<group id="EMFormat">
-				<item mime_type="text/calendar" flags="inline_disposition" format="format_itip"/>
-			</group>
-		</hook>
-
-		<hook class="org.gnome.evolution.mail.config:1.0">
-			<group id="org.gnome.evolution.mail.prefs" target="prefs">
-				<item type="page" path="90.itip" label="itip" factory="itip_formatter_page_factory"/>
-			</group>
-		</hook>
-	</e-plugin>
-</e-plugin-list>
diff --git a/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml b/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
new file mode 100644
index 0000000000..ca18ef2adf
--- /dev/null
+++ b/plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<e-plugin-list>
+	<e-plugin id="org.gnome.evolution.itip_formatter" 
+		type="shlib" _name="Itip Formatter"
+		location="@PLUGINDIR@/liborg-gnome-itip-formatter.so">
+		<_description>Displays text/calendar parts in messages.</_description>
+		<author name="JP Rosevear" email="jpr@novell.com"/>
+	
+		<hook class="org.gnome.evolution.mail.format:1.0">
+			<group id="EMFormatHTMLDisplay">
+				<item mime_type="text/calendar" flags="inline_disposition" format="format_itip"/>
+			</group>
+			<group id="EMFormat">
+				<item mime_type="text/calendar" flags="inline_disposition" format="format_itip"/>
+			</group>
+		</hook>
+
+		<hook class="org.gnome.evolution.mail.config:1.0">
+			<group id="org.gnome.evolution.mail.prefs" target="prefs">
+				<item type="page" path="90.itip" label="itip" factory="itip_formatter_page_factory"/>
+			</group>
+		</hook>
+	</e-plugin>
+</e-plugin-list>
diff --git a/plugins/itip-formatter/org-gnome-itip-formatter.error.xml b/plugins/itip-formatter/org-gnome-itip-formatter.error.xml
new file mode 100644
index 0000000000..0dff527a0e
--- /dev/null
+++ b/plugins/itip-formatter/org-gnome-itip-formatter.error.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<error-list domain="org.gnome.itip-formatter">
+
+ <error id="add-unknown-attendee" type="question">
+  <_primary>This response is not from a current attendee.  Add the sender as an attendee?</_primary>
+ </error>
+
+</error-list>
-- 
cgit v1.2.3