[Pkg-privacy-commits] [xul-ext-monkeysphere] 138/296: fix up clearSite function in status menu

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository xul-ext-monkeysphere.

commit 4cfb0e00d74e3bda1d7c85327b6b27e5e0171813
Author: Jameson Rollins <jrollins at finestructure.net>
Date:   Sun Mar 7 21:03:58 2010 -0500

    fix up clearSite function in status menu
---
 chrome/content/monkeysphere.js  | 12 +++++++++++-
 chrome/content/monkeysphere.xul |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/chrome/content/monkeysphere.js b/chrome/content/monkeysphere.js
index 899c847..4e4bd13 100644
--- a/chrome/content/monkeysphere.js
+++ b/chrome/content/monkeysphere.js
@@ -623,8 +623,18 @@ var monkeysphere = {
 
   contextMenuFunctions: {
     clearSite: function() {
-      var uri = gBrowser.currentURI;
+      monkeysphere.log("--- clear site ---");
+      var browser = gBrowser.selectedBrowser;
+      var uri = browser.currentURI;
       monkeysphere.clearOverride(uri);
+      monkeysphere.clearStatus(browser);
+      try {
+        var apd = monkeysphere.createAgentPostData(browser, browser.securityUI.SSLStatus.serverCert);
+        monkeysphere.cache.clear(apd);
+      } catch(e) {
+        monkeysphere.log("no valid cert for site found");
+      }
+      monkeysphere.updateDisplay();
     },
     certs: function() {
       openDialog("chrome://pippki/content/certManager.xul", "Certificate Manager");
diff --git a/chrome/content/monkeysphere.xul b/chrome/content/monkeysphere.xul
index 0d798d6..5b41bee 100644
--- a/chrome/content/monkeysphere.xul
+++ b/chrome/content/monkeysphere.xul
@@ -50,7 +50,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <popupset>
       <popup id="monkeysphere-contextmenu" position="after_start">
-	<menuitem label="Clear Site Monkeysphere Status"
+        <!-- FIXME: need locales stuff for these labels -->
+        <menuitem label="Clear site Monkeysphere exception"
 		  oncommand="monkeysphere.contextMenuFunctions.clearSite()" />
 	<menuitem label="Help"
 		  oncommand="monkeysphere.contextMenuFunctions.help()" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/xul-ext-monkeysphere.git