1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
Description: Disable "Check for Updates" action.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212
Author: Daniel Hahler <ubuntu@thequod.de>, Felix Geyer <fgeyer@debian.org>
diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp 2013-11-19 03:42:12.725479132 -0500
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp 2013-11-19 03:42:12.721479132 -0500
@@ -475,6 +475,8 @@
void UIUpdateManager::sltForceCheck()
{
+ return;
+
/* Force call for new version check: */
sltCheckIfUpdateIsNecessary(true /* force call */);
}
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp 2013-11-19 03:42:12.725479132 -0500
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp 2013-11-19 03:42:12.721479132 -0500
@@ -653,7 +653,6 @@
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);
}
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h 2013-11-19 03:42:12.725479132 -0500
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h 2013-11-19 03:42:12.721479132 -0500
@@ -59,7 +59,6 @@
UIActionIndex_Simple_ResetWarnings,
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
UIActionIndex_Simple_NetworkAccessManager,
- UIActionIndex_Simple_CheckForUpdates,
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
UIActionIndex_Simple_About,
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2013-11-19 03:42:12.725479132 -0500
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp 2013-11-19 04:34:19.701624365 -0500
@@ -1331,12 +1331,6 @@
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();
@@ -1473,7 +1467,6 @@
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()));
Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2013-11-19 03:42:12.725479132 -0500
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp 2013-11-19 03:42:12.725479132 -0500
@@ -545,6 +545,10 @@
#endif /* !VBOX_WITH_NETFLT */
break;
}
+ case GlobalSettingsPageType_Update:
+ {
+ return false;
+ }
default:
break;
}
|
