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 @@ -465,6 +465,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/settings/UISettingsDialogSpecific.cpp
  18 +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
  19 @@ -550,6 +550,10 @@ bool UISettingsDialogGlobal::isPageAvail
  20  #endif /* !VBOX_WITH_NETFLT */
  21              break;
  22          }
  23 +        case GLSettingsPage_Update:
  24 +        {
  25 +            return false;
  26 +        }
  27          default:
  28              break;
  29      }
  30 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
  31 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
  32 @@ -538,7 +538,6 @@ void UIActionPool::createActions()
  33      m_pool[UIActionIndex_Simple_WebSite] = new UIActionSimpleWebSite(this);
  34      m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
  35      m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
  36 -    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
  37      m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
  38  }
  39
  40 @@ -570,9 +569,6 @@ void UIActionPool::createMenus()
  41      m_pool[UIActionIndex_Simple_CheckForUpdates]->setVisible(false);
  42  #endif
  43  #if !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700))
  44 -    if (m_pool[UIActionIndex_Simple_CheckForUpdates])
  45 -        delete m_pool[UIActionIndex_Simple_CheckForUpdates];
  46 -    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
  47      if (m_pool[UIActionIndex_Simple_About])
  48          delete m_pool[UIActionIndex_Simple_About];
  49      m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
  50 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
  51 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
  52 @@ -47,7 +47,6 @@ enum UIActionIndex
  53      UIActionIndex_Simple_WebSite,
  54      UIActionIndex_Simple_ResetWarnings,
  55      UIActionIndex_Simple_NetworkAccessManager,
  56 -    UIActionIndex_Simple_CheckForUpdates,
  57      UIActionIndex_Simple_About,
  58
  59      /* Maximum index: */
  60 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
  61 +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
  62 @@ -1300,8 +1300,6 @@ void UISelectorWindow::prepareMenuHelp(Q
  63      m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
  64      pMenu->addAction(m_pRegisterAction);
  65  #endif /* VBOX_WITH_REGISTRATION */
  66 -    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
  67 -    pMenu->addAction(m_pUpdateAction);
  68  #ifndef Q_WS_MAC
  69      pMenu->addSeparator();
  70  #endif /* !Q_WS_MAC */
  71 @@ -1438,7 +1436,6 @@ void UISelectorWindow::prepareConnection
  72      connect(m_pRegisterAction, SIGNAL(triggered()), &vboxGlobal(), SLOT(showRegistrationDialog()));
  73      connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)), m_pRegisterAction, SLOT(setEnabled(bool)));
  74  #endif /* VBOX_WITH_REGISTRATION */
  75 -    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
  76      connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
  77
  78      /* Status-bar connections: */