[Pkg-privacy-commits] [xul-ext-monkeysphere] 120/296: Merge remote branch 'mlc/no-cache' into no-cache

[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 ef725008989548362ce6a40283c3fe222bc6cdbb
Merge: ce44e13 8bda4c2
Author: Jameson Rollins <jrollins at finestructure.net>
Date:   Sat Mar 6 14:14:41 2010 -0500

    Merge remote branch 'mlc/no-cache' into no-cache

 chrome/content/monkeysphere.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc chrome/content/monkeysphere.js
index 93f1a04,e3602b7..67d4a5a
--- a/chrome/content/monkeysphere.js
+++ b/chrome/content/monkeysphere.js
@@@ -232,9 -240,9 +232,9 @@@ var monkeysphere = 
  ////////////////////////////////////////////////////////////
  // STATUS FUNCTIONS
  ////////////////////////////////////////////////////////////
 -  
 +
    getDefaultStatusText: function(state) {
-     var key = monkeysphere.states.state ? ("status" + state) : "xulError";
+     var key = (typeof monkeysphere.states.state !== 'undefined') ? ("status" + state) : "xulError";
      return monkeysphere.messages.getString(key);
    },
  

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