ekiga r7596 - in trunk/lib/engine: . components/local-roster

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Jan 22 20:51:24 2009
New Revision: 7596
URL: http://svn.gnome.org/viewvc/ekiga?rev=7596&view=rev

Log:
Made the local roster use the kickstart scheme

Modified:
   trunk/lib/engine/components/local-roster/local-roster-main.cpp
   trunk/lib/engine/components/local-roster/local-roster-main.h
   trunk/lib/engine/engine.cpp

Modified: trunk/lib/engine/components/local-roster/local-roster-main.cpp
==============================================================================
--- trunk/lib/engine/components/local-roster/local-roster-main.cpp	(original)
+++ trunk/lib/engine/components/local-roster/local-roster-main.cpp	Thu Jan 22 20:51:24 2009
@@ -39,21 +39,41 @@
 #include "presence-core.h"
 #include "local-cluster.h"
 
-bool
-local_roster_init (Ekiga::ServiceCore &core,
-		   int */*argc*/,
-		   char **/*argv*/[])
+struct LOCALROSTERSpark: public Ekiga::Spark
 {
-  bool result = false;
-  gmref_ptr<Ekiga::PresenceCore> presence_core = core.get ("presence-core");
+  LOCALROSTERSpark (): result(false)
+  {}
 
-  if (presence_core) {
+  bool try_initialize_more (Ekiga::ServiceCore& core,
+			    int* /*argc*/,
+			    char** /*argv*/[])
+  {
+    gmref_ptr<Ekiga::Service> service = core.get ("local-cluster");
+    gmref_ptr<Ekiga::PresenceCore> presence_core = core.get ("presence-core");
 
-    gmref_ptr<Local::Cluster> cluster (new Local::Cluster (core));
-    core.add (cluster);
-    presence_core->add_cluster (cluster);
-    result = true;
+    if (presence_core && !service) {
+
+      gmref_ptr<Local::Cluster> cluster (new Local::Cluster (core));
+      core.add (cluster);
+      presence_core->add_cluster (cluster);
+      result = true;
+    }
+
+    return result;
   }
 
-  return result;
+  Ekiga::Spark::state get_state () const
+  { return result?FULL:BLANK; }
+
+  const std::string get_name () const
+  { return "LOCALROSTER"; }
+
+  bool result;
+};
+
+void
+local_roster_init (Ekiga::KickStart& kickstart)
+{
+  gmref_ptr<Ekiga::Spark> spark(new LOCALROSTERSpark);
+  kickstart.add_spark (spark);
 }

Modified: trunk/lib/engine/components/local-roster/local-roster-main.h
==============================================================================
--- trunk/lib/engine/components/local-roster/local-roster-main.h	(original)
+++ trunk/lib/engine/components/local-roster/local-roster-main.h	Thu Jan 22 20:51:24 2009
@@ -38,16 +38,14 @@
 #ifndef __LOCAL_ROSTER_MAIN_H__
 #define __LOCAL_ROSTER_MAIN_H__
 
-#include "services.h"
+#include "kickstart.h"
 
 /**
  * @addtogroup presence
  * @{
  */
 
-bool local_roster_init (Ekiga::ServiceCore &core,
-			int *argc,
-			char **argv[]);
+void local_roster_init (Ekiga::KickStart& kickstart);
 
 /**
  * @}

Modified: trunk/lib/engine/engine.cpp
==============================================================================
--- trunk/lib/engine/engine.cpp	(original)
+++ trunk/lib/engine/engine.cpp	Thu Jan 22 20:51:24 2009
@@ -244,10 +244,7 @@
     return;
   }
 
-  if (!local_roster_init (*service_core, &argc, &argv)) {
-    delete service_core;
-    return;
-  }
+  local_roster_init (kickstart);
 
   local_roster_bridge_init (kickstart);