diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/conduit/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/conduit/e-address.conduit.in | 13 |
3 files changed, 16 insertions, 7 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index d3e19f5f54..943d76cc4b 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +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 Chris Toshok <toshok@ximian.com> * gui/component/select-names/e-select-names-text-model.c 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> |