From dee3e832b9dfb54a8b9dea7daa398bb07e4f6190 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@ximian.com>
Date: Fri, 2 Mar 2001 19:43:11 +0000
Subject: install conduit icons

2001-03-02  JP Rosevear  <jpr@ximian.com>

	* art/Makefile.am: install conduit icons

2001-03-02  JP Rosevear  <jpr@ximian.com>

	* conduit/Makefile.am: update sed script

	* conduit/e-address.conduit.in: update for new pilot foo

2001-03-02  JP Rosevear  <jpr@ximian.com>

	* conduits/todo/e-todo.conduit.in: update for new pilot foo

	* conduits/calendar/e-calendar.conduit.in: ditto

	* conduits/todo/Makefile.am: update sed script

	* conduits/calendar/Makefile.am: ditto

svn path=/trunk/; revision=8529
---
 calendar/ChangeLog                               | 10 ++++++++++
 calendar/conduits/calendar/Makefile.am           |  4 +++-
 calendar/conduits/calendar/e-calendar.conduit.in | 13 +++++++------
 calendar/conduits/todo/Makefile.am               |  4 +++-
 calendar/conduits/todo/e-todo.conduit.in         | 13 +++++++------
 5 files changed, 30 insertions(+), 14 deletions(-)

(limited to 'calendar')

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fb99a66a08..983a58ad73 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-02  JP Rosevear  <jpr@ximian.com>
+
+	* conduits/todo/e-todo.conduit.in: update for new pilot foo
+
+	* conduits/calendar/e-calendar.conduit.in: ditto
+
+	* conduits/todo/Makefile.am: update sed script
+
+	* conduits/calendar/Makefile.am: ditto
+
 2001-02-28  Federico Mena Quintero  <federico@ximian.com>
 
 	* gui/event-editor.c (recurrence_exception_select_row_cb): New
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index 9349cd518b..18f578cfc3 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -46,7 +46,9 @@ libecalendar_conduit_la_LIBADD = 					\
 	$(GNOME_LIBS)
 
 e-calendar.conduit: e-calendar.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp \
+	sed -e 's^\@prefix\@^$(prefix)^g' 				\
+	    -e 's^\@datadir\@^$(datadir)^g' 				\
+	    < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp 	\
 	&& mv e-calendar.conduit.tmp e-calendar.conduit
 
 ccenterdir = $(datadir)/control-center
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
index 6143978e8b..86cfbeecba 100644
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ b/calendar/conduits/calendar/e-calendar.conduit.in
@@ -1,8 +1,9 @@
 <gnome-pilot-conduit version="1.0">
-<conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
-<name value="ECalendar"/>
-<conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
+	<conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
+	<name value="ECalendar"/>
+	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
+	<conduit-attribute name="default-synctype" value="synchronize"/>
+	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
+     	<conduit-attribute name="settings" value="FALSE"/>
+	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-calendar-conduit.png"/>
 </gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index ea7b628b15..496680e0ea 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -47,7 +47,9 @@ libetodo_conduit_la_LIBADD = 						\
 	$(GNOME_LIBS)
 
 e-todo.conduit: e-todo.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp \
+	sed -e 's^\@prefix\@^$(prefix)^g' 				\
+	    -e 's^\@datadir\@^$(datadir)^g' 				\
+	    < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp 		\
 	&& mv e-todo.conduit.tmp e-todo.conduit
 
 
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
index 40e6fd620c..733c2105db 100644
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ b/calendar/conduits/todo/e-todo.conduit.in
@@ -1,8 +1,9 @@
 <gnome-pilot-conduit version="1.0">
-<conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
-<name value="EToDo"/>
-<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
+	<conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
+	<name value="EToDo"/>
+	<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
+	<conduit-attribute name="default-synctype" value="synchronize"/>
+	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
+     	<conduit-attribute name="settings" value="FALSE"/>
+	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-todo-conduit.png"/>
 </gnome-pilot-conduit>
-- 
cgit