SOURCES: kde4-kdepimlibs-branch.diff - updated
shadzik
shadzik at pld-linux.org
Tue Feb 24 02:41:22 CET 2009
Author: shadzik Date: Tue Feb 24 01:41:22 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kde4-kdepimlibs-branch.diff (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/kde4-kdepimlibs-branch.diff
diff -u SOURCES/kde4-kdepimlibs-branch.diff:1.3 SOURCES/kde4-kdepimlibs-branch.diff:1.4
--- SOURCES/kde4-kdepimlibs-branch.diff:1.3 Fri Feb 20 23:25:54 2009
+++ SOURCES/kde4-kdepimlibs-branch.diff Tue Feb 24 02:41:17 2009
@@ -1,7 +1,7 @@
Index: cmake/modules/FindLibical.cmake
===================================================================
---- cmake/modules/FindLibical.cmake (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ cmake/modules/FindLibical.cmake (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- cmake/modules/FindLibical.cmake (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ cmake/modules/FindLibical.cmake (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -52,7 +52,7 @@
if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
@@ -13,8 +13,8 @@
Index: kpimidentities/identitymanager.cpp
===================================================================
---- kpimidentities/identitymanager.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kpimidentities/identitymanager.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kpimidentities/identitymanager.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kpimidentities/identitymanager.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -27,6 +27,7 @@
#include <kemailsettings.h> // for IdentityEntry::fromControlCenter()
@@ -33,8 +33,8 @@
const QString dbusPath = newDBusObjectName();
Index: syndication/mapper/itemrdfimpl.cpp
===================================================================
---- syndication/mapper/itemrdfimpl.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ syndication/mapper/itemrdfimpl.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- syndication/mapper/itemrdfimpl.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ syndication/mapper/itemrdfimpl.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -71,12 +71,12 @@
QList<PersonPtr> ItemRDFImpl::authors() const
{
@@ -71,8 +71,8 @@
}
Index: syndication/mapper/itemrss2impl.cpp
===================================================================
---- syndication/mapper/itemrss2impl.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ syndication/mapper/itemrss2impl.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- syndication/mapper/itemrss2impl.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ syndication/mapper/itemrss2impl.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -72,14 +72,14 @@
QList<PersonPtr> ItemRSS2Impl::authors() const
{
@@ -162,9 +162,17 @@
Index: kresources/kresources_manager.desktop
===================================================================
---- kresources/kresources_manager.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kresources/kresources_manager.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
-@@ -25,6 +25,7 @@
+--- kresources/kresources_manager.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kresources/kresources_manager.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
+@@ -14,6 +14,7 @@
+ Name[it]=Gestore di KResources
+ Name[ja]=KDE リソースマネージャ
+ Name[km]=កម្មវិធីគ្រប់គ្រង KResources
++Name[lt]=KResursų tvarkytuvė
+ Name[lv]=KResources pārvaldnieks
+ Name[nb]=KResources-styring
+ Name[nds]=KResources-Pleger
+@@ -25,6 +26,7 @@
Name[pt_BR]=Gerenciador do KResource
Name[ro]=Gestionar KResurse
Name[ru]=Администратор KResources
@@ -172,7 +180,15 @@
Name[sl]=Upravnik KResources
Name[sr]=Менаџер к‑ресурса
Name[sr at latin]=Menadžer k‑resursa
-@@ -63,6 +64,7 @@
+@@ -52,6 +54,7 @@
+ Comment[it]=Gestore di KResources
+ Comment[ja]=KDE リソースマネージャ
+ Comment[km]=កម្មវិធីគ្រប់គ្រង KResources
++Comment[lt]=KResursų tvarkytuvė
+ Comment[lv]=KResources pārvaldnieks
+ Comment[nb]=KResources-styring
+ Comment[nds]=KDE-Ressourcenpleger
+@@ -63,6 +66,7 @@
Comment[pt_BR]=Gerenciador do KResource
Comment[ro]=Gestionar KResurse
Comment[ru]=Администратор KResources
@@ -182,8 +198,8 @@
Comment[sr at latin]=Menadžer k‑resursa
Index: kresources/kresources.desktop
===================================================================
---- kresources/kresources.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kresources/kresources.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kresources/kresources.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kresources/kresources.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -36,6 +36,7 @@
Name[pt_BR]=Fontes de dados do KDE
Name[ro]=Resurse KDE
@@ -202,9 +218,17 @@
Comment[sr at latin]=Podesi resurse KDE‑a
Index: kresources/kresources_plugin.desktop
===================================================================
---- kresources/kresources_plugin.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kresources/kresources_plugin.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
-@@ -25,6 +25,7 @@
+--- kresources/kresources_plugin.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kresources/kresources_plugin.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
+@@ -14,6 +14,7 @@
+ Name[it]=Plugin di KResources
+ Name[ja]=KDE リソースプラグイン
+ Name[km]=កម្មវិធីជំនួយរបស់ KResources
++Name[lt]=KResursų priedas
+ Name[lv]=KResources spraudnis
+ Name[nb]=Programtillegg for KResources
+ Name[nds]=KResources-Moduul
+@@ -25,6 +26,7 @@
Name[pt_BR]=Plug-in do KResource
Name[ro]=Modul KResurse
Name[ru]=Модуль KResources
@@ -212,10 +236,32 @@
Name[sl]=Vstavek KResources
Name[sr]=Прикључак радног оквира к‑ресурса
Name[sr at latin]=Priključak radnog okvira k‑resursa
+@@ -52,6 +54,7 @@
+ Comment[it]=Plugin di infrastruttura di KResources
+ Comment[ja]=KDE リソースフレームワークのプラグイン
+ Comment[km]=កម្មវិធីជំនួយគ្រោងការរបស់ KResources
++Comment[lt]=KResursų aplinkos priedas
+ Comment[lv]=KResource karkasa spraudnis
+ Comment[nb]=Programtillegg for KResources-rammeverket
+ Comment[nds]=Rahmenwark-Moduul för KResources
+Index: kmime/kmime_util.h
+===================================================================
+--- kmime/kmime_util.h (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kmime/kmime_util.h (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
+@@ -57,8 +57,7 @@
+
+ inline bool isOfSet( const uchar map[16], unsigned char ch )
+ {
+- Q_ASSERT( ch < 128 );
+- return map[ ch/8 ] & 0x80 >> ch%8;
++ return ( ch < 128 ) && ( map[ ch/8 ] & 0x80 >> ch%8 );
+ }
+ inline bool isSpecial( char ch )
+ {
Index: kcal/localdir.desktop
===================================================================
---- kcal/localdir.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/localdir.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/localdir.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/localdir.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -24,9 +24,10 @@
Name[pa]=ਲੋਕਲ ਡਾਇਰੈਕਟਰੀ 'ਚ ਕੈਲੰਡਰ
Name[pl]=Kalendarz w katalogu lokalnym
@@ -228,7 +274,15 @@
Name[sl]=Koledar v krajevnem imeniku
Name[sr]=Календар у локалној фасцикли
Name[sr at latin]=Kalendar u lokalnoj fascikli
-@@ -59,6 +60,7 @@
+@@ -50,6 +51,7 @@
+ Comment[it]=Fornisce accesso a voci di calendario, ciascuna memorizzata in un singolo file in una data cartella
+ Comment[ja]=それぞれが単一のファイルに保存されている任意のディレクトリ内のカレンダーアイテムへのアクセスを提供します。
+ Comment[km]=ផ្ដល់ការចូលដំណើរការទៅកាន់ធាតុប្រតិទិន ធាតុនីមួយៗបានផ្ទុកនៅក្នុងឯកសារតែមួយ នៅក្នុងថតដែលបានផ្ដល់ឲ្យ
++Comment[lt]=Suteikia prieigą prie kalendoriaus įrašų, kurie saugomi individualiai nurodytame aplanke
+ Comment[lv]=Nodrošina piekļuvi kalendāra ierakstiem, kas katrs glabājas vienā failā, norādītā mapē
+ Comment[nb]=Gir tilgang til kalenderoppføringer, hver lagret i en enkelt fil, i en gitt mappe
+ Comment[nds]=Stellt Togriep op Kalennerindrääg praat, elkeen binnen een Datei binnen en angeven Orner.
+@@ -59,6 +61,7 @@
Comment[pt]=Oferece o acesso aos itens do calendário, estando cada um guardado num único ficheiro de uma dada pasta
Comment[pt_BR]=Fornece acesso aos itens do calendário, cada um armazenado em um único arquivo na pasta indicada
Comment[ro]=Oferă acces la elemente de calendar, fiecare stocat într-un singur fișier, într-un anumit director
@@ -238,8 +292,8 @@
Comment[sr at latin]=Pruža pristup kalendarskim stavkama, skladištenim u pojedinačnim fajlovima u datoj fascikli.
Index: kcal/local.desktop
===================================================================
---- kcal/local.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/local.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/local.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/local.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -24,9 +24,10 @@
Name[pa]=ਲੋਕਲ ਫਾਇਲ 'ਚ ਕੈਲੰਡਰ
Name[pl]=Kalendarz w pliku lokalnym
@@ -252,7 +306,15 @@
Name[sl]=Koledar v krajevni datoteki
Name[sr]=Календар у локалном фајлу
Name[sr at latin]=Kalendar u lokalnom fajlu
-@@ -59,6 +60,7 @@
+@@ -50,6 +51,7 @@
+ Comment[it]=Fornisce accesso ad un calendario memorizzato in un singolo file locale
+ Comment[ja]=単一のローカルファイルに保存されているカレンダーへのアクセスを提供します。
+ Comment[km]=ផ្ដល់ការចូលដំណើរការទៅកាន់ប្រតិទិនដែលបានផ្ទុកនៅក្នុងឯកសារមូលដ្ឋានតែមួយ
++Comment[lt]=Suteikia prieigą prie kalendoriaus, esančio viename vietiniame faile
+ Comment[lv]=Nodrošina piekļuvi kalendāram, kas glabājas vienā lokālā failā
+ Comment[nb]=Gir tilgang til en kalender lagret i en enkelt, lokal fil
+ Comment[nds]=Stellt Togriep op en Kalenner binnen een enkel lokaal Datei praat.
+@@ -59,6 +61,7 @@
Comment[pt]=Oferece o acesso a um calendário guardado num único ficheiro local
Comment[pt_BR]=Fornece acesso a um calendário armazenado em um único arquivo local
Comment[ro]=Oferă acces la un calendar stocat într-un singur fișier local
@@ -262,8 +324,8 @@
Comment[sr at latin]=Pruža pristup kalendaru skladištenom u jednom lokalnom fajlu
Index: kcal/kcal_manager.desktop
===================================================================
---- kcal/kcal_manager.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/kcal_manager.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/kcal_manager.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/kcal_manager.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -28,6 +28,7 @@
Name[pt]=Calendário
Name[pt_BR]=Calendário
@@ -274,8 +336,8 @@
Name[sr at latin]=Kalendar
Index: kcal/calendarresources.cpp
===================================================================
---- kcal/calendarresources.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/calendarresources.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/calendarresources.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/calendarresources.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -212,6 +212,7 @@
: Calendar( timeSpec ),
d( new KCal::CalendarResources::Private( family ) )
@@ -359,8 +421,8 @@
if ( ok ) {
Index: kcal/calendarresources.h
===================================================================
---- kcal/calendarresources.h (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/calendarresources.h (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/calendarresources.h (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/calendarresources.h (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -721,6 +721,7 @@
Q_DISABLE_COPY( CalendarResources )
class Private;
@@ -371,8 +433,8 @@
Index: kcal/event.cpp
===================================================================
---- kcal/event.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/event.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/event.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/event.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -121,8 +121,15 @@
if ( hasEndDate() ) {
return d->mDtEnd;
@@ -405,8 +467,8 @@
Index: kcal/todo.cpp
===================================================================
---- kcal/todo.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/todo.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/todo.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/todo.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -184,10 +184,10 @@
timeZone = ' ' + spec.timeZone().name();
}
@@ -435,8 +497,8 @@
Index: kcal/incidencebase.cpp
===================================================================
---- kcal/incidencebase.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/incidencebase.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/incidencebase.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/incidencebase.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -252,10 +252,10 @@
timeZone = ' ' + spec.timeZone().name();
}
@@ -452,8 +514,8 @@
Index: kcal/icalformat.cpp
===================================================================
---- kcal/icalformat.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/icalformat.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/icalformat.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/icalformat.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -131,7 +131,7 @@
// Convert to UTF8 and save
@@ -465,8 +527,8 @@
kDebug() << "err:" << file.errorString();
Index: kcal/resourcecalendar.cpp
===================================================================
---- kcal/resourcecalendar.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kcal/resourcecalendar.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kcal/resourcecalendar.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kcal/resourcecalendar.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -252,7 +252,8 @@
bool ResourceCalendar::doSave( bool syncCache, Incidence *incidence )
@@ -479,8 +541,8 @@
void ResourceCalendar::saveError( const QString &err )
Index: CMakeLists.txt
===================================================================
---- CMakeLists.txt (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ CMakeLists.txt (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- CMakeLists.txt (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ CMakeLists.txt (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -9,8 +9,7 @@
set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH} )
@@ -493,8 +555,8 @@
include (MacroLibrary)
Index: kioslave/nntp/nntp.cpp
===================================================================
---- kioslave/nntp/nntp.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kioslave/nntp/nntp.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kioslave/nntp/nntp.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kioslave/nntp/nntp.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -154,6 +154,7 @@
while ( true ) {
if ( !waitForResponse( readTimeout() ) ) {
@@ -571,8 +633,8 @@
memset( data, 0, MAX_PACKET_LEN );
Index: kioslave/nntp/nntp.h
===================================================================
---- kioslave/nntp/nntp.h (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kioslave/nntp/nntp.h (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kioslave/nntp/nntp.h (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kioslave/nntp/nntp.h (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -78,7 +78,7 @@
private:
QString mHost, mUser, mPass;
@@ -584,8 +646,8 @@
/// Current selected newsgroup
Index: kioslave/sieve/sieve.protocol
===================================================================
---- kioslave/sieve/sieve.protocol (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kioslave/sieve/sieve.protocol (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kioslave/sieve/sieve.protocol (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kioslave/sieve/sieve.protocol (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -35,6 +35,7 @@
Description[pt]=Um 'ioslave' para o protocolo de filtragem de correio Sieve
Description[pt_BR]=Um ioslave para o protocolo de filtragem de correio Sieve
@@ -596,8 +658,8 @@
Description[sr at latin]=U/I‑zahvat za sito, protokol filtriranja pošte
Index: mailtransport/smtpsettings.ui
===================================================================
---- mailtransport/smtpsettings.ui (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ mailtransport/smtpsettings.ui (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- mailtransport/smtpsettings.ui (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ mailtransport/smtpsettings.ui (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -1,8 +1,9 @@
-<ui version="4.0" >
- <author>Volker Krause <vkrause at kde.org>, KovoKs <tomalbers at kde.nl></author>
@@ -845,8 +907,8 @@
</hint>
Index: mailtransport/configmodule.cpp
===================================================================
---- mailtransport/configmodule.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ mailtransport/configmodule.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- mailtransport/configmodule.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ mailtransport/configmodule.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -27,7 +27,7 @@
using namespace MailTransport;
@@ -858,9 +920,17 @@
KCModule( MailTransportConfigFactory::componentData(), parent, args )
Index: mailtransport/kcm_mailtransport.desktop
===================================================================
---- mailtransport/kcm_mailtransport.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ mailtransport/kcm_mailtransport.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
-@@ -38,6 +38,7 @@
+--- mailtransport/kcm_mailtransport.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ mailtransport/kcm_mailtransport.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
+@@ -27,6 +27,7 @@
+ Name[it]=Trasporto della posta
+ Name[ja]=メール送信手段
+ Name[km]=ការដឹកជញ្ជូនសំបុត្រ
++Name[lt]=Pašto programa
+ Name[lv]=Pasta transports
+ Name[nb]=E-post-transport
+ Name[nds]=Överdreegmetood
+@@ -38,6 +39,7 @@
Name[pt_BR]=Transporte de correio
Name[ro]=Transport poștal
Name[ru]=Метод отправки
@@ -870,8 +940,8 @@
Name[sr at latin]=Transport pošte
Index: mailtransport/transportmanagementwidget.cpp
===================================================================
---- mailtransport/transportmanagementwidget.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ mailtransport/transportmanagementwidget.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- mailtransport/transportmanagementwidget.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ mailtransport/transportmanagementwidget.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -37,6 +37,7 @@
TransportManagementWidget::TransportManagementWidget( QWidget *parent )
: QWidget( parent ), d( new Private )
@@ -882,8 +952,8 @@
d->ui.transportList->setHeaderLabels( QStringList()
Index: kabc/scripts/addressee.src.cpp
===================================================================
---- kabc/scripts/addressee.src.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kabc/scripts/addressee.src.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kabc/scripts/addressee.src.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kabc/scripts/addressee.src.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -398,6 +398,7 @@
d->mEmails.removeAll( email );
d->mEmails.prepend( email );
@@ -894,8 +964,8 @@
} else {
Index: kabc/plugins/file/file.desktop
===================================================================
---- kabc/plugins/file/file.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kabc/plugins/file/file.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kabc/plugins/file/file.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kabc/plugins/file/file.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -27,6 +27,7 @@
Name[pt_BR]=Arquivo
Name[ro]=Fișier
@@ -906,8 +976,8 @@
Name[sr at latin]=Fajl
Index: kabc/plugins/net/net.desktop
===================================================================
---- kabc/plugins/net/net.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kabc/plugins/net/net.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kabc/plugins/net/net.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kabc/plugins/net/net.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -28,6 +28,7 @@
Name[pt_BR]=Rede
Name[ro]=Rețea
@@ -918,8 +988,8 @@
Name[sr at latin]=Mreža
Index: kabc/plugins/dir/dir.desktop
===================================================================
---- kabc/plugins/dir/dir.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kabc/plugins/dir/dir.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kabc/plugins/dir/dir.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kabc/plugins/dir/dir.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -28,6 +28,7 @@
Name[pt_BR]=Pasta
Name[ro]=Director
@@ -930,8 +1000,8 @@
Name[sr at latin]=Fascikla
Index: kabc/stdaddressbook.cpp
===================================================================
---- kabc/stdaddressbook.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kabc/stdaddressbook.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kabc/stdaddressbook.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kabc/stdaddressbook.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -166,8 +166,8 @@
Resource *res = mParent->standardResource();
if ( !res ) {
@@ -944,8 +1014,8 @@
kDebug() << "No resource available!!!";
Index: kabc/kabc_manager.desktop
===================================================================
---- kabc/kabc_manager.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kabc/kabc_manager.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kabc/kabc_manager.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kabc/kabc_manager.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -28,6 +28,7 @@
Name[pt_BR]=Contatos
Name[ro]=Contacte
@@ -956,8 +1026,8 @@
Name[sr at latin]=Kontakti
Index: kabc/formats/binary.desktop
===================================================================
---- kabc/formats/binary.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 929214)
-+++ kabc/formats/binary.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 929214)
+--- kabc/formats/binary.desktop (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ kabc/formats/binary.desktop (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
@@ -28,6 +28,7 @@
Name[pt_BR]=Binário
Name[ro]=Binar
@@ -966,3 +1036,66 @@
Name[sl]=Dvojiško
Name[sr]=Бинарни
Name[sr at latin]=Binarni
+Index: akonadi/itemdeletejob.cpp
+===================================================================
+--- akonadi/itemdeletejob.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ akonadi/itemdeletejob.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
+@@ -20,7 +20,7 @@
+ #include "itemdeletejob.h"
+ #include "itemmodifyjob.h"
+ #include "job_p.h"
+-#include "transactionjobs.h"
++#include "transactionsequence.h"
+ #include "expungejob.h"
+
+ using namespace Akonadi;
+@@ -73,20 +73,16 @@
+ {
+ Q_D( ItemDeleteJob );
+
+- TransactionBeginJob *begin = new TransactionBeginJob( this );
+- addSubjob( begin );
++ TransactionSequence *transaction = new TransactionSequence( this );
++ connect( transaction, SIGNAL(result(KJob*)), SLOT(jobDone(KJob*)) );
++ addSubjob( transaction );
+
+ d->mItem.setFlag( "\\Deleted" );
+- ItemModifyJob* store = new ItemModifyJob( d->mItem, this );
++ ItemModifyJob* store = new ItemModifyJob( d->mItem, transaction );
+ store->disableRevisionCheck();
+- addSubjob( store );
+
+- ExpungeJob *expunge = new ExpungeJob( this );
+- addSubjob( expunge );
+-
+- TransactionCommitJob *commit = new TransactionCommitJob( this );
+- connect( commit, SIGNAL(result(KJob*)), SLOT(jobDone(KJob*)) );
+- addSubjob( commit );
++ new ExpungeJob( transaction );
++ transaction->commit();
+ }
+
+ #include "itemdeletejob.moc"
+Index: akonadi/resourcebase.cpp
+===================================================================
+--- akonadi/resourcebase.cpp (.../tags/KDE/4.2.0/kdepimlibs) (wersja 930690)
++++ akonadi/resourcebase.cpp (.../branches/KDE/4.2/kdepimlibs) (wersja 930690)
+@@ -398,7 +398,17 @@
+
+ void ResourceBase::cancelTask()
+ {
+- d_func()->changeProcessed();
++ Q_D( ResourceBase );
++ switch ( d->scheduler->currentTask().type ) {
++ case ResourceScheduler::FetchItem:
++ itemRetrieved( Item() ); // sends the error reply and
++ break;
++ case ResourceScheduler::ChangeReplay:
++ d->changeProcessed();
++ break;
++ default:
++ d->scheduler->taskDone();
++ }
+ }
+
+ void ResourceBase::cancelTask( const QString &msg )
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepimlibs-branch.diff?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list