up to 5.2.2
[packages/VirtualBox.git] / 16-no-update.patch
1 Description: Disable "Check for Updates" action.
2 Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
3 Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>
4
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
8 @@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
9  
10  void UIUpdateManager::sltForceCheck()
11  {
12 +    return;
13 +
14      /* Force call for new version check: */
15      sltCheckIfUpdateIsNecessary(true /* force call */);
16  }
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);
21  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
22      m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
23 -    m_pool[UIActionIndex_M_Application_S_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
24  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
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 @@
28  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
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);
33  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
34      connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered,
35              &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection);
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,
40  #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
41      UIActionIndex_M_Application_S_NetworkAccessManager,
42 -    UIActionIndex_M_Application_S_CheckForUpdates,
43  #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
44      UIActionIndex_M_Application_S_ResetWarnings,
45      UIActionIndex_M_Application_S_Close,
46 --- VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp.orig     2015-07-09 20:09:22.239478146 +0200
47 +++ VirtualBox-5.0.0/src/VBox/./Frontends/VirtualBox/src/selector/UISelectorWindow.cpp  2015-07-09 20:17:20.635207663 +0200
48 @@ -1211,8 +1211,6 @@
49      /* 'About' action goes to Application menu: */
50      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
51  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
52 -    /* 'Check for Updates' action goes to Application menu: */
53 -    pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
54      /* 'Network Access Manager' action goes to Application menu: */
55      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
56  # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
57 @@ -1303,7 +1301,6 @@
58      addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
59  #  ifdef VBOX_GUI_WITH_NETWORK_MANAGER
60      addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
61 -    addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
62  #  endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
63      addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
64      addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
65 @@ -1368,9 +1365,6 @@
66  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
67      /* 'Network Access Manager' action goes to 'File' menu: */
68      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
69 -    /* 'Check for Updates' action goes to 'File' menu: */
70 -    if (gEDataManager->applicationUpdateEnabled())
71 -        pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
72  # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
73      /* 'Reset Warnings' action goes 'File' menu: */
74      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
75 diff a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
76 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
77 +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
78 @@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
79  #endif /* !VBOX_WITH_NETFLT */
80              break;
81          }
82 +        case GlobalSettingsPageType_Update:
83 +        {
84 +            return false;
85 +        }
86          default:
87              break;
88      }
This page took 0.041848 seconds and 3 git commands to generate.