*** VERSION 5.1.0D 2014-12-15 gorticus: * replaced PlacesUtils.history.{g,s}etCharsetForURI() with PlacesUtils.{g,s}etCharsetForURI() diff -r old/chrome/content/actions.xul new/chrome/content/actions.xul 43c43 < title="&sp_title; 5.1.0B" --- > title="&sp_title; 5.1.0D" diff -r old/chrome/content/utils.js new/chrome/content/utils.js 851c851 < var lastCharset = PlacesUtils.history.getCharsetForURI(uri); --- > var lastCharset = PlacesUtils.getCharsetForURI(uri); 1010c1010 < }; \ No newline at end of file --- > }; diff -r old/install.rdf new/install.rdf 8c8 < 5.1.0C --- > 5.1.0D 37c37 < 23.* --- > 34.* *** VERSION 5.1.0C 2013-09-02 Graham: * patched PlacesUtils.toJSONString -> JSON.stringify * updated version to 5.1.0C * updates maxversion to 23.* (DL) diff -r old/chrome/content/bookmarks.js new/chrome/content/bookmarks.js 805c805 < SyncPlacesIO.saveFile(this.faviconsFile, PlacesUtils.toJSONString(favicons)); --- > SyncPlacesIO.saveFile(this.faviconsFile, JSON.stringify(favicons)); diff -r old/chrome/content/options.js new/chrome/content/options.js 1028c1028 < return PlacesUtils.toJSONString(preferences); --- > return JSON.stringify(preferences); diff -r old/chrome/content/passwords.js new/chrome/content/passwords.js 112c112 < passwords = PlacesUtils.toJSONString(nodes); --- > passwords = JSON.stringify(nodes); diff -r old/chrome/content/utils.js new/chrome/content/utils.js 904c904 < var jstr = PlacesUtils.toJSONString(aNode); --- > var jstr = JSON.stringify(aNode); 925c925 < value = PlacesUtils.toJSONString(value); --- > value = JSON.stringify(value); diff -r old/chrome/content/xbelin.js new/chrome/content/xbelin.js 561c561 < var jstr = PlacesUtils.toJSONString(nodes); --- > var jstr = JSON.stringify(nodes); diff -r old/install.rdf new/install.rdf 8c8 < 5.1.0B --- > 5.1.0C 37c37 < 22.* --- > 23.* *** VERSION 5.1.0B 2013-07-25 Frank Kirchner: * applied patches from Daniel's blog comments * updated version to 5.1.0B * updates maxversion to 22.* (DL) diff -r orig/chrome/content/actions.xul patch/chrome/content/actions.xul 43c43 < title="&sp_title; 5.1.0" --- > title="&sp_title; 5.1.0B" diff -r orig/chrome/content/bookmarks.js patch/chrome/content/bookmarks.js 102c102,103 < if (!PlacesUtils.nodeIsLivemarkContainer(child)) { --- > > if (true /* CW !PlacesUtils.nodeIsLivemarkContainer(child)*/) { 106,107c107 < else if (PlacesUtils.nodeIsFolder(child) && < !PlacesUtils.nodeIsLivemarkContainer(child)) --- > else if (PlacesUtils.nodeIsFolder(child) /*&& !PlacesUtils.nodeIsLivemarkContainer(child)*/) 177d176 < 212,214c211 < SyncPlacesUtils.serializeNodeAsJSONToOutputStream(result, converter, < false, false, < excludeItems); --- > SyncPlacesUtils.serializeNodeAsJSONToOutputStream(result, converter, false, false, excludeItems); 225d221 < 294a291,292 > > /* CW 304a303 > */ 326c325 < if (PlacesUtils.nodeIsLivemarkContainer(child)) continue; --- > // CW if (PlacesUtils.nodeIsLivemarkContainer(child)) continue; 362,363c361,363 < PlacesUtils.bookmarks.TYPE_FOLDER) && < !PlacesUtils.livemarks.isLivemark(existingID)) --- > PlacesUtils.bookmarks.TYPE_FOLDER) > // CW && !PlacesUtils.livemarks.isLivemark(existingID) > ) 657,658c657,658 < else if (PlacesUtils.nodeIsLivemarkContainer(child)) < removeOldItem(child, mergeLivemarks, container.title, SyncPlacesBookmarks.LIVEMARK); --- > // CW else if (PlacesUtils.nodeIsLivemarkContainer(child)) > // removeOldItem(child, mergeLivemarks, container.title, SyncPlacesBookmarks.LIVEMARK); 751c751,753 < if (PlacesUtils.nodeIsQuery(node) || PlacesUtils.nodeIsLivemarkContainer(node)) { --- > if (PlacesUtils.nodeIsQuery(node) > // CW || PlacesUtils.nodeIsLivemarkContainer(node) > ) { 807c809 < SyncPlacesIO.log(exception); --- > SyncPlacesIO.log("ERROR 1: "+ e); 857c859,861 < if (PlacesUtils.nodeIsQuery(node) || PlacesUtils.nodeIsLivemarkContainer(node)) { --- > if (PlacesUtils.nodeIsQuery(node) > // CW || PlacesUtils.nodeIsLivemarkContainer(node) > ) { 924c928 < SyncPlacesIO.log(exception); --- > SyncPlacesIO.log("ERROR 2: "+ e); diff -r orig/chrome/content/encrypt.js patch/chrome/content/encrypt.js 55c55 < SyncPlacesIO.log(exception); --- > SyncPlacesIO.log("ERROR 5: "+ exception); 117c117 < SyncPlacesIO.log(exception); --- > SyncPlacesIO.log("ERROR 6: "+ exception); diff -r orig/chrome/content/networking.js patch/chrome/content/networking.js 105c105 < SyncPlacesIO.log(exception); --- > SyncPlacesIO.log("ERROR 1: "+ exception); 409a410 > if (this.sp_debug) SyncPlacesIO.log("receive_mechanism: " + technique); 415a417 > if (this.sp_debug) SyncPlacesIO.log("loading moz streamloader"); 417a420 > if (this.sp_debug) SyncPlacesIO.log("got "+this.sp_streamLoader); 433a437 > if (this.sp_debug) SyncPlacesIO.log("this.sp_compress: "+this.sp_compress); 447c451,456 < this.receive(this); --- > try { > this.receive(this); > } catch (e) { > if (this.sp_debug) SyncPlacesIO.log("catched exception receiving: "+e.message); > > } 458a468 > if (this.sp_debug) SyncPlacesIO.log("catched exception for this.sp_channel.asyncOpen: "+e.message); diff -r orig/chrome/content/options.js patch/chrome/content/options.js 638c638,640 < SyncPlacesIO.log(exception); --- > SyncPlacesIO.log("ERROR 9: "+ exception); > SyncPlacesIO.log("ERROR 9 key: "+ key); > SyncPlacesIO.log("ERROR 9 extraText: "+ extraText); diff -r orig/chrome/content/options.xul patch/chrome/content/options.xul 43c43 < title="&sp_title; 5.1.0" --- > title="&sp_title; 5.1.0B" diff -r orig/chrome/content/receive.js patch/chrome/content/receive.js 475a476,477 > SyncPlacesIO.log("ERROR completeTheRestore: "+ exception); > 488a491,492 > SyncPlacesIO.log("this.bmsHash: "+ this.bmsHash); > SyncPlacesIO.log("SyncPlaces.computeHash: "+ hash); diff -r orig/chrome/content/syncplaces.js patch/chrome/content/syncplaces.js 225a226 > SyncPlacesIO.log("ERROR SyncPlacesXBELOut: "+ exception); 254a256 > SyncPlacesIO.log("case this.JSON"); 255a258 > SyncPlacesIO.log("failed to write"); 261c264,268 < if (!checkSubFolder) SyncPlacesBookmarks.saveFavicons(); --- > if (!checkSubFolder) { > SyncPlacesIO.log("saving favicons"); > SyncPlacesBookmarks.saveFavicons(); > SyncPlacesIO.log("saved favicons"); > } 271a279 > SyncPlacesIO.log("ERROR saveBookmarks: "+ exception+', '+exception.message); 275a284 > SyncPlacesIO.log("showAlert="+showAlert); 280a290 > SyncPlacesIO.log("returning backupFilePath="+backupFilePath); 319c329 < SyncPlacesIO.log(exception); --- > SyncPlacesIO.log("ERROR 10: "+ exception); 550c560 < if (msg) SyncPlacesIO.log(msg); --- > if (msg) SyncPlacesIO.log("ERROR 11: "+ msg); diff -r orig/chrome/content/utils.js patch/chrome/content/utils.js 475a476 > 509a511 > diff -r orig/chrome/content/xbelout.js patch/chrome/content/xbelout.js 108c108 < if (PlacesUtils.nodeIsQuery(child) || PlacesUtils.nodeIsBookmark(child) || PlacesUtils.nodeIsLivemarkContainer(child)) { --- > if (PlacesUtils.nodeIsQuery(child) || PlacesUtils.nodeIsBookmark(child) /* CW || PlacesUtils.nodeIsLivemarkContainer(child)*/) { diff -r orig/install.rdf patch/install.rdf 8c8 < 5.1.0 --- > 5.1.0B 37c37 < 14.* --- > 22.*