]>
Commit | Line | Data |
---|---|---|
acf12a87 AM |
1 | Description: Disable "Check for Updates" action. |
2 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 | |
cc827380 | 3 | Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org> |
acf12a87 | 4 | |
cc827380 JR |
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 | |
282fa2ec | 8 | @@ -474,6 +474,8 @@ void UIUpdateManager::shutdown() |
cc827380 JR |
9 | |
10 | void UIUpdateManager::sltForceCheck() | |
11 | { | |
12 | + return; | |
13 | + | |
14 | /* Force call for new version check: */ | |
15 | sltCheckIfUpdateIsNecessary(true /* force call */); | |
16 | } | |
cc827380 JR |
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() | |
cc827380 | 20 | m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this); |
0190f7b9 | 21 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
cc827380 JR |
22 | m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this); |
23 | - m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this); | |
0190f7b9 | 24 | #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ |
cc827380 JR |
25 | m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this); |
26 | } | |
cc827380 JR |
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 | |
cc827380 | 30 | UIActionIndex_Simple_ResetWarnings, |
0190f7b9 | 31 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
cc827380 JR |
32 | UIActionIndex_Simple_NetworkAccessManager, |
33 | - UIActionIndex_Simple_CheckForUpdates, | |
0190f7b9 | 34 | #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ |
cc827380 JR |
35 | UIActionIndex_Simple_About, |
36 | ||
cc827380 JR |
37 | --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp |
38 | +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp | |
282fa2ec | 39 | @@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q |
7733446a JR |
40 | pMenu->addSeparator(); |
41 | m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager); | |
42 | pMenu->addAction(m_pNetworkAccessManager); | |
cc827380 | 43 | - m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates); |
282fa2ec JR |
44 | - CVirtualBox vbox = vboxGlobal().virtualBox(); |
45 | - if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox)) | |
46 | - pMenu->addAction(m_pUpdateAction); | |
47 | - else | |
48 | - m_pUpdateAction->setEnabled(false); | |
0190f7b9 | 49 | #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ |
cc827380 JR |
50 | #ifndef Q_WS_MAC |
51 | pMenu->addSeparator(); | |
282fa2ec | 52 | @@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection |
7733446a | 53 | connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages())); |
0190f7b9 | 54 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
7733446a | 55 | connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show())); |
cc827380 | 56 | - connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck())); |
0190f7b9 | 57 | #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ |
cc827380 JR |
58 | connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog())); |
59 | ||
282fa2ec JR |
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 */ | |
65 | break; | |
66 | } | |
67 | + case GlobalSettingsPageType_Update: | |
68 | + { | |
69 | + return false; | |
70 | + } | |
71 | default: | |
72 | break; | |
73 | } |