fix tag sync
authorDan Mills <thunder@mozilla.com>
Mon, 31 Mar 2008 17:07:40 -0700
changeset 44406 bfc74a75ec38f2cbb0a5910c2a4065a701ac8a5f
parent 44405 21489be5c4bc20928b5b1202a090505a5ece73c3
child 44407 0f1884ed1e7993c54ad3e090bc4de295686e8a16
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
fix tag sync
services/sync/modules/stores.js
--- a/services/sync/modules/stores.js
+++ b/services/sync/modules/stores.js
@@ -385,17 +385,17 @@ BookmarksStore.prototype = {
                                       Utils.makeURI(command.data.feedURI),
                                       command.data.index);
       break;
     case "mounted-share":
       this._log.debug(" -> creating share mountpoint \"" + command.data.title + "\"");
       newId = this._bms.createFolder(parentId,
                                      command.data.title,
                                      command.data.index);
-      
+
       this._ans.setItemAnnotation(newId, "weave/mounted-share-id",
                                   command.data.mountId, 0, this._ans.EXPIRE_NEVER);
       break;
     case "separator":
       this._log.debug(" -> creating separator");
       newId = this._bms.insertSeparator(parentId, command.data.index);
       break;
     default:
@@ -485,17 +485,17 @@ BookmarksStore.prototype = {
         let index = -1;
         if (command.data.index && command.data.index >= 0)
           index = command.data.index;
         this._bms.moveItem(
           itemId, this._getItemIdForGUID(command.data.parentGUID), index);
       } break;
       case "tags": {
         let tagsURI = this._bms.getBookmarkURI(itemId);
-        this._ts.untagURI(URI, null);
+        this._ts.untagURI(tagsURI, null);
         this._ts.tagURI(tagsURI, command.data.tags);
       } break;
       case "keyword":
         this._bms.setKeywordForBookmark(itemId, command.data.keyword);
         break;
       case "generatorURI": {
         let micsumURI = Utils.makeURI(this._bms.getBookmarkURI(itemId));
         let genURI = Utils.makeURI(command.data.generatorURI);
@@ -607,17 +607,17 @@ BookmarksStore.prototype = {
 
     // remove any share mountpoints
     for (let guid in ret.snapshot) {
       if (ret.snapshot[guid].type == "mounted-share")
         delete ret.snapshot[guid];
     }
 
     return ret;
-  }, 
+  },
 
   _resetGUIDs: function BSS__resetGUIDs(node) {
     if (this._ans.itemHasAnnotation(node.itemId, "placesInternal/GUID"))
       this._ans.removeItemAnnotation(node.itemId, "placesInternal/GUID");
 
     if (node.type == node.RESULT_TYPE_FOLDER &&
         !this._ls.isLivemark(node.itemId)) {
       node.QueryInterface(Ci.nsINavHistoryQueryResultNode);