[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/mork/MNSFolders.cxx            |   14 ++++++-------
 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |   14 ++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 6b275af6e00fd5b1ff96eb271ad09f7bf75e9865
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 5 16:33:26 2015 +0200

    tdf#90446 Revert "tdf#39279: Prioritise Thunderbird address books..."
    
    I'll quote Lionel (I hate pretending I did the job when it's not the case :-)):
    "
    It was misguided; the order of entries in these arrays is not order
    of priority, but corresponds to the constants (which are used, with
    an offset of 1, as indexes into these arrays) in
    offapi/com/sun/star/mozilla/MozillaProductType.idl
    "
    
    This reverts commit 9b92d8afbabe564de703f8bc083723d97e765011.
    
    Change-Id: I166237285f13291083a506852d5217fc3ad59d45
    Reviewed-on: https://gerrit.libreoffice.org/15164
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx
index 0b35c69..aae88b5 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 0b35c69..aae88b5 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",
     };