From: Yury Delendik <ydelendik@mozilla.com>
Date: Thu, 24 May 2012 21:04:09 +0000 (-0500)
Subject: Merge remote-tracking branch 'mozilla/master' into textsearch
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d370f69978fcfa0e953a717c8e7f542221a42df8;p=pdf.js.git

Merge remote-tracking branch 'mozilla/master' into textsearch

Conflicts:
	extensions/firefox/components/PdfStreamConverter.js
---

d370f69978fcfa0e953a717c8e7f542221a42df8
diff --cc extensions/firefox/components/PdfStreamConverter.js
index f866a6b,2c984e8..f7ed3cd
--- a/extensions/firefox/components/PdfStreamConverter.js
+++ b/extensions/firefox/components/PdfStreamConverter.js
@@@ -160,10 -160,7 +160,10 @@@ ChromeActions.prototype = 
      }
    },
    pdfBugEnabled: function() {
-     return getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false);
+     return getBoolPref(PREF_PREFIX + '.pdfBugEnabled', false);
 +  },
 +  searchEnabled: function() {
-     return getBoolPref(EXT_PREFIX + '.searchEnabled', false);
++    return getBoolPref(PREF_PREFIX + '.searchEnabled', false);
    }
  };