- updated ubuntu patches

[packages/VirtualBox.git] / 16-no-update.patch

diff --git a/16-no-update.patch b/16-no-update.patch
index 90021d463ad53dc41e56e40a09d5e659f99fd25b..a09cfa3a3bf5050bc85f940bd77f6091d7ebb316 100644 (file)
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -1,32 +1,78 @@
 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>
 
---- VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp.orig  2012-08-13 13:35:11.000000000 +0200
-+++ VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp       2012-08-16 02:12:54.423685632 +0200
-@@ -544,6 +544,11 @@
+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
+@@ -465,6 +465,8 @@ void UIUpdateManager::shutdown()
+ 
+ void UIUpdateManager::sltForceCheck()
+ {
++    return;
++
+     /* Force call for new version check: */
+     sltCheckIfUpdateIsNecessary(true /* force call */);
+ }
+--- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
++++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+@@ -550,6 +550,10 @@ bool UISettingsDialogGlobal::isPageAvail
  #endif /* !VBOX_WITH_NETFLT */
              break;
          }
 +        case GLSettingsPage_Update:
 +        {
-+             return false;
-+             break;
-+         }
++            return false;
++        }
          default:
              break;
      }
---- VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp.orig  2012-08-13 13:35:09.000000000 +0200
-+++ VirtualBox-4.2.0_RC1/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp       2012-08-16 02:03:36.328578159 +0200
-@@ -1291,11 +1291,7 @@
+--- 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
+@@ -1300,8 +1300,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);
+-    m_pUpdateAction = gActionPool->action(UIActionIndex_Simple_CheckForUpdates);
 -    pMenu->addAction(m_pUpdateAction);
--#ifndef Q_WS_MAC
--    pMenu->addSeparator();
--#endif /* !Q_WS_MAC */
-     m_pAboutAction = gActionPool->action(UIActionIndex_Simple_About);
-     pMenu->addAction(m_pAboutAction);
- }
+ #ifndef Q_WS_MAC
+     pMenu->addSeparator();
+ #endif /* !Q_WS_MAC */
+@@ -1438,7 +1436,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: */