[X2Go-Commits] [pale-moon] 61/102: Pale Moon: Use file path for bookmarks import/export.
git-admin at x2go.org
git-admin at x2go.org
Mon Feb 25 23:25:51 CET 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch upstream/28.4.0
in repository pale-moon.
commit aaa9fc180ad79f8f8a1f1f8868f9f4e372d0ac56
Author: Ascrod <32915892+Ascrod at users.noreply.github.com>
Date: Fri Feb 1 21:08:39 2019 -0500
Pale Moon: Use file path for bookmarks import/export.
---
application/palemoon/components/places/content/places.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/palemoon/components/places/content/places.js b/application/palemoon/components/places/content/places.js
index a941938..40dbcb9 100644
--- a/application/palemoon/components/places/content/places.js
+++ b/application/palemoon/components/places/content/places.js
@@ -491,7 +491,7 @@ var PlacesOrganizer = {
Task.spawn(function() {
try {
- yield BookmarkJSONUtils.importFromFile(aFile, true);
+ yield BookmarkJSONUtils.importFromFile(aFile.path, true);
} catch(ex) {
PlacesOrganizer._showErrorAlert(PlacesUIUtils.getString("bookmarksRestoreParseError"));
}
@@ -519,7 +519,7 @@ var PlacesOrganizer = {
let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
let fpCallback = function fpCallback_done(aResult) {
if (aResult != Ci.nsIFilePicker.returnCancel) {
- BookmarkJSONUtils.exportToFile(fp.file);
+ BookmarkJSONUtils.exportToFile(fp.file.path);
}
};
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git
More information about the x2go-commits
mailing list