Changeset 43793 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 2, 2012 9:26:20 AM (12 years ago)

Author:

vboxsync

Message:

VBoxService/vminfo: Check for D-Bus loading on usage.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -357 +357 @@
 #ifdef VBOX_WITH_DBUS
 # if defined(RT_OS_LINUX) /* Not yet for Solaris/FreeBSB. */
-    /* Handle desktop sessions using ConsoleKit. */
-    VBoxServiceVerbose(4, "Checking ConsoleKit sessions ...\n");
-
     DBusError dbErr;
-    dbus_error_init(&dbErr);
-
-    DBusConnection *pConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbErr);
+    DBusConnection *pConnection = NULL;
+    int rc2 = RTDBusLoadLib();
+    if (RT_SUCCESS(rc2))
+    {
+        /* Handle desktop sessions using ConsoleKit. */
+        VBoxServiceVerbose(4, "Checking ConsoleKit sessions ...\n");
+
+        dbus_error_init(&dbErr);
+        pConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbErr);
+    }
+
     if (   pConnection
         && !dbus_error_is_set(&dbErr))
@@ -494 +499 @@
         static int s_iBitchedAboutDBus = 0;
         if (s_iBitchedAboutDBus++ < 3)
-            VBoxServiceError("Unable to connect to system D-Bus (%d/3)\n", s_iBitchedAboutDBus);
+            VBoxServiceError("Unable to connect to system D-Bus (%d/3): %s\n", s_iBitchedAboutDBus,
+                             dbus_error_is_set(&dbErr) ? dbErr.message : "D-Bus not installed\n");
     }
 
@@ -987 +993 @@
 #endif /* RT_OS_WINDOWS */
 
-    int rc2;
-#ifdef VBOX_WITH_DBUS
-    rc2 = RTDBusLoadLib();
-    if (RT_FAILURE(rc2))
-        VBoxServiceVerbose(0, "VMInfo: D-Bus seems not to be installed; no ConsoleKit session handling available\n");
-#endif /* VBOX_WITH_DBUS */
-
     /*
      * Write the fixed properties first.
@@ -1033 +1032 @@
         if (*pfShutdown)
             break;
-        rc2 = RTSemEventMultiWait(g_hVMInfoEvent, g_cMsVMInfoInterval);
+        int rc2 = RTSemEventMultiWait(g_hVMInfoEvent, g_cMsVMInfoInterval);
         if (*pfShutdown)
             break;