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>
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()
10 void UIUpdateManager::sltForceCheck()
14 /* Force call for new version check: */
15 sltCheckIfUpdateIsNecessary(true /* force call */);
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);
27 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
28 +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
29 @@ -47,7 +47,6 @@ enum UIActionIndex
30 UIActionIndex_Simple_WebSite,
31 UIActionIndex_Simple_ResetWarnings,
32 UIActionIndex_Simple_NetworkAccessManager,
33 - UIActionIndex_Simple_CheckForUpdates,
34 UIActionIndex_Simple_About,
37 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
38 +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
39 @@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q
40 pMenu->addSeparator();
41 m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
42 pMenu->addAction(m_pNetworkAccessManager);
43 - m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
44 - CVirtualBox vbox = vboxGlobal().virtualBox();
45 - if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
46 - pMenu->addAction(m_pUpdateAction);
48 - m_pUpdateAction->setEnabled(false);
50 pMenu->addSeparator();
51 #endif /* !Q_WS_MAC */
52 @@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
53 connect(m_pWebAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpWebDialog()));
54 connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
55 connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
56 - connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
57 connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
59 /* Status-bar connections: */
60 diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
61 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
62 +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
63 @@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
64 #endif /* !VBOX_WITH_NETFLT */
67 + case GlobalSettingsPageType_Update: