[gnome-pilot/dbus] Bug #619315 Move Evolution conduits into gnome-pilot. With thanks to Matthew Barnes.

[Matthew Charles Davey <mcdavey src gnome org>]

commit 07023b151a050c6ad4dcec4e0ff2a812734f358d
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sat Jul 31 23:44:24 2010 +0100

    Bug #619315  Move Evolution conduits into gnome-pilot.  With thanks to Matthew Barnes.

 ChangeLog                                          |    4 ++++
 conduits/evolution-data-server/Makefile.am         |    2 +-
 .../evolution-data-server/e-address.conduit.in     |    2 +-
 .../evolution-data-server/e-calendar.conduit.in    |    2 +-
 conduits/evolution-data-server/e-memo.conduit.in   |    2 +-
 conduits/evolution-data-server/e-todo.conduit.in   |    2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1cf02d9..54ddffc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 2010-07-31 Matt Davey <mcdavey mrao cam ac uk>
+       * #619315  Thanks to Matthew Barnes.  Move Evolution conduits into gnome-pilot
+		codebase.
+
+2010-07-31 Matt Davey <mcdavey mrao cam ac uk>
     Initialise gtk in gpilotd.  Remove gnome_program_init.  Some other cleanups.
     
        applet/pilot.c: Add Halton to Authors credits; Add more consistent state-change
diff --git a/conduits/evolution-data-server/Makefile.am b/conduits/evolution-data-server/Makefile.am
index 2910a0d..0eac362 100644
--- a/conduits/evolution-data-server/Makefile.am
+++ b/conduits/evolution-data-server/Makefile.am
@@ -50,7 +50,7 @@ libecalendar_conduit_la_LIBADD = \
 	$(EVOLUTION_DATA_SERVER_LIBS)
 
 libememo_conduit_la_SOURCES = \
-	todo-conduit.c \
+	memo-conduit.c \
 	libecalendar-common-conduit.c \
 	libecalendar-common-conduit.h \
 	e-pilot-map.c \
diff --git a/conduits/evolution-data-server/e-address.conduit.in b/conduits/evolution-data-server/e-address.conduit.in
index 9145ea2..f455c56 100644
--- a/conduits/evolution-data-server/e-address.conduit.in
+++ b/conduits/evolution-data-server/e-address.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_address_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/libeaddress_conduit.so"/>
+	<conduit id="e_address_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libeaddress_conduit.so"/>
 	<name value="EAddress"/>
 	<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/conduits/evolution-data-server/e-calendar.conduit.in b/conduits/evolution-data-server/e-calendar.conduit.in
index 695e40e..4963257 100644
--- a/conduits/evolution-data-server/e-calendar.conduit.in
+++ b/conduits/evolution-data-server/e-calendar.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_calendar_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/libecalendar_conduit.so"/>
+	<conduit id="e_calendar_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libecalendar_conduit.so"/>
 	<name value="ECalendar"/>
 	<conduit-attribute name="description" value="Synchronizes Calendar with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/conduits/evolution-data-server/e-memo.conduit.in b/conduits/evolution-data-server/e-memo.conduit.in
index 9dee02c..e0b8602 100644
--- a/conduits/evolution-data-server/e-memo.conduit.in
+++ b/conduits/evolution-data-server/e-memo.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_memo_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/libememo_conduit.so"/>
+	<conduit id="e_memo_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libememo_conduit.so"/>
 	<name value="EMemos"/>
 	<conduit-attribute name="description" value="Synchronizes Memo List with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>
diff --git a/conduits/evolution-data-server/e-todo.conduit.in b/conduits/evolution-data-server/e-todo.conduit.in
index d75370b..b07d10e 100644
--- a/conduits/evolution-data-server/e-todo.conduit.in
+++ b/conduits/evolution-data-server/e-todo.conduit.in
@@ -1,5 +1,5 @@
 <gnome-pilot-conduit version="1.0">
-	<conduit id="e_todo_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/libetodo_conduit.so"/>
+	<conduit id="e_todo_conduit" type="shlib" location="@LIBDIR@/gnome-pilot/conduits/libetodo_conduit.so"/>
 	<name value="EToDo"/>
 	<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution-Data-Server"/>
 	<conduit-attribute name="default-synctype" value="synchronize"/>