[Pkg-virtualbox-commits] [SCM] virtualbox Debian packaging branch, master, updated. debian/4.2.16-dfsg-1

[Felix Geyer]

The following commit has been merged in the master branch:
commit 81f642bf8b284c4c85e1d1dde27d549a5acb8042
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Jul 21 23:24:47 2013 +0200

    Fix 16-no-update.patch to hide the update settings page again.

diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index 3525c27..77738d9 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -67,3 +67,17 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
      connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
  
      /* Status-bar connections: */
+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 GlobalSettingsPageType_Update:
++        {
++            return false;
++        }
+         default:
+             break;
+     }

-- 
virtualbox Debian packaging