Bug 401092 - Bookmark Icons (favicons) disappear. r=sspitzer, a=blocking-beta.

browser/components/places/content/menu.xml

@@ -313,8 +313,11 @@
           }
 
           var iconURI = aNode.icon;
-          if (iconURI && menuitem.getAttribute("image") != iconURI.spec)
-            menuitem.setAttribute("image", iconURI.spec);
+          if (iconURI) {
+            var spec = iconURI.spec;
+            if (menuitem.getAttribute("image") != spec)
+              menuitem.setAttribute("image", spec);
+          }
           else
             menuitem.removeAttribute("image");
 

browser/components/places/content/toolbar.xml

@@ -534,8 +534,11 @@
           }
 
           var iconURI = aNode.icon;
-          if (iconURI && element.getAttribute("image") != iconURI.spec)
-            element.setAttribute("image", iconURI.spec);
+          if (iconURI) {
+            var spec = iconURI.spec;
+            if (element.getAttribute("image") != spec)
+              element.setAttribute("image", spec);
+          }
           else
             element.removeAttribute("image");