← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Main/glue/EventQueue.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/glue/EventQueue.cpp
1
 
/* $Id: EventQueue.cpp 33720 2010-11-03 10:54:42Z vboxsync $ */
 
1
/* $Id: EventQueue.cpp $ */
2
2
/** @file
3
3
 * MS COM / XPCOM Abstraction Layer:
4
4
 * Event and EventQueue class declaration
29
29
#include <iprt/err.h>
30
30
#include <iprt/time.h>
31
31
#include <iprt/thread.h>
 
32
#include <iprt/log.h>
32
33
#ifdef USE_XPCOM_QUEUE
33
34
# include <errno.h>
34
35
#endif
340
341
        rc = VINF_INTERRUPTED;
341
342
    else
342
343
    {
 
344
        static uint32_t s_ErrorCount = 0;
 
345
        if (s_ErrorCount < 500)
 
346
        {
 
347
            LogRel(("waitForEventsOnXPCOM rc=%d errno=%d\n", rc, errno));
 
348
            ++s_ErrorCount;
 
349
        }
 
350
 
343
351
        AssertMsgFailed(("rc=%d errno=%d\n", rc, errno));
344
352
        rc = VERR_INTERNAL_ERROR_4;
345
353
    }
510
518
    }
511
519
 
512
520
    if (  (   RT_SUCCESS(rc)
513
 
           || rc == VERR_INTERRUPTED)
 
521
           || rc == VERR_INTERRUPTED
 
522
           || rc == VERR_TIMEOUT)
514
523
        && mInterrupted)
515
524
    {
516
525
        mInterrupted = false;