Bug 430614 - "[GSoC] Thunderbird integration into Windows Vista/Windows Search indexer" - a couple more fixes [r=bienvenu]

mail/components/search/nsWinSearchIntegration.js

@@ -125,7 +125,14 @@ function WinSearchFirstRun(window)
     if (enable)
     {
       if (!scope.gWinSearchHelper.isFileAssociationSet)
-        scope.gWinSearchHelper.setFileAssociation();
+      {
+        try { scope.gWinSearchHelper.setFileAssociation(); }
+        catch (e) { SIDump("File association not set\n"); }
+      }
+      // Also set the FANCI bit to 0 for the profile directory
+      scope.gWinSearchHelper.setFANCIBit(Cc["@mozilla.org/file/directory_service;1"]
+                                         .getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile),
+                                         false, true);
     }
     scope.gPrefBranch.setBoolPref(gPrefBase + ".enable", enable);
     scope.InitSupportIntegration(enable);

mail/installer/windows/packages-static

@@ -177,6 +177,7 @@ bin\components\nsAbAutoCompleteSearch.js
 
 ; Windows Search integration
 bin\components\nsWinSearchIntegration.js
+bin\components\mailwinsearch.xpt
 bin\WSEnable.exe
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;