From a941352c299c6fe0587c43dfa27b40d491e2f205 Mon Sep 17 00:00:00 2001
From: Johnny Jacob <jjohnny@src.gnome.org>
Date: Mon, 20 Aug 2007 04:38:18 +0000
Subject: Fix for 468159 from Gilles Dartiguelongue <gdartigu@svn.gnome.org>

--This line, and th se below, will be ignored--

A    plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
M    plugins/attachment-reminder/ChangeLog
M    plugins/attachment-reminder/Makefile.am
D    plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in
M    plugins/tnef-attachments/Makefile.am

svn path=/trunk/; revision=34040
---
 plugins/attachment-reminder/ChangeLog              | 10 ++++++
 plugins/attachment-reminder/Makefile.am            |  7 ++--
 .../apps-evolution-attachment-reminder.schemas.in  | 41 ++++++++++++++++++++++
 ...pps-evolution-attachment-reminder.schemas.in.in | 41 ----------------------
 plugins/tnef-attachments/Makefile.am               |  2 +-
 5 files changed, 54 insertions(+), 47 deletions(-)
 create mode 100644 plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
 delete mode 100644 plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in

(limited to 'plugins')

diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog
index 59e2a98020..0cd6d5ee9b 100644
--- a/plugins/attachment-reminder/ChangeLog
+++ b/plugins/attachment-reminder/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-20  Johnny Jacob  <jjohnny@novell.com>	
+
+	** Fix for 468159 from Gilles Dartiguelongue
+	<gdartigu@svn.gnome.org>
+	
+	* apps-evolution-attachment-reminder.schemas.in.in : Renamed to
+	apps-evolution-attachment-reminder.schemas.in
+
+	* Makefile.am : Removed usage of BASE_VERSION
+	
 2007-08-03  Johnny Jacob  <jjohnny@novell.com>
 
 	* org-gnome-attachment-reminder.errors.xml: Renamed to
diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am
index 3a4c8b62ac..79e4271370 100644
--- a/plugins/attachment-reminder/Makefile.am
+++ b/plugins/attachment-reminder/Makefile.am
@@ -22,11 +22,8 @@ liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c
 liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-attachment-reminder.schemas.in.in
-schema_DATA     = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = apps-evolution-attachment-reminder.schemas.in
+schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
diff --git a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
new file mode 100644
index 0000000000..e8b62241e4
--- /dev/null
+++ b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
@@ -0,0 +1,41 @@
+<gconfschemafile>
+  <schemalist>
+    <schema>
+      <key>/schemas/apps/evolution/mail/prompts/attachment_presend_check</key>
+      <applyto>/apps/evolution/mail/prompts/attachment_presend_check</applyto>
+      <owner>evolution-mail</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Enable attachment reminder plugin</short>
+        <long>Enable attachment reminder plugin</long>
+      </locale>
+    </schema>
+
+
+    <!-- Labels and Colours -->
+
+    <schema>
+      <key>/schemas/apps/evolution/mail/attachment_reminder_clues</key>
+      <applyto>/apps/evolution/mail/attachment_reminder_clues</applyto>
+      <owner>evolution-mail</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+
+      <!-- The following are the keywords used by the plugin to understand
+      whether the user wanted to send a attachment. The list can have any
+      number of strings.-->
+
+      <default>[attachment,attaching,attached,enclosed]</default>
+      <locale name="C">
+         <short>List of clues for the attachment reminder plugin to look for
+	       in a message body</short>
+         <long>
+	       List of clues for the attachment reminder plugin to look for
+	       in a message body
+         </long>
+      </locale>
+    </schema>
+  </schemalist>
+</gconfschemafile>
+
diff --git a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in b/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in
deleted file mode 100644
index e8b62241e4..0000000000
--- a/plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.in
+++ /dev/null
@@ -1,41 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/attachment_presend_check</key>
-      <applyto>/apps/evolution/mail/prompts/attachment_presend_check</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Enable attachment reminder plugin</short>
-        <long>Enable attachment reminder plugin</long>
-      </locale>
-    </schema>
-
-
-    <!-- Labels and Colours -->
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/attachment_reminder_clues</key>
-      <applyto>/apps/evolution/mail/attachment_reminder_clues</applyto>
-      <owner>evolution-mail</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-
-      <!-- The following are the keywords used by the plugin to understand
-      whether the user wanted to send a attachment. The list can have any
-      number of strings.-->
-
-      <default>[attachment,attaching,attached,enclosed]</default>
-      <locale name="C">
-         <short>List of clues for the attachment reminder plugin to look for
-	       in a message body</short>
-         <long>
-	       List of clues for the attachment reminder plugin to look for
-	       in a message body
-         </long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
-
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index 5f9c56b242..c6fe9a1d34 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
-	-DLOCALEDIR="\"$(LOCALEDIR)\""			\	
+	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
 	$(EVOLUTION_MAIL_CFLAGS)
 
 @EVO_PLUGIN_RULE@
-- 
cgit v1.2.3