ekiga r7622 - trunk/lib/engine/components/gnome-session

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Jan 29 14:40:38 2009
New Revision: 7622
URL: http://svn.gnome.org/viewvc/ekiga?rev=7622&view=rev

Log:
Made the gnome session code check for the call core

Modified:
   trunk/lib/engine/components/gnome-session/Makefile.am
   trunk/lib/engine/components/gnome-session/gnome-session-main.cpp

Modified: trunk/lib/engine/components/gnome-session/Makefile.am
==============================================================================
--- trunk/lib/engine/components/gnome-session/Makefile.am	(original)
+++ trunk/lib/engine/components/gnome-session/Makefile.am	Thu Jan 29 14:40:38 2009
@@ -5,12 +5,14 @@
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(XML_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/engine/framework
+	-I$(top_srcdir)/lib/engine/framework \
+	-I$(top_srcdir)/lib/engine/protocol
 
 libgmgnomesession_la_SOURCES = \
 	$(gnomesession_dir)/gnome-session-main.h 	\
 	$(gnomesession_dir)/gnome-session-main.cpp
 
-#libgmgnomesession_la_LIBADD = nothing yet
+libgmgnomesession_la_LIBADD = \
+	$(top_builddir)/lib/engine/protocol/libgmprotocol.la
 
 libgmgnomesession_la_LDFLAGS = -export-dynamic -no-undefined $(LDAP_LIBS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)

Modified: trunk/lib/engine/components/gnome-session/gnome-session-main.cpp
==============================================================================
--- trunk/lib/engine/components/gnome-session/gnome-session-main.cpp	(original)
+++ trunk/lib/engine/components/gnome-session/gnome-session-main.cpp	Thu Jan 29 14:40:38 2009
@@ -36,6 +36,7 @@
  */
 
 #include "services.h"
+#include "call-core.h"
 
 #include "gnome-session-main.h"
 
@@ -44,10 +45,20 @@
   GNOMESESSIONSpark (): result(false)
   {}
 
-  bool try_initialize_more (Ekiga::ServiceCore& /*core*/,
+  bool try_initialize_more (Ekiga::ServiceCore& core,
 			    int* /*argc*/,
 			    char** /*argv*/[])
   {
+    gmref_ptr<Ekiga::CallCore> call = core.get ("call-core");
+    gmref_ptr<Ekiga::Service> service = core.get ("gnome-session");
+
+    if (call && !service) {
+
+      result = true;
+      core.add (gmref_ptr<Ekiga::Service> (new Ekiga::BasicService ("gnome-session",
+								    "\tComponent connecting ekiga to the gnome session")));
+    }
+
     return result;
   }