Description: Disable "Check for Updates" action. Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 Author: Daniel Hahler , Felix Geyer , Gianfranco Costamagna Index: virtualbox/doc/manual/en_US/user_Introduction.xml =================================================================== --- virtualbox.orig/doc/manual/en_US/user_Introduction.xml +++ virtualbox/doc/manual/en_US/user_Introduction.xml @@ -3390,14 +3390,14 @@ . - + Language. Enables the user to diff --git a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp index 2b0484f22..c532d7e09 100644 --- a/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp @@ -2344,7 +2344,7 @@ QString UIExtraDataManager::preventBetaBuildWarningForVersion() bool UIExtraDataManager::applicationUpdateEnabled() { /* 'True' unless 'restriction' feature allowed: */ - return !isFeatureAllowed(GUI_PreventApplicationUpdate); + return false; } QString UIExtraDataManager::applicationUpdateData() #diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk #index d5b1813cb..b083c56ad 100644 #--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk #+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk #@@ -190,10 +190,10 @@ ifdef VBOX_WITH_VIDEOHWACCEL # else ifdef VBOX_GUI_USE_QGL # VirtualBox_DEFS += VBOX_GUI_USE_QGL # endif #-ifdef VBOX_WITH_LIBCURL #- VirtualBox_DEFS += VBOX_GUI_WITH_NETWORK_MANAGER #- VBOX_GUI_WITH_NETWORK_MANAGER := 1 #-endif #+#ifdef VBOX_WITH_LIBCURL #+# VirtualBox_DEFS += VBOX_GUI_WITH_NETWORK_MANAGER #+# VBOX_GUI_WITH_NETWORK_MANAGER := 1 #+#endif # if "$(KBUILD_TYPE)" != "release" || defined(VBOX_GUI_WITH_EXTRADATA_MANAGER_UI) # VirtualBox_DEFS += VBOX_GUI_WITH_EXTRADATA_MANAGER_UI # endif --- virtualbox-6.0.2-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +++ virtualbox-6.0.2-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -33,10 +33,10 @@ #include "UIGlobalSettingsInput.h" #include "UIGlobalSettingsLanguage.h" #include "UIGlobalSettingsNetwork.h" -#ifdef VBOX_GUI_WITH_NETWORK_MANAGER -# include "UIGlobalSettingsProxy.h" -# include "UIGlobalSettingsUpdate.h" -#endif +//#ifdef VBOX_GUI_WITH_NETWORK_MANAGER +//# include "UIGlobalSettingsProxy.h" +//# include "UIGlobalSettingsUpdate.h" +//#endif /* GUI includes: Machine Settings: */ #include "UIMachineSettingsAudio.h" @@ -86,7 +86,7 @@ void UISettingsDialogGlobal::retranslate #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* Update page: */ - m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); + //m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update")); #endif /* Language page: */ @@ -103,7 +103,7 @@ void UISettingsDialogGlobal::retranslate #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* Proxy page: */ - m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy")); + //m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy")); #endif /* Polish the selector: */ @@ -204,13 +204,13 @@ void UISettingsDialogGlobal::prepare() } #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* Update page: */ - case GlobalSettingsPageType_Update: + /*case GlobalSettingsPageType_Update: { pSettingsPage = new UIGlobalSettingsUpdate; addItem(":/refresh_32px.png", ":/refresh_24px.png", ":/refresh_16px.png", iPageIndex, "#update", pSettingsPage); break; - } + }*/ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ /* Language page: */ case GlobalSettingsPageType_Language: @@ -246,13 +246,13 @@ void UISettingsDialogGlobal::prepare() } #ifdef VBOX_GUI_WITH_NETWORK_MANAGER /* Proxy page: */ - case GlobalSettingsPageType_Proxy: + /*case GlobalSettingsPageType_Proxy: { pSettingsPage = new UIGlobalSettingsProxy; addItem(":/proxy_32px.png", ":/proxy_24px.png", ":/proxy_16px.png", iPageIndex, "#proxy", pSettingsPage); break; - } + }*/ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */ default: break;