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

« back to all changes in this revision

Viewing changes to .pc/16-no-update.patch/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.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
* 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:
1
 
/* $Id: UIMachineMenuBar.cpp 38348 2011-08-08 12:09:18Z vboxsync $ */
 
1
/* $Id: UIMachineMenuBar.cpp $ */
2
2
/** @file
3
3
 *
4
4
 * VBox frontends: Qt GUI ("VirtualBox"):
25
25
#include "UIMessageCenter.h"
26
26
#include "UIExtraDataEventHandler.h"
27
27
#include "UIImageTools.h"
 
28
#include "UIUpdateManager.h"
28
29
 
29
30
/* Global includes */
30
31
#include <QMenuBar>
294
295
        VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
295
296
                            &msgCenter(), SLOT(sltShowHelpAboutDialog()));
296
297
        VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_Update), SIGNAL(triggered()),
297
 
                            &vboxGlobal(), SLOT(showUpdateDialog()));
 
298
                            gUpdateManager, SLOT(sltForceCheck()));
298
299
#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
299
300
    }
300
301
#endif