Changeset 15058 in vbox

Timestamp:

Dec 5, 2008 10:11:21 PM (16 years ago)

Author:

vboxsync

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

40444

Message:

Main: fix a burn

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• include/vbox-dbus.h (modified) (1 diff)
• linux/HostHardwareLinux.cpp (modified) (4 diffs)
• linux/vbox-dbus.cpp (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -301 +301 @@
         win/VBoxSVC.rc
 
+ifdef VBOX_WITH_DBUS
 VBoxSVC_SOURCES.linux += \
         linux/HostHardwareLinux.cpp \
         linux/vbox-dbus.cpp
+endif
 
 VBoxSVC_SOURCES.solaris = \

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

@@ -102 +102 @@
 
 extern bool VBoxDBusCheckPresence(void);
+extern void VBoxDBusConnectionUnref(DBusConnection *pConnection);
+extern void VBoxDBusMessageUnref(DBusMessage *pMessage);
 
 #endif /* ____H_VBOX_DBUS not defined */

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

@@ -437 +437 @@
     autoDBusError dbusError;
 
-    RTMemAutoPtr <DBusConnection, dbus_connection_unref> dbusConnection;
+    RTMemAutoPtr <DBusConnection, VBoxDBusConnectionUnref> dbusConnection;
     dbusConnection = dbus_bus_get (DBUS_BUS_SYSTEM, &dbusError.get());
     if (!dbusConnection)
@@ -509 +509 @@
     bool halSuccess = true;
     autoDBusError dbusError;
-    RTMemAutoPtr <DBusMessage, dbus_message_unref> message;
+    RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message;
     DBusMessage *pReply = NULL;
     if (halSuccess && RT_SUCCESS (rc))
@@ -568 +568 @@
     bool halSuccess = true;
     autoDBusError dbusError;
-    RTMemAutoPtr <DBusMessage, dbus_message_unref> message, reply;
+    RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message, reply;
     DBusMessageIter iterGet, iterProps, iterKey, iterValue;
 
@@ -645 +645 @@
     autoDBusError dbusError;
     DBusMessage *pReply;
-    RTMemAutoPtr <DBusMessage, dbus_message_unref> message, replyFind, replyGet;
+    RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message, replyFind, replyGet;
     DBusMessageIter iterFind, iterUdis;
     bool halSuccess = true;  /* Did something go wrong with hal or DBus? */

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

@@ -130 +130 @@
 }
 
+void VBoxDBusConnectionUnref(DBusConnection *pConnection)
+{
+    dbus_connection_unref(pConnection);
+}
+
+void VBoxDBusMessageUnref(DBusMessage *pMessage)
+{
+    dbus_message_unref(pMessage);
+}
+