X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=16-no-update.patch;h=a09cfa3a3bf5050bc85f940bd77f6091d7ebb316;hb=854fd8db4c4b6c0e7fd5719e8d8314ece0f76785;hp=9151a271f9da9dc125d45dc94bc846872f1409d1;hpb=0d80b52e9652377ef541cf0bc01b88971648abe4;p=packages%2FVirtualBox.git diff --git a/16-no-update.patch b/16-no-update.patch index 9151a27..a09cfa3 100644 --- a/16-no-update.patch +++ b/16-no-update.patch @@ -1,40 +1,22 @@ Description: Disable "Check for Updates" action. Bug-Ubuntu: https://bugs.launchpad.net/bugs/272212 -Author: Daniel Hahler , Felix Geyer +Author: Daniel Hahler , Felix Geyer -diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp ---- virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2010-12-17 16:14:24.000000000 +0100 -+++ virtualbox-ose-4.0.0-dfsg/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2011-01-01 23:55:23.240440031 +0100 -@@ -4565,6 +4565,9 @@ - */ - void VBoxGlobal::showUpdateDialog (bool aForce) +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() { -+ // Updates are handled through package managers. + return; + - /* Silently check in one day after current time-stamp */ - QTimer::singleShot (24 /* hours */ * 60 /* minutes */ * - 60 /* seconds */ * 1000 /* milliseconds */, ---- VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp.orig 2011-08-15 14:28:35.000000000 +0200 -+++ VirtualBox-4.1.2_OSE/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp 2011-08-16 23:27:21.954256054 +0200 -@@ -275,13 +275,6 @@ - #if defined(Q_WS_MAC) && (QT_VERSION < 0x040700) - if (m_fIsFirstTime) - # endif -- pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Update)); --#ifndef Q_WS_MAC -- pMenu->addSeparator(); --#endif /* !Q_WS_MAC */ --#if defined(Q_WS_MAC) && (QT_VERSION < 0x040700) -- if (m_fIsFirstTime) --# endif - pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About)); - - -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 @@ + /* 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; } @@ -45,18 +27,52 @@ diff -Nur virtualbox-ose-4.0.0-dfsg.orig/src/VBox/Frontends/VirtualBox/src/setti 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 */ +--- 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); + } -- pMenu->addAction(gActionPool->action(UIActionIndex_Simple_Update)); -- --#ifndef Q_WS_MAC -- pMenu->addSeparator(); --#endif /* !Q_WS_MAC */ -- - pMenu->addAction(gActionPool->action(UIActionIndex_Simple_About)); +@@ -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); +- pMenu->addAction(m_pUpdateAction); + #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())); - /* Configure connections: */ + /* Status-bar connections: */