[Pkg-mozext-commits] [SCM] perspectives-extension branch, debian, updated. 4.2-4-136-gd6962eb

[Dave Schaefer]

The following commit has been merged in the debian branch:
commit 237981a70762e55f45105763e6b969a6b6669cad
Author: Dave Schaefer <dave.schaefer at gmail.com>
Date:   Tue Jun 19 22:22:06 2012 -0700

    Perspectives - Always set 'prompt_update_all_https_setting' to false
    
    Move code that sets prompt_update_all_https_setting to a finally{} block, so we run it even if there is an error.
    This way the user will see one popup max, and even if something goes wrong during the update they can continue using their browser.
    If the preference wasn't set to what it "should" be, they can always change it later using the actual preferences dialog.

diff --git a/plugin/chrome/content/notaries.js b/plugin/chrome/content/notaries.js
index 88caad8..2bdecb6 100644
--- a/plugin/chrome/content/notaries.js
+++ b/plugin/chrome/content/notaries.js
@@ -959,7 +959,7 @@ var Perspectives = {
 			//We create local variables here so SeaMonkey clients don't throw 'variable is not defined' exceptions
 			const Cc = Components.classes, Ci = Components.interfaces;
 
-			//prompt_update_all_https_setting stores a value for "have we already asked the user about this?"
+			//'prompt_update_all_https_setting' stores a value for "have we already asked the user about this?"
 			var ask_update = Perspectives.root_prefs.
 	                getBoolPref("perspectives.prompt_update_all_https_setting");
 			if (ask_update == true) {
@@ -986,15 +986,20 @@ var Perspectives = {
 										true);
 					}
 				}
-				Perspectives.root_prefs.
-						setBoolPref("perspectives.prompt_update_all_https_setting",
-									false);
 			}
 		}
 		catch (e) {
 			Pers_debug.d_print("error", "Error: could not prompt to update preferences about check_good_certificates: " + e);
 			return null;
 		}
+		finally {
+			//set the flag to not ask the user again, even (especially!) if something went wrong.
+			//this way even in the worst case the user will only get a popup once.
+			//they can always change their preferences later through the prefs dialog if they wish.
+			Perspectives.root_prefs.
+						setBoolPref("perspectives.prompt_update_all_https_setting",
+									false);
+		}
 	}
 			
 }

-- 
perspectives-extension