[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source extensions/source

[Jan Holesovsky]

 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |   29 +++++++------
 connectivity/source/drivers/mozab/mozab.xcu                |    2 
 connectivity/source/drivers/mozab/mozab2.xcu               |    2 
 extensions/source/abpilot/abspilot.src                     |    2 
 4 files changed, 19 insertions(+), 16 deletions(-)

New commits:
commit 3da441dfc06f0659e6dafc6dee16fbe74270e102
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Jan 9 23:56:33 2012 +0100

    Enabling Icedove addressbook connection for Base (Thank you Caolan)

diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 2921660..6382dfe 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -69,24 +69,27 @@ namespace
     }
 
     // -------------------------------------------------------------------
-    static const char* DefaultProductDir[3][3] =
+    const size_t NB_PRODUCTS = 3;
+    const size_t NB_CANDIDATES = 4;
+
+    static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
     {
     #if defined(XP_WIN)
-        { "Mozilla/SeaMonkey/", NULL, NULL },
-        { "Mozilla/Firefox/", NULL, NULL },
-        { "Thunderbird/", "Mozilla/Thunderbird/", NULL }
+        { "Mozilla/SeaMonkey/", NULL, NULL, NULL },
+        { "Mozilla/Firefox/", NULL, NULL, NULL },
+        { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL }
     #elif(MACOSX)
-        { "../Mozilla/SeaMonkey/", NULL, NULL },
-        { "Firefox/", NULL, NULL },
-        { "../Thunderbird/", NULL, NULL }
+        { "../Mozilla/SeaMonkey/", NULL, NULL, NULL },
+        { "Firefox/", NULL, NULL, NULL },
+        { "../Thunderbird/", NULL, NULL, NULL }
     #else
-        { ".mozilla/seamonkey/", NULL, NULL },
-        { ".mozilla/firefox/", NULL, NULL },
-        { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/" }
+        { ".mozilla/seamonkey/", NULL, NULL, NULL },
+        { ".mozilla/firefox/", NULL, NULL, NULL },
+        { ".thunderbird/", ".mozilla-thunderbird/", ".mozilla/thunderbird/", ".icedove" }
     #endif
     };
 
-    static const char* ProductRootEnvironmentVariable[3] =
+    static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] =
     {
         "MOZILLA_PROFILE_ROOT",
         "MOZILLA_FIREFOX_PROFILE_ROOT",
@@ -98,7 +101,7 @@ namespace
     {
         size_t productIndex = _product - 1;
 
-        static ::rtl::OUString s_productDirectories[3];
+        static ::rtl::OUString s_productDirectories[NB_PRODUCTS];
 
         if ( !s_productDirectories[ productIndex ].getLength() )
         {
@@ -117,7 +120,7 @@ namespace
                 const char* pProfileRegistry = "profiles.ini";
 
                 // check all possible candidates
-                for ( size_t i=0; i<3; ++i )
+                for ( size_t i=0; i<NB_CANDIDATES; ++i )
                 {
                     if ( NULL == DefaultProductDir[ productIndex ][ i ] )
                         break;
diff --git a/connectivity/source/drivers/mozab/mozab.xcu b/connectivity/source/drivers/mozab/mozab.xcu
index fa732d6..e554e46 100644
--- a/connectivity/source/drivers/mozab/mozab.xcu
+++ b/connectivity/source/drivers/mozab/mozab.xcu
@@ -84,7 +84,7 @@
         <value>com.sun.star.comp.sdbc.MozabDriver</value>
       </prop>
       <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
-        <value xml:lang="en-US">Thunderbird Address Book</value>
+        <value xml:lang="en-US">Thunderbird/Icedove Address Book</value>
       </prop>
       <node oor:name="Features">
         <node oor:name="EscapeDateTime" oor:op="replace">
diff --git a/connectivity/source/drivers/mozab/mozab2.xcu b/connectivity/source/drivers/mozab/mozab2.xcu
index d1a620d..d6a6317 100644
--- a/connectivity/source/drivers/mozab/mozab2.xcu
+++ b/connectivity/source/drivers/mozab/mozab2.xcu
@@ -52,7 +52,7 @@
         <value>com.sun.star.comp.sdbc.MozabDriver</value>
       </prop>
       <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
-        <value xml:lang="en-US">Thunderbird Address Book</value>
+        <value xml:lang="en-US">Thunderbird/Icedove Address Book</value>
       </prop>
       <node oor:name="MetaData">
         <node oor:name="SupportsBrowsing" oor:op="replace">
diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src
index 289e466..c246af9 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -120,7 +120,7 @@ TabPage RID_PAGE_SELECTABTYPE
     {
         HelpID = "extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD";
         Size    = MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-        Text [ en-US ] = "Thunderbird";
+        Text [ en-US ] = "Thunderbird/Icedove";
     };
     RadioButton RB_KAB
      {