- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 16860: Reuse favorite Tor Browser icon
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ee2e10d6e038b2b057499034437b4b6a393a4906 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 09:53:41 2015 +0200 Bug 16860: Reuse favorite Tor Browser icon Adding "StartupWMClass=Tor Browser" makes sure that the favorite Tor Browser icon is reused after Tor Browser got registered. If this property is missing one gets two icons: oe for the favorite and a new icon for the running instance. This impacts at least Gnome3. Thanks to a cypherpunk for the proposed fix. --- RelativeLink/start-tor-browser.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/RelativeLink/start-tor-browser.desktop b/RelativeLink/start-tor-browser.desktop index d6c1c63..9c63466 100755 --- a/RelativeLink/start-tor-browser.desktop +++ b/RelativeLink/start-tor-browser.desktop @@ -31,3 +31,4 @@ Categories=Network;WebBrowser;Security; Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser --detach)' dummy %k X-TorBrowser-ExecShell=./Browser/start-tor-browser --detach Icon=web-browser +StartupWMClass=Tor Browser

1 0

[tor-browser-bundle/maint-5.0] Bug #16866: include kvm-ok and use it on Debian
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ec4d734e654750492de727ee221bafa254754440 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 24 13:11:00 2015 +0200 Bug #16866: include kvm-ok and use it on Debian --- gitian/check-prerequisites.sh | 10 +++- tools/kvm-ok | 105 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index b36fca7..8518ffe 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -88,10 +88,16 @@ then exit 1 fi -kvm-ok > /dev/null +if [ $DISTRO = "Debian" ]; +then + kvm_ok=../tools/kvm-ok +else + kvm_ok=kvm-ok +fi +$kvm_ok > /dev/null if [ $? -ne 0 -a "z$USE_LXC" != "z1" ]; then - kvm-ok + $kvm_ok echo echo "Most likely, this means you will need to use LXC." echo diff --git a/tools/kvm-ok b/tools/kvm-ok new file mode 100755 index 0000000..5040935 --- /dev/null +++ b/tools/kvm-ok @@ -0,0 +1,105 @@ +#!/bin/sh +# +# kvm-ok - check whether the CPU we're running on supports KVM acceleration +# Copyright (C) 2008-2010 Canonical Ltd. +# +# Authors: +# Dustin Kirkland <kirkland(a)canonical.com> +# Kees Cook <kees.cook(a)canonical.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +set -e + +assert_root() { + if [ "$(id -u)" != "0" ]; then + echo "INFO: For more detailed results, you should run this as root" + echo "HINT: sudo $0" + exit 1 + fi +} + +verdict() { + # Print verdict + if [ "$1" = "0" ]; then + echo "KVM acceleration can be used" + exit 0 + else + echo "KVM acceleration can NOT be used" + exit 1 + fi +} + +# check cpu flags for capability +virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true +[ "$virt" = "vmx" ] && brand="intel" +[ "$virt" = "svm" ] && brand="amd" + +if [ -z "$virt" ]; then + echo "INFO: Your CPU does not support KVM extensions" + assert_root + verdict 1 +fi + +# Now, check that the device exists +if [ -e /dev/kvm ]; then + echo "INFO: /dev/kvm exists" + verdict 0 +else + echo "INFO: /dev/kvm does not exist" + echo "HINT: sudo modprobe kvm_$brand" +fi + +assert_root + +# Prepare MSR access +msr="/dev/cpu/0/msr" +if [ ! -r "$msr" ]; then + modprobe msr +fi +if [ ! -r "$msr" ]; then + echo "You must be root to run this check." >&2 + exit 2 +fi + +echo "INFO: Your CPU supports KVM extensions" + +disabled=0 +# check brand-specific registers +if [ "$virt" = "vmx" ]; then + BIT=$(rdmsr --bitfield 0:0 0x3a 2>/dev/null || true) + if [ "$BIT" = "1" ]; then + # and FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX clear (no tboot) + BIT=$(rdmsr --bitfield 2:2 0x3a 2>/dev/null || true) + if [ "$BIT" = "0" ]; then + disabled=1 + fi + fi + +elif [ "$virt" = "svm" ]; then + BIT=$(rdmsr --bitfield 4:4 0xc0010114 2>/dev/null || true) + if [ "$BIT" = "1" ]; then + disabled=1 + fi +else + echo "FAIL: Unknown virtualization extension: $virt" + verdict 1 +fi + +if [ "$disabled" -eq 1 ]; then + echo "INFO: KVM ($virt) is disabled by your BIOS" + echo "HINT: Enter your BIOS setup and enable Virtualization Technology (VT)," + echo " and then hard poweroff/poweron your system" + verdict 1 +fi + +verdict 0

