Changeset 23845 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 19, 2009 8:49:10 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

53607

Message:

VBoxClient/VBoxTray/VBgl: Reverted last check-ins to redo D-BUS movement.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• linux/HostHardwareLinux.cpp (modified) (4 diffs)
• testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -336 +336 @@
         linux/HostHardwareLinux.cpp
 
+ifdef VBOX_WITH_DBUS
+ VBoxSVC_SOURCES.linux += linux/vbox-dbus.cpp
+endif
+
 VBoxSVC_SOURCES.solaris = \
         linux/vbox-libhal.cpp \

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -31 +31 @@
 
 #include <VBox/log.h>
-# ifdef VBOX_WITH_DBUS
-#  include <VBox/dbus.h>
-# endif
 
 #include <iprt/dir.h>
@@ -57 +54 @@
 # include <linux/fd.h>
 # include <linux/major.h>
+# ifdef VBOX_WITH_DBUS
+#  include <vbox-dbus.h>
+# endif
 # include <errno.h>
 # include <scsi/scsi.h>
@@ -1025 +1025 @@
 #ifdef VBOX_WITH_DBUS
         if (   RT_SUCCESS(rc)
-            && RT_SUCCESS(RTDBusLoadLib())
+            && RT_SUCCESS(VBoxLoadDBusLib())
             && (!success || testing()))
             rc = getUSBDeviceInfoFromHal(&mDeviceList, &halSuccess);
@@ -1070 +1070 @@
 
     mContext = new Context;
-    if (RT_SUCCESS(RTDBusLoadLib()))
+    if (RT_SUCCESS(VBoxLoadDBusLib()))
     {
         for (unsigned i = 0; RT_SUCCESS(rc) && i < 5 && !mContext->mConnection; ++i)

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -125 +125 @@
 tstHostHardwareLinux_SOURCES   = \
         tstHostHardwareLinux.cpp \
-        ../linux/HostHardwareLinux.cpp
+        ../linux/HostHardwareLinux.cpp \
+        ../linux/vbox-dbus.cpp
 tstHostHardwareLinux_INCS      = . ../include
 tstHostHardwareLinux_DEFS      = \