X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=16-no-update.patch;h=5cd2a0407ea18228537b8c99260fbdde6150d0d4;hb=7e84622ac5b68be08a8baa999f3fb0b41488989d;hp=be4e300de91ac978281bf23e02b0c9a9c8fcd9ce;hpb=ca2bedcf58e29336b8026c8e1702449c07f38f26;p=packages%2FVirtualBox.git

diff --git a/16-no-update.patch b/16-no-update.patch
index be4e300..5cd2a04 100644
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -1,33 +1,73 @@
 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>
 
-diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2010-12-17 16:14:24.000000000 +0100
-+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	2011-01-02 00:03:55.120533579 +0100
-@@ -501,6 +501,10 @@
+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
+@@ -474,6 +474,8 @@ void UIUpdateManager::shutdown()
+ 
+ void UIUpdateManager::sltForceCheck()
+ {
++    return;
++
+     /* 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_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);
+ }
+--- 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_ResetWarnings,
+ #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+     UIActionIndex_Simple_NetworkAccessManager,
+-    UIActionIndex_Simple_CheckForUpdates,
+ #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+     UIActionIndex_Simple_About,
+ 
+--- 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
+     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();
+@@ -1443,7 +1437,6 @@ void UISelectorWindow::prepareConnection
+     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()));
+ 
+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
+@@ -557,6 +557,10 @@ bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
  #endif /* !VBOX_WITH_NETFLT */
              break;
          }
-+        case GLSettingsPage_Update:
++        case GlobalSettingsPageType_Update:
 +        {
 +            return false;
 +        }
          default:
              break;
      }
---- VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp.orig	2011-08-15 14:28:35.000000000 +0200
-+++ VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp	2011-08-17 22:48:08.700558251 +0200
-@@ -1747,12 +1747,6 @@
-     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Register));
- #endif /* VBOX_WITH_REGISTRATION */
- 
--    pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Update));
--
--#ifndef Q_WS_MAC
--    pMenu->addSeparator();
--#endif /* !Q_WS_MAC */
--
-     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About));
- 
-     /* Configure connections: */