Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
-Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <debfx-pkg@fobos.de>
+Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>
---- VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig 2012-08-13 13:35:11.000000000 +0200
-+++ VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2012-08-16 02:12:54.423685632 +0200
-@@ -544,6 +544,11 @@
+diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+--- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
+
+ void UIUpdateManager::sltForceCheck()
+ {
++ return;
++
+ /* Force call for new version check: */
+ sltCheckIfUpdateIsNecessary(true /* force call */);
+ }
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp.orig 2015-07-09 20:11:53.129742315 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.cpp 2015-07-09 20:12:02.136424394 +0200
+@@ -991,7 +991,6 @@
+ m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
+- m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+ m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
+@@ -1033,8 +1033,6 @@
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered,
+ gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection);
+- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered,
+- gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered,
+ &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection);
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h.orig 2015-07-09 20:13:36.439757556 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/globals/UIActionPool.h 2015-07-09 20:13:40.446396985 +0200
+@@ -62,7 +62,6 @@
+ UIActionIndex_M_Application_S_Preferences,
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ UIActionIndex_M_Application_S_NetworkAccessManager,
+- UIActionIndex_M_Application_S_CheckForUpdates,
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ UIActionIndex_M_Application_S_ResetWarnings,
+ UIActionIndex_M_Application_S_Close,
+--- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp.orig 2015-07-09 20:09:22.239478146 +0200
++++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2015-07-09 20:17:20.635207663 +0200
+@@ -1211,8 +1211,6 @@
+ /* 'About' action goes to Application menu: */
+ pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+- /* 'Check for Updates' action goes to Application menu: */
+- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ /* 'Network Access Manager' action goes to Application menu: */
+ pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+ # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+@@ -1303,7 +1301,6 @@
+ addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+- addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
+ addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
+@@ -1368,9 +1365,6 @@
+ # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ /* 'Network Access Manager' action goes to 'File' menu: */
+ pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
+- /* 'Check for Updates' action goes to 'File' menu: */
+- if (gEDataManager->applicationUpdateEnabled())
+- pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+ # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ /* 'Reset Warnings' action goes 'File' menu: */
+ pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
+diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
#endif /* !VBOX_WITH_NETFLT */
break;
}
-+ case GLSettingsPage_Update:
++ case GlobalSettingsPageType_Update:
+ {
-+ return false;
-+ break;
-+ }
++ return false;
++ }
default:
break;
}
---- VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp.orig 2012-08-13 13:35:09.000000000 +0200
-+++ VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2012-08-16 02:03:36.328578159 +0200
-@@ -1291,11 +1291,7 @@
- m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
- pMenu->addAction(m_pRegisterAction);
- #endif /* VBOX_WITH_REGISTRATION */
- m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
-- pMenu->addAction(m_pUpdateAction);
--#ifndef Q_WS_MAC
-- pMenu->addSeparator();
--#endif /* !Q_WS_MAC */
- m_pAboutAction = gActionPool->action(UIActionIndex_Simple_About);
- pMenu->addAction(m_pAboutAction);
- }
projects / packages / VirtualBox.git / blobdiff