1 0

[tor-browser-bundle/master] Bug #16866: include kvm-ok and use it on Debian
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ab767044c51e6455f764f0808b0f11d34534263e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 24 13:11:00 2015 +0200 Bug #16866: include kvm-ok and use it on Debian --- gitian/check-prerequisites.sh | 10 +++- tools/kvm-ok | 105 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index b36fca7..8518ffe 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -88,10 +88,16 @@ then exit 1 fi -kvm-ok > /dev/null +if [ $DISTRO = "Debian" ]; +then + kvm_ok=../tools/kvm-ok +else + kvm_ok=kvm-ok +fi +$kvm_ok > /dev/null if [ $? -ne 0 -a "z$USE_LXC" != "z1" ]; then - kvm-ok + $kvm_ok echo echo "Most likely, this means you will need to use LXC." echo diff --git a/tools/kvm-ok b/tools/kvm-ok new file mode 100755 index 0000000..5040935 --- /dev/null +++ b/tools/kvm-ok @@ -0,0 +1,105 @@ +#!/bin/sh +# +# kvm-ok - check whether the CPU we're running on supports KVM acceleration +# Copyright (C) 2008-2010 Canonical Ltd. +# +# Authors: +# Dustin Kirkland <kirkland(a)canonical.com> +# Kees Cook <kees.cook(a)canonical.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +set -e + +assert_root() { + if [ "$(id -u)" != "0" ]; then + echo "INFO: For more detailed results, you should run this as root" + echo "HINT: sudo $0" + exit 1 + fi +} + +verdict() { + # Print verdict + if [ "$1" = "0" ]; then + echo "KVM acceleration can be used" + exit 0 + else + echo "KVM acceleration can NOT be used" + exit 1 + fi +} + +# check cpu flags for capability +virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true +[ "$virt" = "vmx" ] && brand="intel" +[ "$virt" = "svm" ] && brand="amd" + +if [ -z "$virt" ]; then + echo "INFO: Your CPU does not support KVM extensions" + assert_root + verdict 1 +fi + +# Now, check that the device exists +if [ -e /dev/kvm ]; then + echo "INFO: /dev/kvm exists" + verdict 0 +else + echo "INFO: /dev/kvm does not exist" + echo "HINT: sudo modprobe kvm_$brand" +fi + +assert_root + +# Prepare MSR access +msr="/dev/cpu/0/msr" +if [ ! -r "$msr" ]; then + modprobe msr +fi +if [ ! -r "$msr" ]; then + echo "You must be root to run this check." >&2 + exit 2 +fi + +echo "INFO: Your CPU supports KVM extensions" + +disabled=0 +# check brand-specific registers +if [ "$virt" = "vmx" ]; then + BIT=$(rdmsr --bitfield 0:0 0x3a 2>/dev/null || true) + if [ "$BIT" = "1" ]; then + # and FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX clear (no tboot) + BIT=$(rdmsr --bitfield 2:2 0x3a 2>/dev/null || true) + if [ "$BIT" = "0" ]; then + disabled=1 + fi + fi + +elif [ "$virt" = "svm" ]; then + BIT=$(rdmsr --bitfield 4:4 0xc0010114 2>/dev/null || true) + if [ "$BIT" = "1" ]; then + disabled=1 + fi +else + echo "FAIL: Unknown virtualization extension: $virt" + verdict 1 +fi + +if [ "$disabled" -eq 1 ]; then + echo "INFO: KVM ($virt) is disabled by your BIOS" + echo "HINT: Enter your BIOS setup and enable Virtualization Technology (VT)," + echo " and then hard poweroff/poweron your system" + verdict 1 +fi + +verdict 0

1 0

[tor-browser-bundle/master] Bumping nightly components' versions
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ef487bd67ac32c5e49a1f2b3c1c7ecd143a4962d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 24 11:10:50 2015 +0200 Bumping nightly components' versions --- gitian/versions.nightly | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5deba38..8d7469e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.1.0esr +FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -39,10 +39,10 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1o +OPENSSL_VER=1.0.1p GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5 @@ -62,7 +62,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.31-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.36-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -86,13 +86,13 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 +OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=151339f3ba663a527b2bf7ce88a4ea1379833b7ac3b6277cdf67f6ab5a33af1b +NOSCRIPT_HASH=0585d95161711f6e4bcd56ed6f160c15bbf08ab6c559a675ce659e6c8ffb150d MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 16866: the libvirtd group is called libvirt on Debian
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit e8839ca324ee90b3ca20e088f1b4ea6cdce24547 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 17:49:41 2015 +0200 Bug 16866: the libvirtd group is called libvirt on Debian --- gitian/check-prerequisites.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 93ac158..b36fca7 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -106,14 +106,20 @@ fi if [ "z$USE_LXC" != "z1" ]; then - groups | grep libvirtd > /dev/null + if [ $DISTRO = "Debian" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi + groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ]; then - echo "You need to be in the libvirtd group to run Gitian." + echo "You need to be in the $libvirt_group group to run Gitian." echo echo "Please run:" - echo " sudo adduser $USER libvirtd" - echo " newgrp libvirtd" + echo " sudo adduser $USER $libvirt_group" + echo " newgrp $libvirt_group" exit 1 fi if [ -z "$DISPLAY" ];

1 0

[tor-browser-bundle/maint-5.0] Bug 16866: the libvirtd group is called libvirt on Debian
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit a83e7a61e82c1604d0db3f2007e5a66627781c69 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 17:49:41 2015 +0200 Bug 16866: the libvirtd group is called libvirt on Debian --- gitian/check-prerequisites.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 93ac158..b36fca7 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -106,14 +106,20 @@ fi if [ "z$USE_LXC" != "z1" ]; then - groups | grep libvirtd > /dev/null + if [ $DISTRO = "Debian" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi + groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ]; then - echo "You need to be in the libvirtd group to run Gitian." + echo "You need to be in the $libvirt_group group to run Gitian." echo echo "Please run:" - echo " sudo adduser $USER libvirtd" - echo " newgrp libvirtd" + echo " sudo adduser $USER $libvirt_group" + echo " newgrp $libvirt_group" exit 1 fi if [ -z "$DISPLAY" ];

1 0

[tor-browser-bundle/maint-5.0] Bug 16875: Add boklm as an official build verifier
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit 9d83c67fff131bf76b0b993f9ebfa70704bd8975 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 21 14:24:24 2015 +0200 Bug 16875: Add boklm as an official build verifier --- gitian/check-match.sh | 2 +- gitian/gpg/boklm.gpg | Bin 0 -> 1706 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index e264ef3..ad12ff3 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -3,7 +3,7 @@ # XXX: Args? HOST=people.torproject.org BASE_DIR=public_html/builds/ -USERS="linus mikeperry erinn gk" +USERS="linus mikeperry erinn gk boklm" set -e set -u diff --git a/gitian/gpg/boklm.gpg b/gitian/gpg/boklm.gpg new file mode 100644 index 0000000..5d8e1f6 Binary files /dev/null and b/gitian/gpg/boklm.gpg differ

1 0

[tor-browser-bundle/master] Bug 16875: Add boklm as an official build verifier
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit 031fc5b1b4b922d63ecb1e8f27562d1126637150 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 21 14:24:24 2015 +0200 Bug 16875: Add boklm as an official build verifier --- gitian/check-match.sh | 2 +- gitian/gpg/boklm.gpg | Bin 0 -> 1706 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index e264ef3..ad12ff3 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -3,7 +3,7 @@ # XXX: Args? HOST=people.torproject.org BASE_DIR=public_html/builds/ -USERS="linus mikeperry erinn gk" +USERS="linus mikeperry erinn gk boklm" set -e set -u diff --git a/gitian/gpg/boklm.gpg b/gitian/gpg/boklm.gpg new file mode 100644 index 0000000..5d8e1f6 Binary files /dev/null and b/gitian/gpg/boklm.gpg differ

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 1efbcfcb50459140bf7c606a85d07e73600db414 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 470b0fd685c904874254413aebdfb2de84927c47 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0