Changeset 24073 in vbox

Timestamp:

Oct 26, 2009 1:01:33 PM (15 years ago)

Author:

vboxsync

Message:

VBoxClient: Added more D-BUS error checking.

Location:

trunk

Files:

• include/VBox/dbus-calls.h (modified) (1 diff)
• src/VBox/Additions/x11/VBoxClient/hostversion.cpp (modified) (1 diff)

trunk/include/VBox/dbus-calls.h

@@ -27 +27 @@
 /** The following are the symbols which we need from libdbus-1. */
 VBOX_PROXY_STUB(dbus_error_init, void, (DBusError *error),
+                (error))
+VBOX_PROXY_STUB(dbus_error_is_set, dbus_bool_t, (const DBusError *error),
                 (error))
 VBOX_PROXY_STUB(dbus_bus_get, DBusConnection *,

trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp

@@ -100 +100 @@
 
             DBusError err;
-            dbus_connection_send_with_reply_and_block(conn, msg, 30 * 1000, &err);
+            DBusMessage *reply;
+            reply = dbus_connection_send_with_reply_and_block(conn, msg,
+                30 * 1000 /* 30 seconds timeout */, &err);
+            if (dbus_error_is_set(&err))
+            {
+                Log(("D-BUS returned an error while sending the notification: %s", err.message));
+            }
+            else if (reply)
+            {
                 dbus_connection_flush(conn);
+                dbus_message_unref(reply);
+            }
         }
         if (msg != NULL)