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>
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2010-12-17 16:14:24.000000000 +0100
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2011-01-01 23:55:23.240440031 +0100
-@@ -4565,6 +4565,9 @@
- */
- void VBoxGlobal::showUpdateDialog (bool aForce)
+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()
{
-+ // Updates are handled through package managers.
+ return;
+
- /* Silently check in one day after current time-stamp */
- QTimer::singleShot (24 /* hours */ * 60 /* minutes */ *
- 60 /* seconds */ * 1000 /* milliseconds */,
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2010-11-22 11:05:07.000000000 +0100
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2011-01-01 23:56:55.292774878 +0100
-@@ -266,13 +266,6 @@
- #if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
- if (m_fIsFirstTime)
- # endif
-- pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_Update));
--#ifndef Q_WS_MAC
-- pMenu->addSeparator();
--#endif /* !Q_WS_MAC */
--#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700)
-- if (m_fIsFirstTime)
--# endif
- pMenu->addAction(pActionsPool->action(UIActionIndex_Simple_About));
+ /* Force call for new version check: */
+ sltCheckIfUpdateIsNecessary(true /* force call */);
+ }
+--- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
+@@ -538,7 +538,6 @@ void UIActionPool::createActions()
+ m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
+- m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
+ }
+--- a/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
++++ b/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
+@@ -47,7 +47,6 @@ enum UIActionIndex
+ UIActionIndex_Simple_ResetWarnings,
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ UIActionIndex_Simple_NetworkAccessManager,
+- UIActionIndex_Simple_CheckForUpdates,
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ UIActionIndex_Simple_About,
+--- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+@@ -1301,12 +1301,6 @@ void UISelectorWindow::prepareMenuHelp(Q
+ pMenu->addSeparator();
+ m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
+ pMenu->addAction(m_pNetworkAccessManager);
+- m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
+- CVirtualBox vbox = vboxGlobal().virtualBox();
+- if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
+- pMenu->addAction(m_pUpdateAction);
+- else
+- m_pUpdateAction->setEnabled(false);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ #ifndef Q_WS_MAC
+ pMenu->addSeparator();
+@@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
+ connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+ connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
+- connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+ connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2010-12-17 16:14:24.000000000 +0100
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2011-01-02 00:03:55.120533579 +0100
-@@ -501,6 +501,10 @@
+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;
+ }
default:
break;
}
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2010-08-13 12:17:07.000000000 +0200
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/VBoxHelpActions.cpp 2011-01-02 00:00:00.599195342 +0100
-@@ -90,13 +90,6 @@
- GetExtraData (VBoxDefs::GUI_RegistrationDlgWinID).isEmpty());
- #endif
-
-- aMenu->addAction (updateAction);
-- updateAction->setEnabled (vboxGlobal().virtualBox().
-- GetExtraData (VBoxDefs::GUI_UpdateDlgWinID).isEmpty());
--
--#ifndef Q_WS_MAC
-- aMenu->addSeparator();
--#endif /* Q_WS_MAC */
- aMenu->addAction (aboutAction);
- }
-
projects / packages / VirtualBox.git / blobdiff