Changeset 46649 in vbox for trunk/src/libs/xpcom18a4/python
- Timestamp:
- Jun 19, 2013 11:47:32 AM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 86538
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/VBox-4.1 merged: 82579,85941 /branches/VBox-4.2 merged: 86229-86230,86234,86529 /branches/andy/guestctrl20 (added) merged: 78916,78930
- Property svn:mergeinfo changed
-
trunk/src/libs/xpcom18a4
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/VBox-3.0/src/libs/xpcom18a4 58652,70973 /branches/VBox-3.2/src/libs/xpcom18a4 66309,66318 /branches/VBox-4.0/src/libs/xpcom18a4 70873 /branches/VBox-4.1/src/libs/xpcom18a4 74233,78414,78691,82579,85941 /branches/VBox-4.2/src/libs/xpcom18a4 82653,86229-86230,86234,86529,86532-86533 /branches/andy/guestctrl20/src/libs/xpcom18a4 78916,78930 /branches/dsen/gui/src/libs/xpcom18a4 79076-79078,79089,79109-79110,79112-79113,79127-79130,79134,79141,79151,79155,79157-79159,79193,79197 /branches/dsen/gui2/src/libs/xpcom18a4 79224,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/xpcom18a4 79645-79692
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp
r46593 r46649 511 511 #ifdef VBOX 512 512 513 # include <VBox/com/ EventQueue.h>513 # include <VBox/com/NativeEventQueue.h> 514 514 # include <iprt/err.h> 515 515 … … 522 522 523 523 int rc; 524 com:: EventQueue* aEventQ = com::EventQueue::getMainEventQueue();524 com::NativeEventQueue* aEventQ = com::NativeEventQueue::getMainEventQueue(); 525 525 NS_WARN_IF_FALSE(aEventQ != nsnull, "Null main event queue"); 526 526 if (!aEventQ) … … 557 557 PyXPCOMMethod_InterruptWait(PyObject *self, PyObject *args) 558 558 { 559 com:: EventQueue* aEventQ = com::EventQueue::getMainEventQueue();559 com::NativeEventQueue* aEventQ = com::NativeEventQueue::getMainEventQueue(); 560 560 NS_WARN_IF_FALSE(aEventQ != nsnull, "Null main event queue"); 561 561 if (!aEventQ)
Note:
See TracChangeset
for help on using the changeset viewer.