File ldapkio-kolab3.diff of Package kdepimlibs4

Overview Repositories Revisions Requests Users Attributes Meta

File ldapkio-kolab3.diff of Package kdepimlibs4

--- kabc/plugins/ldapkio/resourceldapkioconfig.cpp.orig	2013-06-06 15:38:53.879540239 +0200
+++ kabc/plugins/ldapkio/resourceldapkioconfig.cpp	2013-06-06 15:37:32.421630520 +0200
@@ -251,17 +251,20 @@ AttributesDialog::AttributesDialog( cons
   mDefaultMap.insert( QLatin1String( "jpegPhoto" ), QLatin1String( "jpegPhoto" ) );
 
   // overwrite the default values here
-  QMap<QString, QString> kolabMap, netscapeMap, evolutionMap, outlookMap;
+  QMap<QString, QString> kolab2Map, kolab3Map, netscapeMap, evolutionMap, outlookMap;
 
-  // kolab
-  kolabMap.insert( QLatin1String( "formattedName" ), QLatin1String( "display-name" ) );
-  kolabMap.insert( QLatin1String( "mailAlias" ), QLatin1String( "mailalias" ) );
+  // Kolab 2
+  kolab2Map.insert( QLatin1String( "formattedName" ), QLatin1String( "display-name" ) );
+  kolab2Map.insert( QLatin1String( "mailAlias" ), QLatin1String( "mailalias" ) );
+  // Kolab 3
+  kolab3Map.insert( QLatin1String( "mailAlias" ), QLatin1String( "alias" ) );
 
   // evolution
   evolutionMap.insert( QLatin1String( "formattedName" ), QLatin1String( "fileAs" ) );
 
   mMapList.append( attributes );
-  mMapList.append( kolabMap );
+  mMapList.append( kolab2Map );
+  mMapList.append( kolab3Map );
   mMapList.append( netscapeMap );
   mMapList.append( evolutionMap );
   mMapList.append( outlookMap );
@@ -276,7 +279,8 @@ AttributesDialog::AttributesDialog( cons
   layout->addWidget( mMapCombo, 0, 1 );
 
   mMapCombo->addItem( i18n( "User Defined" ) );
-  mMapCombo->addItem( i18n( "Kolab" ) );
+  mMapCombo->addItem( i18n( "Kolab 2" ) );
+  mMapCombo->addItem( i18n( "Kolab 3" ) );
   mMapCombo->addItem( i18n( "Netscape" ) );
   mMapCombo->addItem( i18n( "Evolution" ) );
   mMapCombo->addItem( i18n( "Outlook" ) );
diff -Ppru kabc/plugins/ldapkio/resourceldapkioconfig.h.orig kabc/plugins/ldapkio/resourceldapkioconfig.h
--- kabc/plugins/ldapkio/resourceldapkioconfig.h.orig	2013-06-06 15:38:53.879540239 +0200
+++ kabc/plugins/ldapkio/resourceldapkioconfig.h	2013-06-06 15:37:33.320596433 +0200
@@ -85,7 +85,8 @@ class AttributesDialog : public KDialog
   private:
     enum {
       UserMap,
-      KolabMap,
+      Kolab2Map,
+      Kolab3Map,
       NetscapeMap,
       EvolutionMap,
       OutlookMap

Places

File ldapkio-kolab3.diff of Package kdepimlibs4

Places