summaryrefslogtreecommitdiffstats
path: root/application/palemoon/components/nsBrowserGlue.js
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-04-22 20:58:36 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-04-22 20:58:36 +0000
commitab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14 (patch)
tree55a1e7c2bf2007f88cc5518052419bee63126688 /application/palemoon/components/nsBrowserGlue.js
parent9ffed6e8bfb35c090caf5f8bca7a0f8bd4cbec94 (diff)
parent1d7664d3a1db098024c7624650b0d272a26635e0 (diff)
downloadUXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar
UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.gz
UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.lz
UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.tar.xz
UXP-ab5f78afbdbf3b37f89c06dcd59ff9442d6ecf14.zip
Merge branch 'master' into Pale_Moon-release
# Conflicts: # application/palemoon/config/version.txt # old-configure.in
Diffstat (limited to 'application/palemoon/components/nsBrowserGlue.js')
-rw-r--r--application/palemoon/components/nsBrowserGlue.js15
1 files changed, 3 insertions, 12 deletions
diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index ad48dab29..01a133833 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -990,14 +990,8 @@ BrowserGlue.prototype = {
// An import operation is about to run.
// Don't try to recreate smart bookmarks if autoExportHTML is true or
// smart bookmarks are disabled.
- var autoExportHTML = false;
- try {
- autoExportHTML = Services.prefs.getBoolPref("browser.bookmarks.autoExportHTML");
- } catch(ex) {}
- var smartBookmarksVersion = 0;
- try {
- smartBookmarksVersion = Services.prefs.getIntPref("browser.places.smartBookmarksVersion");
- } catch(ex) {}
+ var autoExportHTML = Services.prefs.getBoolPref("browser.bookmarks.autoExportHTML", false);
+ var smartBookmarksVersion = Services.prefs.getIntPref("browser.places.smartBookmarksVersion", 0);
if (!autoExportHTML && smartBookmarksVersion != -1)
Services.prefs.setIntPref("browser.places.smartBookmarksVersion", 0);
@@ -1556,10 +1550,7 @@ BrowserGlue.prototype = {
const MAX_RESULTS = 10;
// Get current smart bookmarks version. If not set, create them.
- let smartBookmarksCurrentVersion = 0;
- try {
- smartBookmarksCurrentVersion = Services.prefs.getIntPref(SMART_BOOKMARKS_PREF);
- } catch(ex) {}
+ let smartBookmarksCurrentVersion = Services.prefs.getIntPref(SMART_BOOKMARKS_PREF, 0);
// If version is current or smart bookmarks are disabled, just bail out.
if (smartBookmarksCurrentVersion == -1 ||