Changeset 967 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 18, 2007 7:33:09 PM (18 years ago)

Author:

vboxsync

Message:

XPCOM event queue stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• COMDefs.cpp (modified) (3 diffs)
• main.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/COMDefs.cpp

@@ -71 +71 @@
 PRUint32 COMBase::gVBoxServerID = 0;
 
+/* Mac OS X (Carbon mode) and OS/2 will notify the native queue
+   internally in plevent.c. Because moc doesn't seems to respect
+   #ifdefs, we still have to include the definition of the class.
+   very silly. */
+# if !defined (Q_OS_MAC)  && !defined (Q_OS_OS2)
 XPCOMEventQSocketListener *COMBase::gSocketListener = 0;
+# endif
 
 /**
@@ -183 +189 @@
                 AssertMsg (isNative, ("The event queue must be native"));
 #endif
+# if !defined (__DARWIN__) && !defined (__OS2__)
                 gSocketListener = new XPCOMEventQSocketListener (gEventQ);
+# endif
 
                 // get the IPC service
@@ -234 +242 @@
         {
             LogFlow (("COMBase::cleanupCOM(): doing cleanup...\n"));
+# if !defined (__DARWIN__) && !defined (__OS2__)
             if (gSocketListener)
                 delete gSocketListener;
+# endif
             if (gDConnectService)
                 gDConnectService->Release();

trunk/src/VBox/Frontends/VirtualBox/src/main.cpp

@@ -116 +116 @@
 static void DarwinInit (void)
 {
+    /* This probably belongs else where. */
     static struct
     {
@@ -132 +133 @@
     if (!RTEnvGet ("VBOX_XPCOM_HOME"))
         RTEnvPut (s.var);
+
+    /** @todo automatically start VBoxSVC. */
 }
 #endif