diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2015-03-08 10:22:58 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2015-03-08 19:45:56 +0000 |
| commit | a6fa883bd74c963123a37025c4836a96babc6168 (patch) | |
| tree | 85819fb8825451836d1b6dd6cb6002a31b0992c2 | |
| parent | 3f0f70d7811431d3e61a87d279349f89dd6a48ef (diff) | |
tdf#39279: Prioritise Thunderbird address books in first-match search
stopgap measure until tdf#57873 is fully implemented,
since these days by far more people use Thunderbird
than Seamonkey (or Firefox address book, if the latter
even has any...).
Change-Id: I638ec90277063b1e7536c045bffb1052d3b76911
Reviewed-on: https://gerrit.libreoffice.org/14800
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
| -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 aae88b5f8061..0b35c695518b 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 }, - { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } + { "Mozilla/Firefox/", NULL, NULL, NULL } #elif defined(MACOSX) + { "../Thunderbird/", NULL, NULL, NULL }, { "../Mozilla/SeaMonkey/", NULL, NULL, NULL }, - { "Firefox/", NULL, NULL, NULL }, - { "../Thunderbird/", NULL, NULL, NULL } + { "Firefox/", NULL, NULL, NULL } #else + { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove/" }, { ".mozilla/seamonkey/", NULL, NULL, NULL }, - { ".mozilla/firefox/", NULL, NULL, NULL }, - { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove/" } + { ".mozilla/firefox/", NULL, NULL, NULL } #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 aae88b5f8061..0b35c695518b 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 }, - { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } + { "Mozilla/Firefox/", NULL, NULL, NULL } #elif defined(MACOSX) + { "../Thunderbird/", NULL, NULL, NULL }, { "../Mozilla/SeaMonkey/", NULL, NULL, NULL }, - { "Firefox/", NULL, NULL, NULL }, - { "../Thunderbird/", NULL, NULL, NULL } + { "Firefox/", NULL, NULL, NULL } #else + { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove/" }, { ".mozilla/seamonkey/", NULL, NULL, NULL }, - { ".mozilla/firefox/", NULL, NULL, NULL }, - { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove/" } + { ".mozilla/firefox/", NULL, NULL, NULL } #endif }; static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] = { + "MOZILLA_THUNDERBIRD_PROFILE_ROOT", "MOZILLA_PROFILE_ROOT", "MOZILLA_FIREFOX_PROFILE_ROOT", - "MOZILLA_THUNDERBIRD_PROFILE_ROOT", }; |