packages: kde4-kdepimlibs/kde4-kdepimlibs-branch.diff, kde4-kdepimlibs/kde4...

arekm arekm at pld-linux.org
Thu Aug 19 19:13:26 CEST 2010 

Author: arekm                        Date: Thu Aug 19 17:13:26 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; branch diff is back

---- Files affected:
packages/kde4-kdepimlibs:
   kde4-kdepimlibs-branch.diff (1.20 -> 1.21) , kde4-kdepimlibs.spec (1.118 -> 1.119) 

---- Diffs:

================================================================
Index: packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff
diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.20 packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.21
--- packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.20	Tue Mar 16 21:01:16 2010
+++ packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff	Thu Aug 19 19:13:20 2010
@@ -1,448 +1,305 @@
-Index: cmake/modules/FindLibical.cmake
+Index: kimap/sessionthread.cpp
 ===================================================================
---- cmake/modules/FindLibical.cmake	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ cmake/modules/FindLibical.cmake	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -4,8 +4,10 @@
- #  LIBICAL_INCLUDE_DIRS - the Libical include directories
- #  LIBICAL_LIBRARIES - The libraries needed to use Libical
- #  LIBICAL_VERSION = The value of ICAL_VERSION defined in ical.h
-+#  LIBICAL_MAJOR_VERSION = The library major version number
-+#  LIBICAL_MINOR_VERSION = The library minor version number
- 
--# Copyright (c) 2008, Allen Winter <winter at kde.org>
-+# Copyright (c) 2008,2010 Allen Winter <winter at kde.org>
- #
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-@@ -72,6 +74,10 @@
-     message(FATAL_ERROR "Unable to compile or run the libical version detection program.")
-   endif(COMPILE_RESULT AND RUN_RESULT EQUAL 1)
- 
-+  #compute the major and minor version numbers
-+  string(REGEX REPLACE "\\..*$" "" LIBICAL_MAJOR_VERSION ${LIBICAL_VERSION})
-+  string(REGEX REPLACE "^.*\\." "" LIBICAL_MINOR_VERSION ${LIBICAL_VERSION})
-+
- endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
- 
- include(FindPackageHandleStandardArgs)
-Index: kcal/dndfactory.cpp
-===================================================================
---- kcal/dndfactory.cpp	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kcal/dndfactory.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -250,18 +250,17 @@
-     kDebug() << "Can't parse clipboard";
-     return 0;
-   }
--  Incidence *ret = 0;
+--- kimap/sessionthread.cpp	(.../tags/KDE/4.5.0/kdepimlibs)	(wersja 1165574)
++++ kimap/sessionthread.cpp	(.../branches/KDE/4.5/kdepimlibs)	(wersja 1165574)
+@@ -118,16 +118,12 @@
  
-   Incidence::List incList = cal->incidences();
--  Incidence *inc = incList.first();
-+  Incidence *inc = incList.isEmpty() ? 0 : incList.first();
- 
--  if ( !incList.isEmpty() && inc ) {
-+  if ( inc ) {
-     inc = inc->clone();
+ void SessionThread::closeSocket()
+ {
+-  QMutexLocker locker(&m_mutex);
 -
-     inc->recreate();
-+  }
+-  m_encryptedMode = false;
+   QTimer::singleShot( 0, this, SLOT( doCloseSocket() ) );
+ }
  
-+  if ( inc && newDate.isValid() ) {
-     if ( inc->type() == "Event" ) {
--
-       Event *anEvent = static_cast<Event*>( inc );
-       // Calculate length of event
-       int daysOffset = anEvent->dtStart().date().daysTo(
-@@ -302,9 +301,7 @@
-     } else {
-       kDebug() << "Trying to paste unknown incidence of type" << inc->type();
-     }
+ void SessionThread::doCloseSocket()
+ {
+-  QMutexLocker locker(&m_mutex);
 -
--    ret = inc;
-   }
-   delete cal;
--  return ret;
-+  return inc;
++  m_encryptedMode = false;
+   m_socket->close();
  }
-Index: kcal/todo.cpp
+ 
+Index: kmime/kmime_content.cpp
 ===================================================================
---- kcal/todo.cpp	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kcal/todo.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -296,7 +296,9 @@
-     return KDateTime();
-   }
-   if ( recurs() && !first ) {
--    return d->mDtRecurrence.addDays( dtDue( true ).daysTo( IncidenceBase::dtStart() ) );
-+    KDateTime dt = d->mDtRecurrence.addDays( dtDue( true ).daysTo( IncidenceBase::dtStart() ) );
-+    dt.setTime( IncidenceBase::dtStart().time() );
-+    return dt;
-   } else {
-     return IncidenceBase::dtStart();
-   }
-Index: kioslave/sieve/sieve.protocol
+--- kmime/kmime_content.cpp	(.../tags/KDE/4.5.0/kdepimlibs)	(wersja 1165574)
++++ kmime/kmime_content.cpp	(.../branches/KDE/4.5/kdepimlibs)	(wersja 1165574)
+@@ -513,6 +513,7 @@
+         // Add to new content.
+         main->setHeader( *it );
+         // Remove from this content.
++        delete (*it);
+         it = h_eaders.erase( it );
+       } else {
+         ++it;
+@@ -575,6 +576,7 @@
+     foreach( Headers::Base *h, main->h_eaders ) {
+       setHeader( h ); // Will remove the old one if present.
+     }
++    qDeleteAll( main->h_eaders );
+     main->h_eaders.clear();
+ 
+     // Move the body.
+Index: kcal/incidenceformatter.cpp
 ===================================================================
---- kioslave/sieve/sieve.protocol	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kioslave/sieve/sieve.protocol	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -30,6 +30,7 @@
- Description[it]=Un IOSlave per il protocollo di filtraggio della posta Sieve
- Description[ja]=Sieve メールフィルタリングプロトコルのための ioslave
- Description[km]=ioslave សម្រាប់​ពិធីការ​តម្រង​សំបុត្រ​របស់ Sieve
-+Description[lt]=Sieve pašto filtravimo protokolo palaikymas
- Description[lv]=IO apstrādātājs Sieve pasta filtrēšanas protokolam
- Description[nb]=En ioslave for Sieve e-postfiltrering
- Description[nds]=In-/Utgaavmoduul för't Nettpostfilter-Protokoll Sieve
-Index: kontactinterface/kontactplugin.desktop
-===================================================================
---- kontactinterface/kontactplugin.desktop	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kontactinterface/kontactplugin.desktop	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -14,13 +14,16 @@
- Name[fr]=Module externe pour Kontact
- Name[ga]=Breiseán Kontact
- Name[gl]=Engadido de Kontact
-+Name[hu]=Kontact-modul
- Name[it]=Plugin di Kontact
- Name[ja]=Kontact プラグイン
- Name[km]=កម្មវិធី​ជំនួយ Kontact
-+Name[lt]=Kontact priedas
- Name[lv]=Kontact spraudnis
- Name[nb]=Kontact-programtillegg
- Name[nds]=Kontact-Moduul
- Name[nl]=Kontact-plugin
-+Name[nn]=Kontakt-tillegg
- Name[pa]=ਕੇਸੰਪਰਕ ਪਲੱਗਇਨ
- Name[pt]='Plugin' do Kontact
- Name[pt_BR]=Plug-in do Kontact
-Index: mailtransport/smtpconfigwidget.cpp
-===================================================================
---- mailtransport/smtpconfigwidget.cpp	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ mailtransport/smtpconfigwidget.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -109,9 +109,11 @@
-         ui.noAuthPossible->setVisible( true );
-         ui.kcfg_requiresAuthentication->setChecked( false );
-         ui.kcfg_requiresAuthentication->setEnabled( false );
-+        ui.kcfg_requiresAuthentication->setVisible( false );
+--- kcal/incidenceformatter.cpp	(.../tags/KDE/4.5.0/kdepimlibs)	(wersja 1165574)
++++ kcal/incidenceformatter.cpp	(.../branches/KDE/4.5/kdepimlibs)	(wersja 1165574)
+@@ -351,7 +351,11 @@
+       if ( (*it)->uri().startsWith( QLatin1String( "kmail:" ) ) ) {
+         name = i18n( "Show mail" );
        } else {
-         ui.noAuthPossible->setVisible( false );
-         ui.kcfg_requiresAuthentication->setEnabled( true );
-+        ui.kcfg_requiresAuthentication->setVisible( true );
+-        name = (*it)->label();
++        if ( (*it)->label().isEmpty() ) {
++          name = (*it)->uri();
++        } else {
++          name = (*it)->label();
++        }
        }
+       tmpStr += htmlAddLink( (*it)->uri(), name );
+     } else {
+@@ -395,7 +399,6 @@
+   //TODO: add a birthday cake icon
+   QString tmpStr = displayViewLinkPerson( email_1, name_1, uid_1, iconPath );
+ 
+-
+   return tmpStr;
+ }
+ 
+@@ -578,7 +581,7 @@
+   const bool isBirthday = event->customProperty( "KABC", "BIRTHDAY" ) == "YES";
+   const bool isAnniversary = event->customProperty( "KABC", "ANNIVERSARY" ) == "YES";
+ 
+-  if ( isBirthday || isAnniversary  ) {
++  if ( isBirthday || isAnniversary ) {
+     tmpStr += "<tr>";
+     if ( isAnniversary ) {
+       tmpStr += "<td><b>" + i18n( "Anniversary:" ) + "</b></td>";
+Index: akonadi/entitymimetypefiltermodel.cpp
+===================================================================
+--- akonadi/entitymimetypefiltermodel.cpp	(.../tags/KDE/4.5.0/kdepimlibs)	(wersja 1165574)
++++ akonadi/entitymimetypefiltermodel.cpp	(.../branches/KDE/4.5/kdepimlibs)	(wersja 1165574)
+@@ -214,6 +214,13 @@
+   if (!sourceModel())
+     return false;
+ 
++  // QSortFilterProxyModel implementation is buggy in that it emits rowsAboutToBeInserted etc
++  // only after the source model has emitted rowsInserted, instead of emitting it when the
++  // source model emits rowsAboutToBeInserted. That means that the source and the proxy are out
++  // of sync around the time of insertions, so we can't use the optimization below.
++  return rowCount(parent) > 0;
++#if 0
++
+   if ( !parent.isValid() )
+     return sourceModel()->hasChildren(parent);
+ 
+@@ -233,6 +240,7 @@
      }
+   }
+   return false;
++#endif
+ }
+ 
+ bool EntityMimeTypeFilterModel::canFetchMore( const QModelIndex &parent ) const
+Index: akonadi/itemsync.cpp
+===================================================================
+--- akonadi/itemsync.cpp	(.../tags/KDE/4.5.0/kdepimlibs)	(wersja 1165574)
++++ akonadi/itemsync.cpp	(.../branches/KDE/4.5/kdepimlibs)	(wersja 1165574)
+@@ -53,7 +53,8 @@
+       mStreaming( false ),
+       mIncremental( false ),
+       mLocalListDone( false ),
+-      mDeliveryDone( false )
++      mDeliveryDone( false ),
++      mFinished( false )
+     {
+       // we want to fetch all data by default
+       mFetchScope.fetchFullPayload();
+@@ -106,6 +107,7 @@
+     bool mIncremental;
+     bool mLocalListDone;
+     bool mDeliveryDone;
++    bool mFinished;
  };
-Index: mailtransport/smtpsettings.ui
+ 
+ void ItemSync::Private::createLocalItem( const Item & item )
+@@ -124,7 +126,10 @@
+   if ( mPendingJobs > 0 || !mDeliveryDone || mTransactionJobs > 0 )
+     return;
+ 
+-  q->emitResult();
++  if ( !mFinished ) { // prevent double result emission, can happen since checkDone() is called from all over the place
++    mFinished = true;
++    q->emitResult();
++  }
+ }
+ 
+ ItemSync::ItemSync( const Collection &collection, QObject *parent ) :
+Index: akonadi/session.cpp
+===================================================================
+--- akonadi/session.cpp	(.../tags/KDE/4.5.0/kdepimlibs)	(wersja 1165574)
++++ akonadi/session.cpp	(.../branches/KDE/4.5/kdepimlibs)	(wersja 1165574)
+@@ -164,7 +164,6 @@
+   if ( currentJob )
+     currentJob->d_ptr->lostConnection();
+   connected = false;
+-  QTimer::singleShot( 30000, mParent, SLOT( reconnect() ) );
+ }
+ 
+ void SessionPrivate::dataReceived()
+Index: akonadi/transactionsequence.cpp
 ===================================================================
---- mailtransport/smtpsettings.ui	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ mailtransport/smtpsettings.ui	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -133,14 +133,29 @@
-        <string comment="advanced smtp settings">Advanced</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout">
--       <item row="0" column="0" colspan="3">
--        <widget class="QCheckBox" name="kcfg_requiresAuthentication">
-+       <item row="1" column="0" colspan="3">
-+        <widget class="QLabel" name="noAuthPossible">
-+         <property name="visible">
-+          <bool>false</bool>
-+         </property>
-+         <property name="frameShape">
-+          <enum>QFrame::Box</enum>
-+         </property>
-+         <property name="frameShadow">
-+          <enum>QFrame::Plain</enum>
-+         </property>
-+         <property name="lineWidth">
-+          <number>0</number>
-+         </property>
-          <property name="text">
--          <string>Server &amp;requires authentication</string>
-+          <string>This server does not support authentication</string>
-          </property>
-+         <property name="alignment">
-+          <set>Qt::AlignCenter</set>
-+         </property>
-         </widget>
-        </item>
--       <item row="1" column="0">
-+       <item row="2" column="0">
-         <widget class="QLabel" name="usernameLabel">
-          <property name="enabled">
-           <bool>false</bool>
-@@ -156,14 +171,14 @@
-          </property>
-         </widget>
-        </item>
--       <item row="1" column="1" colspan="2">
-+       <item row="2" column="1" colspan="2">
-         <widget class="KLineEdit" name="kcfg_userName">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
--       <item row="2" column="0">
-+       <item row="3" column="0">
-         <widget class="QLabel" name="passwordLabel">
-          <property name="enabled">
-           <bool>false</bool>
-@@ -179,7 +194,7 @@
-          </property>
-         </widget>
-        </item>
--       <item row="2" column="1" colspan="2">
-+       <item row="3" column="1" colspan="2">
-         <widget class="KLineEdit" name="password">
-          <property name="enabled">
-           <bool>false</bool>
-@@ -192,7 +207,7 @@
-          </property>
-         </widget>
-        </item>
--       <item row="3" column="1" colspan="2">
-+       <item row="4" column="1" colspan="2">
-         <widget class="QCheckBox" name="kcfg_storePassword">
-          <property name="enabled">
-           <bool>false</bool>
-@@ -202,7 +217,7 @@
-          </property>
-         </widget>
-        </item>
--       <item row="4" column="0" colspan="3">
-+       <item row="5" column="0" colspan="3">
-         <widget class="KButtonGroup" name="kcfg_authenticationType">
-          <property name="enabled">
-           <bool>false</bool>
-@@ -260,17 +275,17 @@
-          </layout>
-         </widget>
-        </item>
--       <item row="5" column="0" colspan="3">
-+       <item row="6" column="0" colspan="3">
-         <widget class="KSeparator" name="kseparator_3"/>
-        </item>
--       <item row="6" column="0" colspan="3">
-+       <item row="7" column="0" colspan="3">
-         <widget class="QCheckBox" name="kcfg_specifyHostname">
-          <property name="text">
-           <string>Sen&amp;d custom hostname to server</string>
-          </property>
-         </widget>
-        </item>
--       <item row="7" column="0" colspan="2">
-+       <item row="8" column="0" colspan="2">
-         <widget class="QLabel" name="hostnameLabel">
-          <property name="enabled">
-           <bool>false</bool>
-@@ -286,17 +301,17 @@
-          </property>
-         </widget>
-        </item>
--       <item row="7" column="2">
-+       <item row="8" column="2">
-         <widget class="KLineEdit" name="kcfg_localHostname">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
--       <item row="8" column="0" colspan="3">
-+       <item row="9" column="0" colspan="3">
-         <widget class="KSeparator" name="kseparator_2"/>
-        </item>
--       <item row="9" column="0" colspan="2">
-+       <item row="10" column="0" colspan="2">
-         <widget class="QLabel" name="precommandLabel">
-          <property name="text">
-           <string>Precommand:</string>
-@@ -306,35 +321,17 @@
-          </property>
-         </widget>
-        </item>
--       <item row="9" column="2">
-+       <item row="10" column="2">
-         <widget class="KLineEdit" name="kcfg_precommand"/>
-        </item>
-+       <item row="0" column="0" colspan="3">
-+        <widget class="QCheckBox" name="kcfg_requiresAuthentication">
-+         <property name="text">
-+          <string>Server &amp;requires authentication</string>
-+         </property>
-+        </widget>
-+       </item>
-       </layout>
--      <widget class="QLabel" name="noAuthPossible">
--       <property name="geometry">
--        <rect>
--         <x>0</x>
--         <y>0</y>
--         <width>100</width>
--         <height>30</height>
--        </rect>
--       </property>
--       <property name="visible">
--        <bool>false</bool>
--       </property>
--       <property name="frameShape">
--        <enum>QFrame::Box</enum>
--       </property>
--       <property name="frameShadow">
--        <enum>QFrame::Raised</enum>
--       </property>
--       <property name="text">
--        <string>This server does not support authentication</string>
--       </property>
--       <property name="alignment">
--        <set>Qt::AlignCenter</set>
--       </property>
--      </widget>
-      </widget>
-     </widget>
-    </item>
-Index: kabc/plugins/file/file.desktop
-===================================================================
---- kabc/plugins/file/file.desktop	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kabc/plugins/file/file.desktop	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -61,10 +61,11 @@
- Comment[fr]=Fourni l'accès aux contacts stockés dans un seul fichier local. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles.
- Comment[ga]=Soláthraíonn sé seo rochtain ar theagmhálacha, stóráilte i gcomhad aonair. Tacaítear le comhaid v-Chárta agus formáidí eile, ag brath ar na breiseáin atá ar fáil.
- Comment[gl]=Dá acceso a contactos gardados nun único ficheiro local. Admite ficheiros vCard estándar e outros formatos en función das extensións dispoñíbeis.
--Comment[hu]=Névjegyek elérését biztosítja. Minden névjegy egy közös helyi fájlban található. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők.
-+Comment[hu]=A névjegyek elérését biztosítja. Minden névjegy egy közös helyi fájlban található. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők.
- Comment[it]=Fornisce accesso a contatti memorizzati in un singolo file locale. Gestisce file in standard VCard e altri formati in base ai plugin disponibili.
- Comment[ja]=単一のローカルファイルに保存されている連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。
- Comment[km]=ផ្ដល់​កា​រចូលដំណើរការ​ទៅ​ទំនាក់ទំនង​​នៅ​ក្នុង​ឯកសារ​មូលដ្ឋាន​តែ​មួយ ។ គាំទ្រ​ឯកសារ VCard ស្តង់ដារ និង​ទ្រង់ទ្រាយ​ផ្សេងៗ​ ដោយ​អាស្រ័យ​លើ​កម្មវិធី​ជំនួយ​ដែល​មាន ។
-+Comment[lt]=Suteikia prieigą prie kontaktų, saugomų viename vietiniame faile. Palaiko standartinius VCard failus ir kitus formatus, jei yra įdiegti atitinkami įskiepiai.
- Comment[lv]=Nodrošina piekļuvi kontaktiem, kas glabājas vienā lokālā failā. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem.
- Comment[nb]=Gir tilgang til kontakter, lagret i en enkelt lokal fil. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg.
- Comment[nds]=Stellt Togriep op Kontakten praat, de in een enkel lokaal Datei wohrt warrt. Ünnerstütt VCard-Dateien un anner Formaten na de 'verföögboren Modulen.
-Index: kabc/plugins/ldapkio/ldapkio.desktop
-===================================================================
---- kabc/plugins/ldapkio/ldapkio.desktop	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kabc/plugins/ldapkio/ldapkio.desktop	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -65,6 +65,7 @@
- Comment[it]=Fornisce accesso a contatti memorizzati su un server LDAP
- Comment[ja]=LDAP ディレクトリサーバに保存されている連絡先へのアクセスを提供します。
- Comment[km]=ផ្ដល់​ការ​ចូលដំណើរការ​ទៅ​ទំនាក់ទំនង​ដែល​បានផ្ទុក​នៅ​លើ​ម៉ាស៊ីន​បម្រើ​ថត LDAP
-+Comment[lt]=Suteikia prieigą prie kontaktų, saugomų LDAP serveryje
- Comment[lv]=Nodrošina piekļuvi kontaktiem, kas glabājas LDAP direktorija serverī
- Comment[nb]=Gir tilgang til kontakter lagret på en LDAP-katalogtjener
- Comment[nds]=Stellt Togriep op Kontakten praat, de op en LDAP-Vertelenserver wohrt warrt
-Index: kabc/plugins/net/net.desktop
-===================================================================
---- kabc/plugins/net/net.desktop	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kabc/plugins/net/net.desktop	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -65,6 +65,7 @@
- Comment[it]=Fornisce accesso a contatti su file remoti usando KIO, l'infrastruttura di rete di KDE. Gestisce file in standard VCard e altri formati in base ai plugin disponibili.
- Comment[ja]=KDE のネットワークフレームワーク KIO を使って、リモートファイルに保存されている連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。
- Comment[km]=ផ្ដល់​កា​រចូលដំណើរការ​ទៅកាន់​ទំនាក់ទំនង​ក្នុង​​ឯកសារ​ពី​ចម្ងាយ ដោយ​ប្រើ KIO ​គ្រោងការណ៍​បណ្ដាញ​របស់ KDE ។ គាំទ្រ​ឯកសារ VCard ស្តង់ដារ និង​ទ្រង់ទ្រាយ​ផ្សេងៗ​ទៀត ដោយ​អាស្រ័យ​លើ​កម្មវិធី​ជំនួយ​ដែល​មាន ។
-+Comment[lt]=Suteikia prieigą prie kontaktų, esančių nutolusiuose failuose, naudojant KDE tinklo infrastruktūrą KIO. Palaiko standartinius VCard failus ir kitus failų formatus, jei įdiegti juos palaikantys įskiepiai.
- Comment[lv]=Nodrošina piekļuvi kontaktiem attālinātos failus, izmantojot KDE tīklošanas ietvaru KIO. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem.
- Comment[nb]=Gir tilgang til kontakter i nettverksfiler, ved bruk av KDEs rammeverk KIO for nettverk. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg.
- Comment[nds]=Stellt Togriep op Kontakten binnen feern Dateien praat, bruukt KDE sien Nettwark-Rahmenwark KIO. Ünnerstütt VCard-Dateien un anner Formaten na de verföögboren Modulen.
-Index: kabc/plugins/dir/dir.desktop
-===================================================================
---- kabc/plugins/dir/dir.desktop	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kabc/plugins/dir/dir.desktop	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -18,6 +18,7 @@
- Name[it]=Cartella
- Name[ja]=フォルダ
- Name[km]=ថត
-+Name[lt]=Aplankas
- Name[lv]=Mape
- Name[nb]=Mappe
- Name[nds]=Orner
-@@ -53,10 +54,11 @@
- Comment[fr]=Fourni l'accès aux contacts stockés chacun dans un fichier dans le dossier indiqué. Le format VCard et d'autres formats sont pris en charge en fonction des modules externes disponibles
- Comment[ga]=Soláthraíonn sé seo rochtain ar theagmhálacha, gach ceann stóráilte i gcomhad aonair, i bhfillteán sonraithe. Tacaítear le comhaid v-Chárta agus le formáidí eile, ag brath ar na breiseáin atá ar fáil.
- Comment[gl]=Dá acceso aos contactos, cada un gardado nun ficheiro nun cartafol dado. Admite ficheiros vCard estándar e outros formatos, en función da dispoñibilidade de extensións.
--Comment[hu]=Névjegyek elérését biztosítja. Minden névjegy külön fájlban található, egy adott mappában. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők.
-+Comment[hu]=A névjegyek elérését biztosítja. Minden névjegy külön fájlban található, egy adott mappában. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők.
- Comment[it]=Fornisce accesso a contatti, ciascuno dei quali memorizzato in un singolo file in una cartella data. Gestisce file in standard VCard e altri formati in base ai plugin disponibili.
- Comment[ja]=それぞれが単一のファイルに保存されている任意のフォルダ内の連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。
- Comment[km]=ផ្ដល់​ការ​ចូលដំណើរការ​ទៅ​កាន់​ទំនាក់ទំនង ដែល​ទំនាក់ទំនង​នីមួយៗ​ត្រូវ​បានផ្ទុកនៅ​ក្នុង​ឯកសារ​តែ​មួយ នៅ​ក្នុង​ថត​ដែល​បានផ្ដល់​ឲ្យ ។ គាំទ្រ​ឯកសារ VCard និង​ទ្រង់ទ្រាយ​ផ្សេងៗ​ ដោយ​អាស្រ័យ​លើ​កម្មវិធី​ជំនួយ​ដែល​មាន ។
-+Comment[lt]=Suteikia prieigą prie kontaktų, kurių kiekvienas saugomas atskirame faile konkrečiame aplanke. Palaiko standartinius VCard failus ir kitus formatus, priklausomai nuo įdiegtų įskiepių. 
- Comment[lv]=Nodrošina pieeju kontaktiem, kas katrs saglabāts individuālā failā norādītajā mapē. Atbalsta standarta VCard failus un citus formātus, atkarībā no pieejamajiem spraudņiem.
- Comment[nb]=Gir tilgang til kontakter, lagret hver for seg i en enkelt fil, i en gitt mappe. Støtter standard vCard og andre formater avhengig av tilgjengelige programtillegg.
- Comment[nds]=Stellt Togriep op Kontakten praat, elkeen binnen een Datei binnen en angeven Orner. Ünnerstütt VCard-Dateien un anner Formaten na de verföögboren Modulen.
-Index: kabc/kabc_manager.desktop
-===================================================================
---- kabc/kabc_manager.desktop	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kabc/kabc_manager.desktop	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -17,7 +17,7 @@
- Name[ga]=Teagmhálacha
- Name[gl]=Contactos
- Name[hne]=सम्पर्क
--Name[hu]=Partnerek
-+Name[hu]=Névjegyek
- Name[it]=Contatti
- Name[ja]=連絡先
- Name[km]=ទំនាក់ទំនង​
-Index: kabc/vcardparser/vcardparser.cpp
-===================================================================
---- kabc/vcardparser/vcardparser.cpp	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ kabc/vcardparser/vcardparser.cpp	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -133,16 +133,14 @@
-         bool wasBase64Encoded = false;
+--- akonadi/transactionsequence.cpp	(.../tags/KDE/4.5.0/kdepimlibs)	(wersja 1165574)
++++ akonadi/transactionsequence.cpp	(.../branches/KDE/4.5/kdepimlibs)	(wersja 1165574)
+@@ -104,7 +104,7 @@
+     else
+       Job::removeSubjob( job );
  
-         if ( vCardLine.parameterList().contains( QLatin1String( "encoding" ) ) ) {
-+          const QString encoding = vCardLine.parameter( QLatin1String( "encoding" ) ).toLower();
+-    if ( subjobs().isEmpty() && d->mState == TransactionSequencePrivate::WaitingForSubjobs ) {
++    if ( !hasSubjobs() && d->mState == TransactionSequencePrivate::WaitingForSubjobs ) {
+       d->mState = TransactionSequencePrivate::Committing;
+       TransactionCommitJob *job = new TransactionCommitJob( this );
+       connect( job, SIGNAL( result( KJob* ) ), SLOT( commitResult( KJob* ) ) );
+@@ -113,7 +113,14 @@
+     setError( job->error() );
+     setErrorText( job->errorText() );
+     removeSubjob( job );
 +
-           // have to decode the data
--          if ( vCardLine.parameter( QLatin1String( "encoding" ) ).toLower() ==
--               QLatin1String( "b" ) ||
--               vCardLine.parameter( QLatin1String( "encoding" ) ).toLower() ==
--               QLatin1String( "base64" ) ) {
-+          if ( encoding == QLatin1String( "b" ) || encoding == QLatin1String( "base64" ) ) {
-             output = QByteArray::fromBase64( value );
-             wasBase64Encoded = true;
-           }
--          else if ( vCardLine.parameter( QLatin1String( "encoding" ) ).toLower() ==
--                    QLatin1String( "quoted-printable" ) ) {
-+          else if ( encoding == QLatin1String( "quoted-printable" ) ) {
-             // join any qp-folded lines
-             while ( value.endsWith( '=' ) && it != linesEnd ) {
-               value.chop( 1 ); // remove the '='
-@@ -150,6 +148,8 @@
-               ++it;
-             }
-             KCodecs::quotedPrintableDecode( value, output );
-+          } else if ( encoding == QLatin1String( "8bit" ) ) {
-+            output = value;
-           } else {
-             qDebug( "Unknown vcard encoding type!" );
-           }
-Index: akonadi/contact/kcm/akonadicontact_actions.desktop
-===================================================================
---- akonadi/contact/kcm/akonadicontact_actions.desktop	(.../tags/KDE/4.4.1/kdepimlibs)	(wersja 1104125)
-+++ akonadi/contact/kcm/akonadicontact_actions.desktop	(.../branches/KDE/4.4/kdepimlibs)	(wersja 1104125)
-@@ -21,13 +21,16 @@
- Name[fi]=Yhteystietotoiminnot
- Name[fr]=Actions sur les contacts
- Name[gl]=Accións de contacto
-+Name[hu]=Névjegyműveletek
- Name[it]=Azioni per i contatti
- Name[ja]=連絡先アクション
- Name[km]=អំពើ​ទំនាក់​ទំនង
-+Name[lt]=Kontaktų veiksmai
- Name[lv]=Kontaktu darbības
- Name[nb]=Kontakthandlinger
- Name[nds]=Kontakt-Akschonen
- Name[nl]=Contactpersoon-acties
-+Name[nn]=Kontakthandlingar
- Name[pa]=ਸੰਪਰਕ ਐਕਸ਼ਨ
- Name[pt]=Acções do Contacto
- Name[pt_BR]=Ações do contatos
-@@ -53,13 +56,16 @@
- Comment[fi]=Yhteystietotoimintojen asetukset
- Comment[fr]=Configurer les actions sur les contacts
- Comment[gl]=Configurar as accións de contacto
-+Comment[hu]=A névjegyműveletek beállítása
- Comment[it]=Configua le azioni per i contatti
- Comment[ja]=連絡先アクションの設定
- Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​អំពើ​ទំនាក់​ទំនង
-+Comment[lt]=Konfigūruoti kontaktų veiksmus
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs.spec?r1=1.118&r2=1.119&f=u

More information about the pld-cvs-commit mailing list