X-Git-Url: http://git.pld-linux.org/?p=packages%2FVirtualBox.git;a=blobdiff_plain;f=16-no-update.patch;h=68bd6f64cd898bafb0ac3fa170384833c448ae03;hp=77738d987940255e455d984b0ead8644605c17f3;hb=39fbfa15dce6a5db767a5f1aece5e42e9cb5b1f2;hpb=282fa2ec6eab90cd715c1bfad865405c36e1662c

diff --git a/16-no-update.patch b/16-no-update.patch
index 77738d9..68bd6f6 100644
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -14,59 +14,55 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      /* 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_WebSite] = new UIActionSimpleWebSite(this);
-     m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
-     m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
--    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
-     m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
- }
- 
-@@ -570,9 +569,6 @@ void UIActionPool::createMenus()
-     m_pool[UIActionIndex_Simple_CheckForUpdates]->setVisible(false);
- #endif
- #if !(defined(Q_WS_MAC) && (QT_VERSION < 0x040700))
--    if (m_pool[UIActionIndex_Simple_CheckForUpdates])
--        delete m_pool[UIActionIndex_Simple_CheckForUpdates];
--    m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
-     if (m_pool[UIActionIndex_Simple_About])
-         delete m_pool[UIActionIndex_Simple_About];
-     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_WebSite,
-     UIActionIndex_Simple_ResetWarnings,
-     UIActionIndex_Simple_NetworkAccessManager,
--    UIActionIndex_Simple_CheckForUpdates,
-     UIActionIndex_Simple_About,
- 
-     /* Maximum index: */
---- 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
-     m_pRegisterAction = gActionPool->action(UIActionIndex_Simple_Register);
-     pMenu->addAction(m_pRegisterAction);
- #endif /* VBOX_WITH_REGISTRATION */
--    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
--    CVirtualBox vbox = vboxGlobal().virtualBox();
--    if (VBoxGlobal::shouldWeAllowApplicationUpdate(vbox))
--        pMenu->addAction(m_pUpdateAction);
--    else
--        m_pUpdateAction->setEnabled(false);
- #ifndef Q_WS_MAC
-     pMenu->addSeparator();
- #endif /* !Q_WS_MAC */
-@@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
-     connect(m_pRegisterAction, SIGNAL(triggered()), &vboxGlobal(), SLOT(showRegistrationDialog()));
-     connect(gEDataEvents, SIGNAL(sigCanShowRegistrationDlg(bool)), m_pRegisterAction, SLOT(setEnabled(bool)));
- #endif /* VBOX_WITH_REGISTRATION */
--    connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
-     connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
- 
-     /* Status-bar connections: */
+--- 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), SIGNAL(triggered()),
+             gNetworkManager, SLOT(show()), Qt::UniqueConnection);
+-    connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()),
+-            gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+     connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
+             &msgCenter(), SLOT(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 */
+@@ -1255,8 +1253,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: */
+-    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