make sure url for feed gets set correctly in db in all cases, sr/a=sspitzer, NOT PART OF BUILD, 250247

mail/extensions/newsblog/content/FeedItem.js

@@ -190,6 +190,10 @@ FeedItem.prototype.isStored = function() {
     debug(this.feed.name + " folder doesn't exist; creating");
 		debug("creating " + this.feed.name + "as child of " + server.rootMsgFolder + "\n");
     server.rootMsgFolder.createSubfolder(this.feed.name, getMessageWindow());
+    folder = server.rootMsgFolder.FindSubFolder(this.feed.name);
+    var msgdb = folder.getMsgDatabase(null);
+    var folderInfo = msgdb.dBFolderInfo;
+    folderInfo.setCharPtrProperty("feedUrl", this.url);
     debug(this.identity + " not stored (folder didn't exist)");
     return false;
   }
@@ -203,19 +207,6 @@ FeedItem.prototype.isStored = function() {
       return true;
     }
     else {
-      debug(this.identity + " not stored? let's check all headers");
-      var foo = db.EnumerateMessages();
-      var i=0;
-      while (foo.hasMoreElements()) {
-        ++i;
-        var bar = foo.getNext();
-        bar = bar.QueryInterface(Components.interfaces.nsIMsgDBHdr);
-        if (this.messageID == bar.messageId) {
-          debug(this.identity + " stored (found it while checking all headers)");
-          return true;
-        }
-      }
-      debug(this.identity + " not stored (checked " + i + " headers but couldn't find it)");
       return false;
     }
   }

mail/extensions/newsblog/content/subscriptions.js

@@ -64,10 +64,10 @@ function doAdd() {
         debug("folder for new feed " + feedProperties.feedName + " doesn't exist; creating");
 				debug("creating " + feedProperties.feedName + "as child of " + server.rootMsgFolder + "\n");
         server.rootMsgFolder.createSubfolder(feedProperties.feedName, getMessageWindow());
-				folder = server.rootMsgFolder.FindSubFolder(feedProperties.feedName);
-				var msgdb = folder.getMsgDatabase(null);
-				var folderInfo = msgdb.dBFolderInfo;
-				folderInfo.setCharPtrProperty("feedUrl", feedProperties.feedLocation);
+        folder = server.rootMsgFolder.FindSubFolder(feedProperties.feedName);
+        var msgdb = folder.getMsgDatabase(null);
+        var folderInfo = msgdb.dBFolderInfo;
+        folderInfo.setCharPtrProperty("feedUrl", feedProperties.feedLocation);
     }
 
     // XXX This should be something like "subscribe to feed".
@@ -152,6 +152,9 @@ function doEdit() {
             // the old folder as it is and merely create a new folder.
             //old_folder.rename(new_title, msgWindow);
             server.rootMsgFolder.createSubfolder(feedProperties.feedName, msgWindow);
+            folder = rootMsgFolder.FindSubFolder(feedProperties.feedName);
+            var msgdb = folder.getMsgDatabase(null);
+            msgdb.dBFolderInfo.setCharPtrProperty("feedUrl", feedProperties.feedLocation);
         }
         else if (new_folder) {
             // Do nothing, as everything is as it should be.
@@ -159,6 +162,9 @@ function doEdit() {
         else {
             // Neither old nor new folders exist, so just create the new one.
             server.rootMsgFolder.createSubfolder(feedProperties.feedName, msgWindow);
+            folder = rootMsgFolder.FindSubFolder(feedProperties.feedName);
+            var msgdb = folder.getMsgDatabase(null);
+            msgdb.dBFolderInfo.setCharPtrProperty("feedUrl", feedProperties.feedLocation);
         }
         updateTitle(item.id, feedProperties.feedName);
     }

mail/extensions/newsblog/js/newsblog.js

@@ -666,6 +666,10 @@ FeedItem.prototype.isStored = function() {
   if (!folder) {
     debug(this.feed.name + " folder doesn't exist; creating");
     server.rootMsgFolder.createSubfolder(this.feed.name, this.feed.msgWindow);
+    folder = server.rootMsgFolder.FindSubFolder(this.feed.name);
+    var msgdb = folder.getMsgDatabase(null);
+    var folderInfo = msgdb.dBFolderInfo;
+    folderInfo.setCharPtrProperty("feedUrl", this.url);
     debug(this.identity + " not stored (folder didn't exist)");
     return false;
   }
@@ -679,19 +683,6 @@ FeedItem.prototype.isStored = function() {
       return true;
     }
     else {
-      debug(this.identity + " not stored? let's check all headers");
-//      var foo = db.EnumerateMessages();
-//      var i=0;
-//      while (foo.hasMoreElements()) {
-//        ++i;
-//        var bar = foo.getNext();
-//        bar = bar.QueryInterface(Components.interfaces.nsIMsgDBHdr);
-//        if (this.messageID == bar.messageId) {
-//          debug(this.identity + " stored (found it while checking all headers)");
-//          return true;
-//        }
-//      }
-//      debug(this.identity + " not stored (checked " + i + " headers but couldn't find it)");
       return false;
     }
   }