Bug 429023 - Use preference 'spellchecker.dictionary_path' to override loading internal dictionaries; r=ehsan,glandium

Author: axs-gentoo

extensions/spellcheck/hunspell/src/mozHunspell.cpp

@@ -75,6 +75,8 @@
 #include "mozilla/Services.h"
 #include <stdlib.h>
 #include "nsIMemoryReporter.h"
+#include "nsIPrefService.h"
+#include "nsIPrefBranch.h"
 
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
@@ -372,11 +374,26 @@ mozHunspell::LoadDictionaryList()
   if (!dirSvc)
     return;
 
-  // find built in dictionaries
+  // find built in dictionaries, or dictionaries specified in
+  // spellchecker.dictionary_path in prefs
   nsCOMPtr<nsIFile> dictDir;
-  rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
-                   NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
-  if (NS_SUCCEEDED(rv)) {
+
+  // check preferences first
+  nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (prefs) {
+    nsCString extDictPath;
+    rv = prefs->GetCharPref("spellchecker.dictionary_path", getter_Copies(extDictPath));
+    if (NS_SUCCEEDED(rv)) {
+      // set the spellchecker.dictionary_path
+      rv = NS_NewNativeLocalFile(extDictPath, true, getter_AddRefs(dictDir));
+    }
+  }
+  if (!dictDir) {
+    // spellcheck.dictionary_path not found, set internal path
+    rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
+                     NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
+  }
+  if (dictDir) {
     LoadDictionariesFromDir(dictDir);
   }
   else {