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

Timestamp:

Apr 16, 2009 8:33:09 AM (16 years ago)

Author:

vboxsync

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

45992

Message:

Main: do not attempt to load older versions of libdbus

Location:

trunk/src/VBox/Main

Files:

• include/vbox-dbus.h (modified) (1 diff)
• linux/vbox-dbus.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/vbox-dbus.h

@@ -26 +26 @@
 #include <stdint.h>
 
-#define VBOX_DBUS_1_2_LIB "libdbus-1.so.2"  /* This should be compatible */
 #define VBOX_DBUS_1_3_LIB "libdbus-1.so.3"
 

trunk/src/VBox/Main/linux/vbox-dbus.cpp

@@ -77 +77 @@
 
     LogFlowFunc(("\n"));
-    rc = RTLdrLoad(VBOX_DBUS_1_2_LIB, &hLib);
+    rc = RTLdrLoad(VBOX_DBUS_1_3_LIB, &hLib);
     if (RT_FAILURE(rc))
-        rc = RTLdrLoad(VBOX_DBUS_1_3_LIB, &hLib);
-    if (RT_FAILURE(rc))
-        LogRelFunc(("Failed to load library %s or %s\n",
-                    VBOX_DBUS_1_2_LIB, VBOX_DBUS_1_3_LIB));
+        LogRelFunc(("Failed to load library %s\n", VBOX_DBUS_1_3_LIB));
     for (unsigned i = 0; RT_SUCCESS(rc) && SharedFuncs[i].name != NULL; ++i)
         rc = RTLdrGetSymbol(hLib, SharedFuncs[i].name, (void**)SharedFuncs[i].fn);