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

[dsandras svn gnome org]

Author: dsandras
Date: Sun Jan  4 21:49:43 2009
New Revision: 7509
URL: http://svn.gnome.org/viewvc/ekiga?rev=7509&view=rev

Log:
Moved the DBUS HAL component.


Added:
   trunk/lib/engine/components/dbus/   (props changed)
      - copied from r7506, /trunk/lib/engine/hal/dbus/
   trunk/lib/engine/hal/Makefile.am   (props changed)
      - copied unchanged from r7506, /trunk/lib/engine/hal/skel/Makefile.am
   trunk/lib/engine/hal/hal-core.cpp   (props changed)
      - copied unchanged from r7506, /trunk/lib/engine/hal/skel/hal-core.cpp
   trunk/lib/engine/hal/hal-core.h   (props changed)
      - copied unchanged from r7506, /trunk/lib/engine/hal/skel/hal-core.h
   trunk/lib/engine/hal/hal-manager.h   (props changed)
      - copied unchanged from r7506, /trunk/lib/engine/hal/skel/hal-manager.h
Removed:
   trunk/lib/engine/hal/dbus/
   trunk/lib/engine/hal/skel/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan  4 21:49:43 2009
@@ -778,8 +778,6 @@
 lib/engine/audioinput/Makefile
 lib/engine/audiooutput/Makefile
 lib/engine/hal/Makefile
-lib/engine/hal/skel/Makefile
-lib/engine/hal/dbus/Makefile
 lib/engine/gui/Makefile
 lib/engine/gui/gtk-core/Makefile
 lib/engine/gui/gtk-frontend/Makefile
@@ -797,6 +795,7 @@
 lib/engine/components/mlogo-videoinput/Makefile
 lib/engine/components/x-videooutput/Makefile
 lib/engine/components/dx-videooutput/Makefile
+lib/engine/components/dbus/Makefile
 )
 
 

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Jan  4 21:49:43 2009
@@ -62,7 +62,7 @@
 # DBus / HALd
 if HAVE_DBUS
 INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/hal/dbus
+	-I$(top_srcdir)/lib/engine/components/dbus
 endif
 
 libekiga_engine_la_SOURCES = engine.h engine.cpp