From 26b658a12743d5b24f2f549f8cfe6f1a085a0ea9 Mon Sep 17 00:00:00 2001
From: Dietrich Ayala <dietrich@mozilla.com>
Date: Thu, 22 May 2008 11:41:05 -0700
Subject: [PATCH] Bug 419121 - Weave chokes on microsummaries (r=thunder)

---
 services/sync/modules/stores.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/sync/modules/stores.js b/services/sync/modules/stores.js
index 51feef1348c..e12ddb41ff7 100644
--- a/services/sync/modules/stores.js
+++ b/services/sync/modules/stores.js
@@ -369,6 +369,8 @@ BookmarksStore.prototype = {
 
       if (command.data.type == "microsummary") {
         this._log.debug("   \-> is a microsummary");
+        this._ans.setItemAnnotation(newId, "bookmarks/staticTitle",
+                                    command.data.staticTitle || "", 0, this._ans.EXPIRE_NEVER);
         let genURI = Utils.makeURI(command.data.generatorURI);
         try {
           let micsum = this._ms.createMicrosummary(URI, genURI);
@@ -578,6 +580,7 @@ BookmarksStore.prototype = {
         item.type = "microsummary";
         let micsum = this._ms.getMicrosummary(node.itemId);
         item.generatorURI = micsum.generator.uri.spec; // breaks local generators
+        item.staticTitle = this._ans.getItemAnnotation(node.itemId, "bookmarks/staticTitle");
       } else if (node.type == node.RESULT_TYPE_QUERY) {
         item.type = "query";
         item.title = node.title;