[tor-commits] [torbutton/master] Revert "Bug 14429: Enable auto-resizing; disable maximization warning."

[gk at torproject.org]

commit f35b2f858359289d1c47967d34ca03bd678397c8
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jun 4 12:01:18 2015 +0000

    Revert "Bug 14429: Enable auto-resizing; disable maximization warning."
    
    This reverts commit 9690abf00de1dbc09fe070b72007a2fca3e6270c for the
    stable Tor Browser series.
---
 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 4d1dee0..68c4f60 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -118,7 +118,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);
 pref("extensions.torbutton.startup_resize_period", true);
 
 // Security prefs:
@@ -159,7 +159,7 @@ pref("extensions.torbutton.close_newnym",true);
 pref("extensions.torbutton.block_js_history",true);
 pref("extensions.torbutton.resize_on_toggle",true);
 pref("extensions.torbutton.resize_new_windows",true);
-pref("extensions.torbutton.resize_windows",true);
+pref("extensions.torbutton.resize_windows",false);
 pref("extensions.torbutton.banned_ports","9050,9051,9150,9151");
 pref("extensions.torbutton.block_tor_file_net",true);
 pref("extensions.torbutton.block_nontor_file_net",false);