Bug 430614 - "[GSoC] Thunderbird integration into Windows Vista/Windows Search indexer" - a couple more fixes [r=bienvenu]
authorSiddharth Agarwal <sid1337@gmail.com>
Tue, 23 Sep 2008 22:37:15 +0100
changeset 406 1f2f13351b1ff3a201c13256e96707cf5241e535
parent 405 e842bdf573c3ae1e87a02ae0916d9c3a4c80b8a3
child 407 f010bf7956d6791afb9fa4e50eedb4d2ce6ad0e2
push idunknown
push userunknown
push dateunknown
reviewersbienvenu
bugs430614
Bug 430614 - "[GSoC] Thunderbird integration into Windows Vista/Windows Search indexer" - a couple more fixes [r=bienvenu]
mail/components/search/nsWinSearchIntegration.js
mail/installer/windows/packages-static
--- a/mail/components/search/nsWinSearchIntegration.js
+++ b/mail/components/search/nsWinSearchIntegration.js
@@ -120,17 +120,24 @@ function WinSearchFirstRun(window)
     if (enable && needsElevation)
     {
       try { scope.gWinSearchHelper.runSetup(true); }
       catch (e) { enable = false; }
     }
     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);
   }
 
   window.openDialog("chrome://messenger/content/search/searchIntegrationDialog.xul", "",
                     "chrome, dialog, resizable=no, centerscreen", params).focus();
 }
--- a/mail/installer/windows/packages-static
+++ b/mail/installer/windows/packages-static
@@ -172,16 +172,17 @@ bin\components\nsUrlClassifierLib.js
 bin\components\url-classifier.xpt
 
 ; Address Book autocomplete
 bin\components\nsAbAutoCompleteMyDomain.js
 bin\components\nsAbAutoCompleteSearch.js
 
 ; Windows Search integration
 bin\components\nsWinSearchIntegration.js
+bin\components\mailwinsearch.xpt
 bin\WSEnable.exe
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Base Package Files
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; xpconnect
 bin\components\xpconnect.xpt