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
---
 addressbook/conduit/Makefile.am          |  4 +++-
 addressbook/conduit/e-address.conduit.in | 13 +++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'addressbook/conduit')

diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index bf6577661c..28b5164c23 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -48,7 +48,9 @@ libeaddress_conduit_la_LIBADD = 					\
 	$(GNOME_LIBS)
 
 e-address.conduit: e-address.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp \
+	sed -e 's^\@prefix\@^$(prefix)^g' 				\
+	    -e 's^\@datadir\@^$(datadir)^g' 				\
+	    < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp 	\
 	&& mv e-address.conduit.tmp e-address.conduit
 
 
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
index 1aa78a180e..99b5a15221 100644
--- a/addressbook/conduit/e-address.conduit.in
+++ b/addressbook/conduit/e-address.conduit.in
@@ -1,8 +1,9 @@
 <gnome-pilot-conduit version="1.0">
-<conduit id="e_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/>
-<name value="EAddress"/>
-<conduit-attribute name="description" value="Synchronizes Addressbook 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_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/>
+	<name value="EAddress"/>
+	<conduit-attribute name="description" value="Synchronizes Addressbook 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-address-conduit.png"/>
 </gnome-pilot-conduit>
-- 
cgit