* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 79 insertions, 62 deletions

diff --git a/kresources/newexchange/exchangeconvertercontact.cpp b/kresources/newexchange/exchangeconvertercontact.cpp
index 0764d3101..732c9db15 100644
--- a/kresources/newexchange/exchangeconvertercontact.cpp
+++ b/kresources/newexchange/exchangeconvertercontact.cpp
@@ -52,7 +52,7 @@ void ExchangeConverterContact::createRequest( TQDomDocument &doc, TQDomElement &
   TQDomAttr att_cal = doc.createAttribute( "xmlns:cal" );
   att_cal.setValue( "urn:schemas:calendar:" );
   doc.documentElement().setAttributeNode( att_cal );
-  
+
   propertyDAV( "contentclass" );
   propertyDAV( "getcontenttype" );
   propertyNS( "http://schemas.microsoft.com/exchange/", "outlookmessageclass" );
@@ -160,10 +160,10 @@ void ExchangeConverterContact::createRequest( TQDomDocument &doc, TQDomElement &
 #undef property
 
 
-bool ExchangeConverterContact::extractAddress( const TQDomElement &node, 
+bool ExchangeConverterContact::extractAddress( const TQDomElement &node,
     Addressee &addressee, int type,
-    const TQString &street, const TQString &pobox, const TQString &location, 
-    const TQString &postalcode, const TQString &state, const TQString &country, 
+    const TQString &street, const TQString &pobox, const TQString &location,
+    const TQString &postalcode, const TQString &state, const TQString &country,
     const TQString &/*countycode*/ )
 {
   bool haveAddr = false;
@@ -206,13 +206,13 @@ bool ExchangeConverterContact::extractAddress( const TQDomElement &node,
 
 
 /**
-For the complete list of Exchange <=> KABC field mappings see the file 
+For the complete list of Exchange <=> KABC field mappings see the file
 Person.mapping */
-bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addressee &addressee ) 
+bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addressee &addressee )
 {
   TQString tmpstr;
   long tmplng;
-  
+
   // The UID is absolutely required!
   if ( WebdavHandler::extractString( node, "uid", tmpstr ) ) {
     addressee.setUid( tmpstr );
@@ -224,7 +224,7 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
     addressee.insertCustom( "KDEPIM-Exchange-Resource", "fingerprint", tmpstr );
   if ( WebdavHandler::extractString( node, "href", tmpstr ) )
     addressee.insertCustom( "KDEPIM-Exchange-Resource", "href", tmpstr );
-    
+
 /* KDE4: addressee does not have any creation or modification date :-(( */
 /* KDE4: read-only not supported by libkabc */
 
@@ -232,16 +232,16 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
   if ( WebdavHandler::extractString( node, "fileas", tmpstr ) ||
        WebdavHandler::extractString( node, "cn", tmpstr ) )
     addressee.setFormattedName( tmpstr );
-  if ( WebdavHandler::extractString( node, "givenName", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "givenName", tmpstr ) )
     addressee.setGivenName( tmpstr );
-  if ( WebdavHandler::extractString( node, "middlename", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "middlename", tmpstr ) )
     addressee.setAdditionalName( tmpstr );
-  if ( WebdavHandler::extractString( node, "sn", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "sn", tmpstr ) )
     addressee.setFamilyName( tmpstr );
   //urn:schemas:contacts:initials not used      -
-  if ( WebdavHandler::extractString( node, "namesuffix", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "namesuffix", tmpstr ) )
     addressee.setSuffix( tmpstr );
-  if ( WebdavHandler::extractString( node, "personaltitle", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "personaltitle", tmpstr ) )
     addressee.setPrefix( tmpstr );
 
   // Role
@@ -249,31 +249,37 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
     addressee.setRole( tmpstr );
 
   // Company-Related settings
-  if ( WebdavHandler::extractString( node, "o", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "o", tmpstr ) )
     addressee.setOrganization( tmpstr );
-  if ( WebdavHandler::extractString( node, "department", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "department", tmpstr ) )
+  {
+#if KDE_IS_VERSION(3,5,8)
+    addressee.setDepartment( tmpstr );
+#else
     addressee.insertCustom( "KADDRESSBOOK", "X-Department", tmpstr );
-  if ( WebdavHandler::extractString( node, "roomnumber", tmpstr ) ) 
+#endif
+  }
+  if ( WebdavHandler::extractString( node, "roomnumber", tmpstr ) )
     addressee.insertCustom( "KADDRESSBOOK", "X-Office", tmpstr );
-  if ( WebdavHandler::extractString( node, "profession", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "profession", tmpstr ) )
     addressee.insertCustom( "KADDRESSBOOK", "X-Profession", tmpstr );
-  if ( WebdavHandler::extractString( node, "manager", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "manager", tmpstr ) )
     addressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", tmpstr );
 
-  if ( WebdavHandler::extractString( node, "secretarycn", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "secretarycn", tmpstr ) )
     addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tmpstr );
 
 
   // Web-Related settings
   if ( WebdavHandler::extractString( node, "email1", tmpstr ) )
     addressee.insertEmail( tmpstr, true );
-  if ( WebdavHandler::extractString( node, "email2", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "email2", tmpstr ) )
     addressee.insertEmail( tmpstr );
-  if ( WebdavHandler::extractString( node, "email3", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "email3", tmpstr ) )
     addressee.insertEmail( tmpstr );
-    
+
   // No kabc field for personalHomePage
-  if ( WebdavHandler::extractString( node, "businesshomepage", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "businesshomepage", tmpstr ) )
     addressee.setUrl( tmpstr );
 
   if ( WebdavHandler::extractString( node, "fburl", tmpstr ) ) {
@@ -284,14 +290,14 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
 
   // General stuff:
   TQStringList tmplst;
-  if ( WebdavHandler::extractStringList( node, "Keywords", tmplst ) ) 
+  if ( WebdavHandler::extractStringList( node, "Keywords", tmplst ) )
     addressee.setCategories( tmplst );
   // Exchange sentitivity values:
   // 0 None, 1 Personal, 2 Private, 3 Company Confidential
   if ( WebdavHandler::extractLong( node, "sensitivity", tmplng ) ) {
     switch( tmplng ) {
       case 0: addressee.setSecrecy( KABC::Secrecy::Public ); break;
-      case 1: 
+      case 1:
       case 2: addressee.setSecrecy( KABC::Secrecy::Private ); break;
       case 3: addressee.setSecrecy( KABC::Secrecy::Confidential ); break;
       default: kdWarning() << "Unknown sensitivity: " << tmplng << endl;
@@ -322,39 +328,39 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
   insertPhone( "callbackphone",           PhoneNumber::Msg );
   insertPhone( "telexnumber",             PhoneNumber::Bbs );
   insertPhone( "ttytddphone",             PhoneNumber::Pcs );
-#undef insertPhone  
+#undef insertPhone
 
   // Addresses: Work, Home, Mailing and Other:
   extractAddress( node, addressee, Address::Work | Address::Pref,
     "street", "postofficebox", "l", "postalcode", "st", "co", "c" );
   extractAddress( node, addressee, Address::Home,
-    "homeStreet", "homepostofficebox", "homeCity", "homePostalCode", 
+    "homeStreet", "homepostofficebox", "homeCity", "homePostalCode",
     "homeState", "homeCountry", "homeCountrycode" );
   // Exchange doesn't support writing/changing the mailing address fields,
   // so don't download it. It's equal to either the home or work address anyway
 /*  extractAddress( node, addressee, Address::Postal,
-    "mailingstreet", "mailingpostofficebox", "mailingcity", "mailingpostalcode", 
+    "mailingstreet", "mailingpostofficebox", "mailingcity", "mailingpostalcode",
     "mailingstate", "mailingcountry", "mailingcountrycode" );*/
   extractAddress( node, addressee, 0,
-    "otherstreet", "otherpostofficebox", "othercity", "otherpostalcode", 
+    "otherstreet", "otherpostofficebox", "othercity", "otherpostalcode",
     "otherstate", "othercountry", "othercountrycode" );
 
 
-  if ( WebdavHandler::extractString( node, "nickname", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "nickname", tmpstr ) )
     addressee.setNickName( tmpstr );
-  if ( WebdavHandler::extractString( node, "spousecn", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "spousecn", tmpstr ) )
     addressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", tmpstr );
 
   TQDateTime tmpdt;
-  if ( WebdavHandler::extractDateTime( node, "bday", tmpdt ) ) 
+  if ( WebdavHandler::extractDateTime( node, "bday", tmpdt ) )
     addressee.setBirthday( tmpdt.date() );
-  if ( WebdavHandler::extractString( node, "weddinganniversary", tmpstr ) ) 
+  if ( WebdavHandler::extractString( node, "weddinganniversary", tmpstr ) )
     addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", tmpstr );
 
 // TODO? timeZone()
 
   float lt,lng;
-  if ( WebdavHandler::extractFloat( node, "geolatitude", lt ) && 
+  if ( WebdavHandler::extractFloat( node, "geolatitude", lt ) &&
        WebdavHandler::extractFloat( node, "geolongitude", lng ) )
     addressee.setGeo( Geo( lt, lng ) );
   // TODO: mapurl
@@ -363,7 +369,7 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
   if ( WebdavHandler::extractString( node, "textdescription", tmpstr ) )
     addressee.setNote( tmpstr );
 
-//   if ( WebdavHandler::extractString( node, "usercertificate", tmpstr ) ) 
+//   if ( WebdavHandler::extractString( node, "usercertificate", tmpstr ) )
 //     addressee.setKeys()
 
   return true;
@@ -380,24 +386,24 @@ Addressee::List ExchangeConverterContact::parseWebDAV( const TQDomDocument& davd
 kdDebug()<<"ExchangeConverterContact::parseWebDAV, no response->propstat->prop element!"<<endl;
     return list;
   }
- 
+
   TQString contentclass;
   bool success = WebdavHandler::extractString( prop, "contentclass", contentclass );
   if ( !success ) {
 kdDebug()<<"ExchangeConverterContact::parseWebDAV, No contentclass entry"<<endl;
     return list;
   }
-  
+
   success = false;
   Addressee addressee;
   if ( contentclass == "urn:content-classes:person" ) {
     success = readAddressee( prop, addressee );
-  } 
-  
+  }
+
   if ( success ) {
     list.append( addressee );
   } else {
-  
+
   }
   return list;
 }
@@ -420,11 +426,11 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
   TQDomElement root = WebdavHandler::addDavElement( doc, doc, "d:propertyupdate" );
   TQDomElement set = WebdavHandler::addElement( doc, root, "d:set" );
   TQDomElement prop = WebdavHandler::addElement( doc, set, "d:prop" );
-  
+
   TQDomAttr att_c = doc.createAttribute( "xmlns:c" );
   att_c.setValue( "urn:schemas:contacts:" );
   doc.documentElement().setAttributeNode( att_c );
-  
+
   TQDomAttr att_b = doc.createAttribute( "xmlns:b" );
   att_b.setValue( "urn:schemas-microsoft-com:datatypes" );
   root.setAttributeNode( att_b );
@@ -433,25 +439,29 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
   domProperty( "http://schemas.microsoft.com/exchange/",
                "outlookmessageclass", "IPM.Contact" );
 //   domContactProperty( "uid", addr.uid() );
-  
+
   domContactProperty( "fileas", addr.formattedName() );
   domContactProperty( "givenName", addr.givenName() );
   domContactProperty( "middlename", addr.additionalName() );
   domContactProperty( "sn", addr.familyName() );
   domContactProperty( "namesuffix", addr.suffix() );
   domContactProperty( "personaltitle", addr.prefix() );
-  
+
   domContactProperty( "title", addr.role() );
   domContactProperty( "o", addr.organization() );
+#if KDE_IS_VERSION(3,5,8)
+  domContactProperty( "department", addr.department() );
+#else
   domContactProperty( "department", addr.custom( "KADDRESSBOOK", "X-Department" ) );
+#endif
   domContactProperty( "roomnumber", addr.custom( "KADDRESSBOOK", "X-Office" ) );
   domContactProperty( "profession", addr.custom( "KADDRESSBOOK", "X-Profession" ) );
   domContactProperty( "manager", addr.custom( "KADDRESSBOOK", "X-ManagersName" ) );
   domContactProperty( "secretarycn", addr.custom( "KADDRESSBOOK", "X-AssistantsName" ) );
-  
+
   TQStringList emails = addr.emails();
   TQString prefemail = addr.preferredEmail();
-  if ( emails.contains( prefemail ) ) 
+  if ( emails.contains( prefemail ) )
     emails.remove( prefemail );
   emails.prepend( prefemail );
   if ( emails.count() > 0 ) {
@@ -463,10 +473,10 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
   if ( emails.count() > 2 ) {
     domContactProperty( "email3", emails[2] );
   }
-  
+
   // No value for "personalHomePage"
   domContactProperty( "businesshomepage", addr.url().url() );
-  
+
   TQString fburl = KCal::FreeBusyUrlStore::self()->readUrl( addr.preferredEmail() );
   if ( !fburl.isEmpty() ) {
     domContactProperty( "fburl", fburl );
@@ -475,16 +485,16 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
 /* FIXME: This doesn't work!
   TQStringList cats = addr.categories();
   if ( cats.isEmpty() ) {
-    TQDomElement catsnode = WebdavHandler::addElementNS( doc, prop, 
+    TQDomElement catsnode = WebdavHandler::addElementNS( doc, prop,
                 "urn:schemas-microsoft-com:office:office", "Keywords" );
     for ( TQStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
       WebdavHandler::addElementNS( doc, catsnode, "xml:", "v", *it );
     }
   } else {
-//     TQDomElement catsnode = addProperty( doc, prop, 
+//     TQDomElement catsnode = addProperty( doc, prop,
 //                 "urn:schemas-microsoft-com:office:office", "Keywords", "" );
   }*/
-  
+
   // Exchange sentitivity values:
   // 0 None, 1 Personal, 2 Private, 3 Company Confidential
   TQString value;
@@ -517,7 +527,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
   domPhoneProperty( "telexnumber", PhoneNumber::Bbs );
   domPhoneProperty( "ttytddphone", PhoneNumber::Pcs );
 
-      
+
 // work address:
   Address workaddr = addr.address( Address::Work | Address::Pref );
   if ( !workaddr.isEmpty() ) {
@@ -541,7 +551,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
     domContactProperty( "homeCountry", homeaddr.country() );
     // domContactProperty( "homeCountrycode", homeaddr.countryCode() );
   }
-  
+
   // mailing address:
   // Exchange doesn't support writing/changing the mailing address fields
 /*  Address mailingaddr = addr.address( Address::Postal );
@@ -566,8 +576,8 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
     domContactProperty( "othercountry", otheraddr.country() );
     // domContactProperty( "othercountrycode", otheraddr.countryCode() );
   }
-  
-  
+
+
   domContactProperty( "nickname", addr.nickName() );
   domContactProperty( "spousecn", addr.custom( "KADDRESSBOOK", "X-SpousesName" ) );
 
@@ -606,7 +616,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
   // TODO:usercertificate
   // TODO: custom fields
 kdDebug()<<"DOM document: "<<doc.toString() << endl;
-  
+
   return doc;
 }
 #undef domDavProperty
diff --git a/kresources/newexchange/kabc_newexchange.desktop b/kresources/newexchange/kabc_newexchange.desktop
index b829ace7d..d48d30f29 100644
--- a/kresources/newexchange/kabc_newexchange.desktop
+++ b/kresources/newexchange/kabc_newexchange.desktop
@@ -20,7 +20,6 @@ Name[hu]=Exchange-kiszolgáló címjegyzéke (kísérleti)
 Name[is]=Vistfangaskrá Exchange þjóni (á tilraunarstigi)
 Name[it]=Rubrica indirizzi su un server Exchange (sperimentale)
 Name[ja]=Exchange サーバのアドレス帳 (実験版)
-Name[ka]=წიგნაკი Exchange სერვერზე(ექსპერიმენტული)
 Name[kk]=Exchange серверіндегі адрестік кітапша (сынақтағы)
 Name[km]=សៀវភៅ​អាសយដ្ឋាន​លើ​ម៉ាស៊ីន​បម្រើ Exchange (សម្រាប់​អ្នក​មាន​បទពិសោធន៍)
 Name[lt]=Adresų knygelė Exchange serveryje (eksperimentine tvarka)
diff --git a/kresources/newexchange/kabc_newexchange_final.desktop b/kresources/newexchange/kabc_newexchange_final.desktop
index 7069b14d8..19cdda43e 100644
--- a/kresources/newexchange/kabc_newexchange_final.desktop
+++ b/kresources/newexchange/kabc_newexchange_final.desktop
@@ -22,7 +22,6 @@ Name[hu]=Exchange-kiszolgáló címjegyzéke
 Name[is]=Vistfangaskrá á Exchange þjóni
 Name[it]=Rubrica indirizzi su un server Exchange
 Name[ja]=Exchange サーバのアドレス帳
-Name[ka]=წიგნაკი Exchange სერვერზე
 Name[kk]=Exchange серверіндегі адрестік кітапша
 Name[km]=សៀវភៅ​អាសយដ្ឋាន​លើ​ម៉ាស៊ីន​បម្រើ Exchange
 Name[lt]=Adresų knygelė Exchange serveryje
diff --git a/kresources/newexchange/kabc_resourceexchange.cpp b/kresources/newexchange/kabc_resourceexchange.cpp
index 8b32a4fac..7b08423a5 100644
--- a/kresources/newexchange/kabc_resourceexchange.cpp
+++ b/kresources/newexchange/kabc_resourceexchange.cpp
@@ -26,13 +26,19 @@
 #include "groupwareuploadjob.h"
 #include "kresources_groupwareprefs.h"
 
+#include <klocale.h>
+
 using namespace KABC;
 
 ResourceExchange::ResourceExchange( const KConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
-  if ( config ) readConfig( config );
+  if ( config ) {
+    readConfig( config );
+  } else {
+    setResourceName( i18n( "Exchange Server" ) );
+  }
 }
 
 void ResourceExchange::init()
diff --git a/kresources/newexchange/kcal_newexchange.desktop b/kresources/newexchange/kcal_newexchange.desktop
index b94e28ce9..a0dd29c1e 100644
--- a/kresources/newexchange/kcal_newexchange.desktop
+++ b/kresources/newexchange/kcal_newexchange.desktop
@@ -20,7 +20,6 @@ Name[hu]=Exchange 2000-kiszolgáló naptára (kísérleti)
 Name[is]=Dagatal á Exchange þjóni (á tilraunarstigi)
 Name[it]=Calendario su un server Exchange (sperimentale)
 Name[ja]=Exchange サーバのカレンダー (実験版)
-Name[ka]=კალენდარი Exchange სერვერზე (ექსპერიმენტული)
 Name[kk]=Exchange серверіндегі күнтізбе (сынақтағы)
 Name[km]=ប្រតិទិន​លើ​ម៉ាស៊ីន​បម្រើ Exchange (សម្រាប់​អ្នក​មាន​បទពិសោធន៍)
 Name[lt]=Kalendorius Exchange serveryje (eksperimentine tvarka)
diff --git a/kresources/newexchange/kcal_newexchange_final.desktop b/kresources/newexchange/kcal_newexchange_final.desktop
index fd159051d..01904c54a 100644
--- a/kresources/newexchange/kcal_newexchange_final.desktop
+++ b/kresources/newexchange/kcal_newexchange_final.desktop
@@ -22,7 +22,6 @@ Name[hu]=Exchange 2000-kiszolgáló naptára
 Name[is]=Dagatal á Exchange þjóni
 Name[it]=Calendario su un server Exchange
 Name[ja]=Exchange サーバのカレンダー
-Name[ka]=კალენდარი Exchange სერვერზე 
 Name[kk]=Exchange серверіндегі күнтізбе
 Name[km]=ប្រតិទិន​លើ​ម៉ាស៊ីន​បម្រើ Exchange
 Name[lt]=Kalendorius Exchange serveryje
diff --git a/kresources/newexchange/kcal_resourceexchange.cpp b/kresources/newexchange/kcal_resourceexchange.cpp
index 4c9f7726d..37d99d376 100644
--- a/kresources/newexchange/kcal_resourceexchange.cpp
+++ b/kresources/newexchange/kcal_resourceexchange.cpp
@@ -25,6 +25,7 @@
 #include <groupwaredownloadjob.h>
 #include <groupwareuploadjob.h>
 #include <kresources_groupwareprefs.h>
+#include <klocale.h>
 
 using namespace KCal;
 
@@ -38,7 +39,11 @@ ResourceExchange::ResourceExchange( const KConfig *config )
   : ResourceGroupwareBase( config )
 {
   init();
-  if ( config ) readConfig( config );
+  if ( config ) {
+    readConfig( config );
+  } else {
+    setResourceName( i18n( "Exchange Server" ) );
+  }
 }
 
 void ResourceExchange::init()