ekiga r7588 - in trunk/lib/engine: . components/hal-dbus

[jpuydt svn gnome org]

Author: jpuydt
Date: Thu Jan 22 13:00:56 2009
New Revision: 7588
URL: http://svn.gnome.org/viewvc/ekiga?rev=7588&view=rev

Log:
Made the HAL DBUS code kickstart

Modified:
   trunk/lib/engine/components/hal-dbus/hal-main-dbus.cpp
   trunk/lib/engine/components/hal-dbus/hal-main-dbus.h
   trunk/lib/engine/engine.cpp

Modified: trunk/lib/engine/components/hal-dbus/hal-main-dbus.cpp
==============================================================================
--- trunk/lib/engine/components/hal-dbus/hal-main-dbus.cpp	(original)
+++ trunk/lib/engine/components/hal-dbus/hal-main-dbus.cpp	Thu Jan 22 13:00:56 2009
@@ -31,7 +31,7 @@
  *                         ------------------------------------------
  *   begin                : written in 2008 by Matthias Schneider
  *   copyright            : (c) 2008 by Matthias Schneider
- *   description          : code to hook the Moving Logo vidinput manager 
+ *   description          : code to hook the Moving Logo vidinput manager
  *                          into the main program
  *
  */
@@ -40,21 +40,40 @@
 #include "hal-core.h"
 #include "hal-manager-dbus.h"
 
-bool
-hal_dbus_init (Ekiga::ServiceCore &core,
-	    int */*argc*/,
-	    char **/*argv*/[])
+struct HALDBUSSpark: public Ekiga::Spark
 {
-  bool result = false;
-  gmref_ptr<Ekiga::HalCore> hal_core = core.get ("hal-core");
+  HALDBUSSpark (): result(false)
+  {}
 
-  if (hal_core) {
+  bool try_initialize_more (Ekiga::ServiceCore& core,
+			    int* /*argc*/,
+			    char** /*argv*/[])
+  {
+    gmref_ptr<Ekiga::HalCore> hal_core = core.get ("hal-core");
 
-    HalManager_dbus *hal_manager = new HalManager_dbus(core);
+    if (hal_core) {
 
-    hal_core->add_manager (*hal_manager);
-    result = true;
+      HalManager_dbus *hal_manager = new HalManager_dbus(core);
+
+      hal_core->add_manager (*hal_manager);
+      result = true;
+    }
+
+    return result;
   }
 
-  return result;
+  Ekiga::Spark::state get_state () const
+  { return result?FULL:BLANK; }
+
+  const std::string get_name () const
+  { return "HALDBUSSPARK"; }
+
+  bool result;
+};
+
+void
+hal_dbus_init (Ekiga::KickStart& kickstart)
+{
+  gmref_ptr<Ekiga::Spark> spark(new HALDBUSSpark);
+  kickstart.add_spark (spark);
 }

Modified: trunk/lib/engine/components/hal-dbus/hal-main-dbus.h
==============================================================================
--- trunk/lib/engine/components/hal-dbus/hal-main-dbus.h	(original)
+++ trunk/lib/engine/components/hal-dbus/hal-main-dbus.h	Thu Jan 22 13:00:56 2009
@@ -39,10 +39,8 @@
 #ifndef __HAL_MAIN_DBUS_H__
 #define __HAL_MAIN_DBUS_H__
 
-#include "services.h"
+#include "kickstart.h"
 
-bool hal_dbus_init (Ekiga::ServiceCore &core,
-  		     int *argc,
-		     char **argv[]);
+void hal_dbus_init (Ekiga::KickStart& kickstart);
 
 #endif

Modified: trunk/lib/engine/engine.cpp
==============================================================================
--- trunk/lib/engine/engine.cpp	(original)
+++ trunk/lib/engine/engine.cpp	Thu Jan 22 13:00:56 2009
@@ -212,10 +212,7 @@
   }
 
 #ifdef HAVE_DBUS
-  if (!hal_dbus_init (*service_core, &argc, &argv)) {
-    delete service_core;
-    return;
-  }
+  hal_dbus_init (kickstart);
 #endif
 
   opal_init (kickstart);