16-no-update.patch

   1 Description: Disable "Check for Updates" action.
   2 Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
   3 Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>
   4
   5 diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
   6 --- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
   7 +++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
   8 @@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
   9
  10  void UIUpdateManager::sltForceCheck()
  11  {
  12 +    return;
  13 +
  14      /* Force call for new version check: */
  15      sltCheckIfUpdateIsNecessary(true /* force call */);
  16  }
  17 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
  18 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
  19 @@ -538,7 +538,6 @@ void UIActionPool::createActions()
  20      m_pool[UIActionIndex_Simple_WebSite] = new UIActionSimpleWebSite(this);
  21      m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
  22      m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
  23 -    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
  24      m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
  25  }
  26
  27 @@ -570,9 +569,6 @@ void UIActionPool::createMenus()
  28      m_pool[UIActionIndex_Simple_CheckForUpdates]->setVisible(false);
  29  #endif
  30  #if !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700))
  31 -    if (m_pool[UIActionIndex_Simple_CheckForUpdates])
  32 -        delete m_pool[UIActionIndex_Simple_CheckForUpdates];
  33 -    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
  34      if (m_pool[UIActionIndex_Simple_About])
  35          delete m_pool[UIActionIndex_Simple_About];
  36      m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
  37 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
  38 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
  39 @@ -47,7 +47,6 @@ enum UIActionIndex
  40      UIActionIndex_Simple_WebSite,
  41      UIActionIndex_Simple_ResetWarnings,
  42      UIActionIndex_Simple_NetworkAccessManager,
  43 -    UIActionIndex_Simple_CheckForUpdates,
  44      UIActionIndex_Simple_About,
  45
  46      /* Maximum index: */
  47 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
  48 +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
  49 @@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q
  50      m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
  51      pMenu->addAction(m_pRegisterAction);
  52  #endif /* VBOX_WITH_REGISTRATION */
  53 -    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
  54 -    CVirtualBox vbox = vboxGlobal().virtualBox();
  55 -    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
  56 -        pMenu->addAction(m_pUpdateAction);
  57 -    else
  58 -        m_pUpdateAction->setEnabled(false);
  59  #ifndef Q_WS_MAC
  60      pMenu->addSeparator();
  61  #endif /* !Q_WS_MAC */
  62 @@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
  63      connect(m_pRegisterAction, SIGNAL(triggered()), &vboxGlobal(), SLOT(showRegistrationDialog()));
  64      connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)), m_pRegisterAction, SLOT(setEnabled(bool)));
  65  #endif /* VBOX_WITH_REGISTRATION */
  66 -    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
  67      connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
  68
  69      /* Status-bar connections: */
  70 diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
  71 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
  72 +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
  73 @@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
  74  #endif /* !VBOX_WITH_NETFLT */
  75              break;
  76          }
  77 +        case GlobalSettingsPageType_Update:
  78 +        {
  79 +            return false;
  80 +        }
  81          default:
  82              break;
  83      }