[ekiga] Turned the evolution code into a plugin (bug #586147)

[Julien Puydt <jpuydt src gnome org>]

commit ae059d3c3389555f591dc56d975c4d89ddd8cb14
Author: Julien Puydt <jpuydt gnome org>
Date:   Thu Jun 18 21:21:26 2009 +0200

    Turned the evolution code into a plugin (bug #586147)

 lib/engine/components/evolution/Makefile.am        |    6 ++++--
 lib/engine/components/evolution/evolution-main.cpp |    7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/lib/engine/components/evolution/Makefile.am b/lib/engine/components/evolution/Makefile.am
index 71391c6..812b219 100644
--- a/lib/engine/components/evolution/Makefile.am
+++ b/lib/engine/components/evolution/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libgmevolution.la
+plugindir = $(PLUGINDIR)
+plugin_LTLIBRARIES = libgmevolution.la
 
 evolution_dir = $(top_srcdir)/lib/engine/components/evolution
 
@@ -21,4 +22,5 @@ libgmevolution_la_SOURCES = \
 libgmevolution_la_LIBADD = \
 	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
 
-libgmevolution_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(EDS_LIBS) $(GLIB_LIBS)
+libgmevolution_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
+libgmevolution_la_LIBADD =  $(SIGC_LIBS) $(EDS_LIBS) $(GLIB_LIBS)
\ No newline at end of file
diff --git a/lib/engine/components/evolution/evolution-main.cpp b/lib/engine/components/evolution/evolution-main.cpp
index 24ab67b..99dff78 100644
--- a/lib/engine/components/evolution/evolution-main.cpp
+++ b/lib/engine/components/evolution/evolution-main.cpp
@@ -51,8 +51,9 @@ struct EVOSpark: public Ekiga::Spark
 			    char **/*argv*/[])
   {
     gmref_ptr<Ekiga::ContactCore> core = services.get ("contact-core");
+    Ekiga::ServicePtr service = services.get ("evolution-source");
 
-    if (core) {
+    if (core && !service) {
 
       gmref_ptr<Evolution::Source> source (new Evolution::Source (services));
       services.add (source);
@@ -72,8 +73,8 @@ struct EVOSpark: public Ekiga::Spark
   bool result;
 };
 
-void
-evolution_init (Ekiga::KickStart& kickstart)
+extern "C" void
+ekiga_plugin_init (Ekiga::KickStart& kickstart)
 {
   gmref_ptr<Ekiga::Spark> spark(new EVOSpark);
   kickstart.add_spark (spark);