VirtualBox

Changeset 46649 in vbox for trunk/src/libs/xpcom18a4/python


Ignore:
Timestamp:
Jun 19, 2013 11:47:32 AM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
86538
Message:

Forward ported r85941 and required build fixes (Main: Implemented new event queue to separate system's native event queue and our own. Also, XPCOM is not needed for handling our own events. On Windows this also fixes the system's queue quota limitation).

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/libs/xpcom18a4

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/VBox-3.0/src/libs/xpcom18a458652,​70973
      /branches/VBox-3.2/src/libs/xpcom18a466309,​66318
      /branches/VBox-4.0/src/libs/xpcom18a470873
      /branches/VBox-4.1/src/libs/xpcom18a474233,​78414,​78691,​82579,​85941
      /branches/VBox-4.2/src/libs/xpcom18a482653,​86229-86230,​86234,​86529,​86532-86533
      /branches/andy/guestctrl20/src/libs/xpcom18a478916,​78930
      /branches/dsen/gui/src/libs/xpcom18a479076-79078,​79089,​79109-79110,​79112-79113,​79127-79130,​79134,​79141,​79151,​79155,​79157-79159,​79193,​79197
      /branches/dsen/gui2/src/libs/xpcom18a479224,​79228,​79233,​79235,​79258,​79262-79263,​79273,​79341,​79345,​79354,​79357,​79387-79388,​79559-79569,​79572-79573,​79578,​79581-79582,​79590-79591,​79598-79599,​79602-79603,​79605-79606,​79632,​79635,​79637,​79644
      /branches/dsen/gui3/src/libs/xpcom18a479645-79692
  • trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp

    r46593 r46649  
    511511#ifdef VBOX
    512512
    513 #  include <VBox/com/EventQueue.h>
     513#  include <VBox/com/NativeEventQueue.h>
    514514#  include <iprt/err.h>
    515515
     
    522522
    523523    int rc;
    524     com::EventQueue* aEventQ = com::EventQueue::getMainEventQueue();
     524    com::NativeEventQueue* aEventQ = com::NativeEventQueue::getMainEventQueue();
    525525    NS_WARN_IF_FALSE(aEventQ != nsnull, "Null main event queue");
    526526    if (!aEventQ)
     
    557557PyXPCOMMethod_InterruptWait(PyObject *self, PyObject *args)
    558558{
    559   com::EventQueue* aEventQ = com::EventQueue::getMainEventQueue();
     559  com::NativeEventQueue* aEventQ = com::NativeEventQueue::getMainEventQueue();
    560560  NS_WARN_IF_FALSE(aEventQ != nsnull, "Null main event queue");
    561561  if (!aEventQ)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette