Bug 721316 Followup to compile with external linkage r+a=Standard8
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Fri, 05 Oct 2012 00:12:33 +0100
changeset 13466 f7a4ab1f831950c2be43fbfaee872ccb39749eee
parent 13465 7c63a5c1a41a71034364b457c7b1907544c71f13
child 13467 f521dad4966d897becf28c7f976455677bda2459
push id702
push userbugzilla@standard8.plus.com
push dateTue, 09 Oct 2012 20:31:02 +0000
treeherdercomm-beta@f7a4ab1f8319 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs721316
Bug 721316 Followup to compile with external linkage r+a=Standard8
mailnews/imap/src/nsImapMailFolder.cpp
--- a/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mailnews/imap/src/nsImapMailFolder.cpp
@@ -9643,19 +9643,19 @@ nsresult nsImapMailFolder::GetOfflineMsg
              rv = rootFolder->GetFolderWithFlags(nsMsgFolderFlags::Trash,
                                                  getter_AddRefs(subMsgFolder));
           if (labelNames[i].Equals("\"\\\\Spam\""))
              rv = rootFolder->GetFolderWithFlags(nsMsgFolderFlags::Junk,
                                                  getter_AddRefs(subMsgFolder));
           if (labelNames[i].Equals("\"\\\\Sent\""))
              rv = rootFolder->GetFolderWithFlags(nsMsgFolderFlags::SentMail,
                                                  getter_AddRefs(subMsgFolder));
-          if ((labelNames[i].Find(NS_LITERAL_CSTRING("[Imap]/"), true, 0, -1) != -1))
+          if (labelNames[i].Find("[Imap]/", CaseInsensitiveCompare) != kNotFound)
           {
-            labelNames[i].ReplaceSubstring("[Imap]/", "");
+            MsgReplaceSubstring(labelNames[i], "[Imap]/", "");
             imapRootFolder->FindOnlineSubFolder(labelNames[i], getter_AddRefs(subFolder));
             subMsgFolder = do_QueryInterface(subFolder);
           }
           if (!subMsgFolder)
           {
             imapRootFolder->FindOnlineSubFolder(labelNames[i], getter_AddRefs(subFolder));
             subMsgFolder = do_QueryInterface(subFolder);
           }