diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-04-05 11:48:31 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2015-04-05 11:50:08 +0200 |
| commit | d30ac3f4ec7af078b1c96ab1b4dd5d9b2089d47b (patch) | |
| tree | 3f40bae95c40f3fce82573f3a5ab59cf0bcf6442 | |
| parent | 91c7343da2400ea1ebf4fef3c309e8e7b8558b77 (diff) | |
Revert "tdf#39279: Prioritise Thunderbird address books in first-match search"
because it creates regression (see tdf#90446)
This reverts commit 9b92d8afbabe564de703f8bc083723d97e765011.
| -rw-r--r-- | connectivity/source/drivers/mork/MNSFolders.cxx | 14 | ||||
| -rw-r--r-- | connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index 0b35c695518b..aae88b5f8061 100644 --- a/connectivity/source/drivers/mork/MNSFolders.cxx +++ b/connectivity/source/drivers/mork/MNSFolders.cxx @@ -66,25 +66,25 @@ namespace static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] = { #if defined(XP_WIN) - { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL }, { "Mozilla/SeaMonkey/", NULL, NULL, NULL }, - { "Mozilla/Firefox/", NULL, NULL, NULL } + { "Mozilla/Firefox/", NULL, NULL, NULL }, + { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } #elif defined(MACOSX) - { "../Thunderbird/", NULL, NULL, NULL }, { "../Mozilla/SeaMonkey/", NULL, NULL, NULL }, - { "Firefox/", NULL, NULL, NULL } + { "Firefox/", NULL, NULL, NULL }, + { "../Thunderbird/", NULL, NULL, NULL } #else - { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove/" }, { ".mozilla/seamonkey/", NULL, NULL, NULL }, - { ".mozilla/firefox/", NULL, NULL, NULL } + { ".mozilla/firefox/", NULL, NULL, NULL }, + { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove/" } #endif }; static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] = { - "MOZILLA_THUNDERBIRD_PROFILE_ROOT", "MOZILLA_PROFILE_ROOT", "MOZILLA_FIREFOX_PROFILE_ROOT", + "MOZILLA_THUNDERBIRD_PROFILE_ROOT", }; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 0b35c695518b..aae88b5f8061 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -66,25 +66,25 @@ namespace static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] = { #if defined(XP_WIN) - { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL }, { "Mozilla/SeaMonkey/", NULL, NULL, NULL }, - { "Mozilla/Firefox/", NULL, NULL, NULL } + { "Mozilla/Firefox/", NULL, NULL, NULL }, + { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } #elif defined(MACOSX) - { "../Thunderbird/", NULL, NULL, NULL }, { "../Mozilla/SeaMonkey/", NULL, NULL, NULL }, - { "Firefox/", NULL, NULL, NULL } + { "Firefox/", NULL, NULL, NULL }, + { "../Thunderbird/", NULL, NULL, NULL } #else - { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove/" }, { ".mozilla/seamonkey/", NULL, NULL, NULL }, - { ".mozilla/firefox/", NULL, NULL, NULL } + { ".mozilla/firefox/", NULL, NULL, NULL }, + { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove/" } #endif }; static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] = { - "MOZILLA_THUNDERBIRD_PROFILE_ROOT", "MOZILLA_PROFILE_ROOT", "MOZILLA_FIREFOX_PROFILE_ROOT", + "MOZILLA_THUNDERBIRD_PROFILE_ROOT", }; |