[ekiga] Hal-Dbus: Got rid of it.



commit d5af6168493e89baaee2f3aef82e57f1c21c32f2
Author: Damien Sandras <dsandras seconix com>
Date:   Sat Oct 31 18:55:07 2015 +0100

    Hal-Dbus: Got rid of it.

 lib/Makefile.am                                    |   30 --
 lib/engine/components/hal-dbus/hal-main-dbus.cpp   |   80 ----
 lib/engine/components/hal-dbus/hal-main-dbus.h     |   45 ---
 .../components/hal-dbus/hal-manager-dbus.cpp       |  383 --------------------
 lib/engine/components/hal-dbus/hal-manager-dbus.h  |  128 -------
 lib/engine/components/hal-dbus/hal-marshal.list    |    1 -
 lib/engine/engine.cpp                              |    8 -
 7 files changed, 0 insertions(+), 675 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9b056cd..fcb90eb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -38,7 +38,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/engine/components/foe-list \
        -I$(top_srcdir)/lib/engine/components/glib-notify \
        -I$(top_srcdir)/lib/engine/components/gmconf-personal-details \
-       -I$(top_srcdir)/lib/engine/components/hal-dbus \
        -I$(top_srcdir)/lib/engine/components/hal-gudev \
        -I$(top_srcdir)/lib/engine/components/mlogo-videoinput \
        -I$(top_srcdir)/lib/engine/components/null-audioinput \
@@ -475,35 +474,6 @@ AM_CPPFLAGS += $(GUDEV_CFLAGS)
 libekiga_la_LDFLAGS += $(GUDEV_LIBS)
 endif
 
-##
-# Sources of the hal dbus component
-##
-if HAVE_DBUS
-
-libekiga_la_SOURCES += \
-       engine/components/hal-dbus/hal-manager-dbus.h \
-       engine/components/hal-dbus/hal-manager-dbus.cpp \
-       engine/components/hal-dbus/hal-main-dbus.h \
-       engine/components/hal-dbus/hal-main-dbus.cpp
-
-nodist_libekiga_la_SOURCES += \
-       engine/components/hal-dbus/hal-marshal.h \
-       engine/components/hal-dbus/hal-marshal.c
-
-libekiga_la_LDFLAGS += $(DBUS_LIBS)
-
-# forces the HAVE :
-BUILT_SOURCES += engine/components/hal-dbus/hal-marshal.h engine/components/hal-dbus/hal-marshal.c
-CLEANFILES += engine/components/hal-dbus/hal-marshal.h engine/components/hal-dbus/hal-marshal.c
-EXTRA_DIST += engine/components/hal-dbus/hal-marshal.list
-
-engine/components/hal-dbus/hal-marshal.h: engine/components/hal-dbus/hal-marshal.list
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --header > $  
tmp && mv $  tmp $@
-
-engine/components/hal-dbus/hal-marshal.c: engine/components/hal-dbus/hal-marshal.list
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute glib-genmarshal --prefix=gm_hal_dbus_marshal $^ --body > $  tmp 
&& mv $  tmp $@
-
-endif
 
 ##
 # Sources of the Clutter video output component
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index 3fc5a65..aab4b34 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -73,10 +73,6 @@
 #include "hal-gudev-main.h"
 #endif
 
-#ifdef HAVE_DBUS
-#include "hal-main-dbus.h"
-#endif
-
 #include "opal-process.h"
 #include "opal-main.h"
 
@@ -155,10 +151,6 @@ engine_init (Ekiga::ServiceCore& core,
   hal_gudev_init (kickstart);
 #endif
 
-#ifdef HAVE_DBUS
-  hal_dbus_init (kickstart);
-#endif
-
   opal_init (kickstart);
 
   history_init (kickstart);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]