]>
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 | } | |
8c008609 JP |
17 | --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp.orig 2015-07-09 20:11:53.129742315 +0200 |
18 | +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp 2015-07-09 20:12:02.136424394 +0200 | |
19 | @@ -991,7 +991,6 @@ | |
20 | m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this); | |
0190f7b9 | 21 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
8c008609 JP |
22 | m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this); |
23 | - m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this); | |
ebc5ec73 | 24 | #endif |
8c008609 JP |
25 | m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this); |
26 | m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this); | |
27 | @@ -1033,8 +1033,6 @@ | |
0190f7b9 | 28 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
fdf4c273 JP |
29 | connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered, |
30 | gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection); | |
31 | - connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered, | |
32 | - gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection); | |
ebc5ec73 | 33 | #endif |
fdf4c273 JP |
34 | connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered, |
35 | &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection); | |
8c008609 JP |
36 | --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig 2015-07-09 20:13:36.439757556 +0200 |
37 | +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h 2015-07-09 20:13:40.446396985 +0200 | |
38 | @@ -62,7 +62,6 @@ | |
39 | UIActionIndex_M_Application_S_Preferences, | |
0190f7b9 | 40 | #ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
8c008609 JP |
41 | UIActionIndex_M_Application_S_NetworkAccessManager, |
42 | - UIActionIndex_M_Application_S_CheckForUpdates, | |
0190f7b9 | 43 | #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ |
8c008609 JP |
44 | UIActionIndex_M_Application_S_ResetWarnings, |
45 | UIActionIndex_M_Application_S_Close, | |
ebc5ec73 JP |
46 | --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp.orig 2015-07-09 20:09:22.239478146 +0200 |
47 | +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp 2015-07-09 20:17:20.635207663 +0200 | |
48 | @@ -1211,9 +1211,6 @@ | |
8c008609 | 49 | /* 'About' action goes to Application menu: */ |
ebc5ec73 | 50 | pMenu->addAction(action(UIActionIndex_M_Application_S_About)); |
8c008609 JP |
51 | # ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
52 | - /* 'Check for Updates' action goes to Application menu: */ | |
ebc5ec73 JP |
53 | - if (gEDataManager->applicationUpdateEnabled()) |
54 | - pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates)); | |
8c008609 | 55 | /* 'Network Access Manager' action goes to Application menu: */ |
ebc5ec73 JP |
56 | pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager)); |
57 | # endif | |
9970fc61 | 58 | @@ -1368,9 +1365,6 @@ |
8c008609 JP |
59 | # ifdef VBOX_GUI_WITH_NETWORK_MANAGER |
60 | /* 'Network Access Manager' action goes to 'File' menu: */ | |
ebc5ec73 | 61 | pMenu->addAction(action(UIActionIndex_M_Application_S_NetworkAccessManager)); |
8c008609 | 62 | - /* 'Check for Updates' action goes to 'File' menu: */ |
9970fc61 | 63 | - if (gEDataManager->applicationUpdateEnabled()) |
ebc5ec73 JP |
64 | - pMenu->addAction(action(UIActionIndex_M_Application_S_CheckForUpdates)); |
65 | # endif | |
66 | /* Separator after tool actions of the 'File' menu: */ | |
67 | pMenu->addSeparator(); | |
282fa2ec JR |
68 | diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp |
69 | --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp | |
70 | +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp | |
71 | @@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId) | |
ebc5ec73 | 72 | #endif |
282fa2ec JR |
73 | break; |
74 | } | |
75 | + case GlobalSettingsPageType_Update: | |
76 | + { | |
77 | + return false; | |
78 | + } | |
79 | default: | |
80 | break; | |
81 | } | |
ebc5ec73 JP |
82 | --- VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp.orig 2018-12-19 19:53:33.019049148 +0100 |
83 | +++ VirtualBox-6.0.0/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp 2018-12-19 19:53:56.902224273 +0100 | |
84 | @@ -1366,8 +1366,6 @@ | |
85 | m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowCloudProfileManager)); | |
86 | # ifdef VBOX_GUI_WITH_NETWORK_MANAGER | |
87 | m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager)); | |
88 | - if (gEDataManager->applicationUpdateEnabled()) | |
89 | - m_pContextMenuGlobal->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates)); | |
90 | # endif | |
91 | #endif /* !VBOX_WS_MAC */ | |
92 | } |