[tbb-commits] [torbutton/maint-1.9.6] Revert "Bug 14429: Enable auto-resizing; disable maximization warning."

[gk at torproject.org]

commit 171e2b786572dfcec904780223f9928b1c628951
Author: Georg Koppen <gk at torproject.org>
Date:   Tue May 24 19:21:18 2016 +0000

    Revert "Bug 14429: Enable auto-resizing; disable maximization warning."
    
    This reverts commit a0a651607a957ac8473cea717c8a440cdcea0144.
---
 src/defaults/preferences/preferences.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index b7fa11b..a8eea21 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -25,7 +25,7 @@ pref("extensions.torbutton.prompted_language",false);
 // TODO: This is just part of a stopgap until #14429 gets properly implemented.
 // See #7255 for details. We display the warning three times to make sure the
 // user did not click on it by accident.
-pref("extensions.torbutton.maximize_warnings_remaining", 0);
+pref("extensions.torbutton.maximize_warnings_remaining", 3);
 
 // Security prefs:
 pref("extensions.torbutton.cookie_protections",true);
@@ -34,7 +34,7 @@ pref("extensions.torbutton.spoof_english",true);
 pref("extensions.torbutton.clear_http_auth",true);
 pref("extensions.torbutton.close_newnym",true);
 pref("extensions.torbutton.resize_new_windows",true);
-pref("extensions.torbutton.resize_windows",true);
+pref("extensions.torbutton.resize_windows",false);
 pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last
 pref("extensions.torbutton.tor_memory_jar",false);
 pref("extensions.torbutton.nontor_memory_jar",false);