Working dbus service

src/Makefile.am

@@ -25,7 +25,7 @@ IAXSOURCES =
 IAXHEADERS =
 endif
 
-SUBDIRS = audio config gui $(ZEROCONFDIR)
+SUBDIRS = audio config gui dbus $(ZEROCONFDIR)
 
 sflphoned_SOURCES = eventthread.cpp 	main.cpp 	voIPLink.cpp \
 		managerimpl.cpp	observer.cpp \

src/dbus/Makefile.am

@@ -4,13 +4,15 @@ EXTRA_DIST = *.xml README
 
 noinst_LTLIBRARIES = libdbus.la
 
-libdbus_la_SOURCES = \
-	callmanager-glue.h \
-	configurationmanager-glue.h \ 
-	callmanager.h callmanager.cpp \
-	dbusmanager.h dbusmanagerimpl.h dbusmanagerimp.cpp \
-	configurationmanager.h
+libdbus_la_SOURCES = callmanager.cpp \
+	 dbusmanagerimpl.cpp
 
-AM_CXXFLAGS =
+libdbus_la_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\"
+libdbus_la_CPPFLAGS = -I$(top_srcdir)/libs -I$(top_srcdir)/src $(libccext2_CFLAGS) $(libdbuscpp_CFLAGS)
 libdbus_la_LIBADD = 
 
+noinst_HEADERS = \
+	callmanager-glue.h \
+	callmanager.h  \
+	dbusmanager.h \
+	dbusmanagerimpl.h

src/dbus/callmanager.h

@@ -34,7 +34,6 @@ class CallManager
 public:
 
     CallManager(DBus::Connection& connection);
-    static int exec();
 
 
 public:

src/dbus/dbusmanagerimpl.cpp

@@ -18,3 +18,16 @@
  */
  
 #include <dbusmanagerimpl.h>
+
+
+void 
+DBusManagerImpl::connect(){
+
+}
+
+int 
+DBusManagerImpl::exec(){
+ return 1;
+}
+        
+    

src/dbus/dbusmanagerimpl.h

@@ -17,16 +17,18 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DBUSMANAGERIMPL_H
-#define DBUSMANAGERIMPL_H
+#ifndef __DBUSMANAGERIMPL_H__
+#define __DBUSMANAGERIMPL_H__
 
-class DBusManager {
+#include "callmanager.h"
+
+class DBusManagerImpl {
     public:
         void connect();
         int exec();
         
     private:
         CallManager * _callManager;
-}
+};
 
 #endif

src/main.cpp

@@ -28,6 +28,7 @@
 #include "user_cfg.h"
 #include "gui/server/guiserver.h"
 #include "gui/guiframework.h"
+#include "dbus/dbusmanager.h"
 #include "manager.h"
 
 #include "audio/audiolayer.h"
@@ -73,10 +74,11 @@ main (int argc, char **argv) {
       exit_code = -1;
     }
     if (initOK) {
-      GUI = &(GUIServer::instance());
-      GUIServer::instance().setSessionPort(sessionPort);
-      Manager::instance().setGui(GUI);
-      exit_code = GUIServer::instance().exec();
+      //GUI = &(GUIServer::instance());
+      //GUIServer::instance().setSessionPort(sessionPort);
+      //Manager::instance().setGui(GUI);
+      exit_code = DBusManager::instance().toto();
+      
     }
   }