Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Mon Nov 3 18:13:31 CET 2008.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2008-10-21 10:20:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2008-10-31 11:27:09.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Oct 31 11:27:10 CET 2008 - dmueller@suse.de
+
+- update to 4.1.3
+ * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdepimlibs-4.1.2.tar.bz2
New:
----
kdepimlibs-4.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.o18221/_old 2008-11-03 18:13:23.000000000 +0100
+++ /var/tmp/diff_new_pack.o18221/_new 2008-11-03 18:13:23.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 4.1.2)
+# spec file for package kdepimlibs4 (Version 4.1.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,8 +23,8 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 4.1.2
-Release: 2
+Version: 4.1.3
+Release: 1
Source0: kdepimlibs-%version.tar.bz2
Source1: _upstream
Patch0: 4_1_BRANCH.diff
@@ -189,6 +189,9 @@
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Fri Oct 31 2008 dmueller@suse.de
+- update to 4.1.3
+ * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
* Tue Oct 21 2008 stbinner@suse.de
- 4_1_BRANCH.diff update:
* don't require < count match > count to consider string as HTML
@@ -235,7 +238,7 @@
- update to 4.0.72+svn of today to adopt akonadi API change
* Wed Apr 30 2008 dmueller@suse.de
- update to 4.0.72
-* Tue Apr 29 2008 dmueller@suse.de
+* Mon Apr 28 2008 dmueller@suse.de
- adapt to akonadi -> akonadi-runtime rename
* Fri Apr 18 2008 dmueller@suse.de
- update to 4.0.70:
@@ -248,7 +251,7 @@
- update to 4.0.68
* added akonadi platform
* many new unit tests
-* Wed Mar 26 2008 dmueller@suse.de
+* Tue Mar 25 2008 dmueller@suse.de
- update to 4.0.67
* Thu Mar 13 2008 dmueller@suse.de
- update to 4.0.66
@@ -309,7 +312,7 @@
- update to 3.92.0.svn700734
* Thu Aug 09 2007 stbinner@suse.de
- update to 3.92.0.svn697324
-* Sun Jul 29 2007 stbinner@suse.de
+* Sat Jul 28 2007 stbinner@suse.de
- update to KDE 4.0 Beta 1
* Thu Jul 12 2007 stbinner@suse.de
- update to 3.91.0.svn672298
++++++ 4_1_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.o18221/_old 2008-11-03 18:13:24.000000000 +0100
+++ /var/tmp/diff_new_pack.o18221/_new 2008-11-03 18:13:24.000000000 +0100
@@ -1,281 +1,10 @@
-package: kdepimlibs-4.1.2.tar.bz2
+package: kdepimlibs-4.1.3.tar.bz2
kdemod: kdepimlibs
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 874289
-+svn di between //tags/KDE/4.1.2/kdepimlibs and //branches/KDE/4.1/kdepimlibs
---- syndication/tools.cpp
-+++ syndication/tools.cpp
-@@ -150,8 +150,10 @@
- return str.trimmed();
- }
-
--static QRegExp tagRegExp;
--static bool tagRegExpSet = false;
-+namespace {
-+ static QRegExp tagRegExp;
-+ static bool tagRegExpSet = false;
-+}
-
- bool stringContainsMarkup(const QString& str)
- {
-@@ -159,8 +161,8 @@
- if (str.contains(QRegExp("&[a-zA-Z0-9#]+;")))
- return true;
-
-- int ltc = str.count('<');
-- if (ltc == 0 || ltc != str.count('>'))
-+ const int ltc = str.count('<');
-+ if (ltc == 0)
- return false;
-
- if (!tagRegExpSet)
-@@ -177,8 +179,8 @@
- if (str.contains(QRegExp("&[a-zA-Z0-9#]+;")))
- return true;
-
-- int ltc = str.count('<');
-- if (ltc == 0 || ltc != str.count('>'))
-+ const int ltc = str.count('<');
-+ if (ltc == 0)
- return false;
-
- if (!tagRegExpSet)
---- kresources/kresources_manager.desktop
-+++ kresources/kresources_manager.desktop
-@@ -24,6 +24,8 @@
- Name[pt]=Gestor do KResources
- Name[pt_BR]=Gerenciador do KResource
- Name[ro]=Administrator KResurse
-+Name[ru]=Администратор KResources
-+Name[sl]=Upravnik KResources
- Name[sr]=Менаџер к‑ресурса
- Name[sr@latin]=Menadžer k‑resursa
- Name[sv]=Resurshantering
-@@ -59,6 +61,8 @@
- Comment[pl]=Menadżer zasobów KDE (KResource)
- Comment[pt]=Gestor do KResources
- Comment[pt_BR]=Gerenciador do KResource
-+Comment[ru]=Администратор KResources
-+Comment[sl]=Upravnik KResources
- Comment[sr]=Менаџер к‑ресурса
- Comment[sr@latin]=Menadžer k‑resursa
- Comment[sv]=Resurshantering
---- kresources/kresources.desktop
-+++ kresources/kresources.desktop
-@@ -21,6 +21,7 @@
- Name[gl]=Recursos de KDE
- Name[hr]=KDE resursi
- Name[hu]=KDE-erőforrások
-+Name[is]=KDE auðlindir
- Name[it]=Risorse di KDE
- Name[ja]=KDE リソース
- Name[km]=ធនធានរបស់ KDE
-@@ -61,6 +62,7 @@
- Comment[gl]=Configurar os recursos de KDE
- Comment[hr]=Konfiguriranje KDE resursa
- Comment[hu]=A KDE-erőforrások beállítása
-+Comment[is]=Stilla KDE auðlindir
- Comment[it]=Configura le risorse di KDE
- Comment[ja]=KDE リソースの設定
- Comment[km]=កំណត់រចនាសម្ព័ន្ធធនធាន KDE
---- kresources/kresources_plugin.desktop
-+++ kresources/kresources_plugin.desktop
-@@ -24,6 +24,8 @@
- Name[pt]='Plugin' do KResources
- Name[pt_BR]=Plug-in do KResource
- Name[ro]=Modul KResurse
-+Name[ru]=Модуль KResources
-+Name[sl]=Vstavek KResources
- Name[sr]=Прикључак радног оквира к‑ресурса
- Name[sr@latin]=Priključak radnog okvira k‑resursa
- Name[sv]=Insticksprogram för resurser
---- kcal/localdir.desktop
-+++ kcal/localdir.desktop
-@@ -13,6 +13,7 @@
- Name[gl]=Axenda nun cartafol local
- Name[hr]=Kalendar u lokalnoj mapi
- Name[hu]=Naptár helyi könyvtárban
-+Name[is]=Dagatal í staðbundinni möppu
- Name[it]=Calendario nella cartella locale
- Name[ja]=ローカルディレクトリのカレンダー
- Name[km]=ប្រតិទិនក្នុងថតមូលដ្ឋាន
---- kcal/local.desktop
-+++ kcal/local.desktop
-@@ -13,6 +13,7 @@
- Name[gl]=Axenda nun ficheiro local
- Name[hr]=Kalendar u lokalnoj datoteci
- Name[hu]=Helyi naptárfájl
-+Name[is]=Dagatal í staðbundinni skrá
- Name[it]=Calendario in file locale
- Name[ja]=ローカルファイルのカレンダー
- Name[km]=ប្រតិទិនក្នុងឯកសារមូលដ្ឋាន
---- kcal/kcal_manager.desktop
-+++ kcal/kcal_manager.desktop
-@@ -14,6 +14,7 @@
- Name[gl]=Axenda
- Name[hr]=Kalendar
- Name[hu]=Naptár
-+Name[is]=Dagatal
- Name[it]=Calendario
- Name[ja]=カレンダー
- Name[km]=ប្រតិទិន
---- kcal/icalformat_p.cpp
-+++ kcal/icalformat_p.cpp
-@@ -2220,20 +2220,31 @@
- if ( value < 0 ) {
- value = -value;
- }
-+ // RFC2445 states that an ical duration value must be
-+ // EITHER weeks OR days/time, not both.
- if ( duration.isDaily() ) {
-- d.weeks = value / 7;
-- d.days = value % 7;
-- d.hours = d.minutes = d.seconds = 0;
-+ if ( !( value % 7 ) ) {
-+ d.weeks = value / 7;
-+ d.days = 0;
-+ } else {
-+ d.weeks = 0;
-+ d.days = value;
-+ d.hours = d.minutes = d.seconds = 0;
-+ }
- } else {
-- d.weeks = value / gSecondsPerWeek;
-- value %= gSecondsPerWeek;
-- d.days = value / gSecondsPerDay;
-- value %= gSecondsPerDay;
-- d.hours = value / gSecondsPerHour;
-- value %= gSecondsPerHour;
-- d.minutes = value / gSecondsPerMinute;
-- value %= gSecondsPerMinute;
-- d.seconds = value;
-+ if ( !( value % gSecondsPerWeek ) ) {
-+ d.weeks = value / gSecondsPerWeek;
-+ d.days = d.hours = d.minutes = d.seconds = 0;
-+ } else {
-+ d.weeks = 0;
-+ d.days = value / gSecondsPerDay;
-+ value %= gSecondsPerDay;
-+ d.hours = value / gSecondsPerHour;
-+ value %= gSecondsPerHour;
-+ d.minutes = value / gSecondsPerMinute;
-+ value %= gSecondsPerMinute;
-+ d.seconds = value;
-+ }
- }
-
- return d;
---- kcal/incidenceformatter.cpp
-+++ kcal/incidenceformatter.cpp
-@@ -1371,10 +1371,10 @@
- {
- if ( incidence && incidence->revision() > 0 && ( existingIncidence || !helper->calendar() ) ) {
- if ( incBase->type() == "Todo" ) {
-- html += "
";
-+ html += " | ";
- html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) );
- } else {
-- html += " | ";
-+ html += " | ";
- html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) );
- }
- html += "</td></tr><tr>";
---- kioslave/imap4/imap4.cpp
-+++ kioslave/imap4/imap4.cpp
-@@ -68,6 +68,7 @@
- #include
- #include
- #include
-+#include
-
- #ifdef HAVE_LIBSASL2
- extern "C" {
-@@ -145,6 +146,10 @@
- void
- sigchld_handler (int signo)
- {
-+ // A signal handler that calls for example waitpid has to save errno
-+ // before and restore it afterwards.
-+ // (cf. https://www.securecoding.cert.org/confluence/display/cplusplus/ERR32-CPP.+Do...)
-+ const int save_errno = errno;
- int pid, status;
-
- while (signo == SIGCHLD)
-@@ -156,9 +161,11 @@
- // the signal occurred ( BSD handles it different, but it should do
- // no harm ).
- KDE_signal (SIGCHLD, sigchld_handler);
-- return;
-+ break;
- }
- }
-+
-+ errno = save_errno;
- }
-
- IMAP4Protocol::IMAP4Protocol (const QByteArray & pool, const QByteArray & app, bool isSSL)
---- mailtransport/kcm_mailtransport.desktop
-+++ mailtransport/kcm_mailtransport.desktop
-@@ -25,6 +25,7 @@
- Name[gl]=Transporte de correo
- Name[hr]=Prijenos pošte
- Name[hu]=Levéltovábbítás
-+Name[is]=Póstflutningsleiðir
- Name[it]=Trasporto della posta
- Name[ja]=メール送信手段
- Name[km]=ការដឹកជញ្ជូនសំបុត្រ
---- kabc/plugins/file/file.desktop
-+++ kabc/plugins/file/file.desktop
-@@ -13,6 +13,7 @@
- Name[gl]=Ficheiro
- Name[hr]=Datoteka
- Name[hu]=Fájl
-+Name[is]=Skrá
- Name[ja]=ファイル
- Name[km]=ឯកសារ
- Name[lt]=Failas
---- kabc/plugins/net/net.desktop
-+++ kabc/plugins/net/net.desktop
-@@ -13,6 +13,7 @@
- Name[gl]=Rede
- Name[hr]=Mreža
- Name[hu]=Hálózat
-+Name[is]=Net
- Name[it]=Rete
- Name[ja]=ネットワーク
- Name[km]=បណ្តាញ
---- kabc/plugins/dir/dir.desktop
-+++ kabc/plugins/dir/dir.desktop
-@@ -13,6 +13,7 @@
- Name[gl]=Cartafol
- Name[hr]=Mapa
- Name[hu]=Könyvtár
-+Name[is]=Mappa
- Name[it]=Elenco
- Name[ja]=ディレクトリ
- Name[km]=ថត
---- kabc/kabc_manager.desktop
-+++ kabc/kabc_manager.desktop
-@@ -13,6 +13,7 @@
- Name[gl]=Contactos
- Name[hr]=Kontakti
- Name[hu]=Partnerek
-+Name[is]=Tengiliðir
- Name[it]=Contatti
- Name[ja]=コンタクト
- Name[km]=ទំនាក់ទំនង
---- kabc/formats/binary.desktop
-+++ kabc/formats/binary.desktop
-@@ -13,6 +13,7 @@
- Name[gl]=Binario
- Name[hr]=Binarno
- Name[hu]=Bináris
-+Name[is]=Tvíundakerfi
- Name[it]=Binario
- Name[ja]=バイナリ
- Name[km]=គោលពីរ
++current HEAD: 878038
++svn di between //tags/KDE/4.1.3/kdepimlibs and //branches/KDE/4.1/kdepimlibs
Property changes on: .
___________________________________________________________________
++++++ kdepimlibs-4.1.2.tar.bz2 -> kdepimlibs-4.1.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/gpgme++/CMakeLists.txt new/kdepimlibs-4.1.3/gpgme++/CMakeLists.txt
--- old/kdepimlibs-4.1.2/gpgme++/CMakeLists.txt 2008-07-03 07:05:12.000000000 +0200
+++ new/kdepimlibs-4.1.3/gpgme++/CMakeLists.txt 2008-10-30 14:22:48.000000000 +0100
@@ -32,7 +32,7 @@
gpgadduserideditinteractor.cpp
)
-set( _gpgmepp_version 2.0.0 )
+set( _gpgmepp_version 2.0.1 )
set( _gpgmepp_soversion 2 )
set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/gpgme++/editinteractor.cpp new/kdepimlibs-4.1.3/gpgme++/editinteractor.cpp
--- old/kdepimlibs-4.1.2/gpgme++/editinteractor.cpp 2008-04-23 17:51:17.000000000 +0200
+++ new/kdepimlibs-4.1.3/gpgme++/editinteractor.cpp 2008-10-30 14:22:48.000000000 +0100
@@ -28,11 +28,12 @@
#ifdef _WIN32
# include
-# define write _write
+#include
#else
# include
#endif
+#include <cerrno>
#include <cstring>
using namespace GpgME;
@@ -52,6 +53,24 @@
};
class GpgME::CallbackHelper {
+private:
+ static int writeAll( int fd, const void * buf, size_t count ) {
+ size_t toWrite = count;
+ while ( toWrite > 0 ) {
+#ifdef Q_OS_WIN
+ DWORD n;
+ if ( !WriteFile( (HANDLE)fd, buf, toWrite, &n, NULL ) )
+ return -1;
+#else
+ const int n = write( fd, buf, toWrite );
+#endif
+ if ( n < 0 )
+ return n;
+ toWrite -= n;
+ }
+ return count;
+ }
+
public:
static int edit_interactor_callback_impl( void * opaque, gpgme_status_code_t status, const char * args, int fd ) {
EditInteractor::Private * ei = (EditInteractor::Private*)opaque;
@@ -68,7 +87,7 @@
if ( ei->debug )
std::fprintf( ei->debug, "EditInteractor: %u -> nextState( %u, %s ) -> %u\n",
oldState, (unsigned int)status, args ? args : "<null>", ei->state );
-
+
if ( ei->state != oldState &&
// if there was an error from before, we stop here (### this looks weird, can this happen at all?)
gpg_err_code( ei->error.code() ) == GPG_ERR_NO_ERROR ) {
@@ -80,9 +99,22 @@
if ( ei->debug )
std::fprintf( ei->debug, "EditInteractor: action result \"%s\"\n", result );
// if there's a result, write it:
- if ( *result )
- write( fd, result, std::strlen( result ) );
- write( fd, "\n", 1 );
+ if ( *result ) {
+ errno = 0;
+ if ( writeAll( fd, result, std::strlen( result ) ) != std::strlen( result ) ) {
+ if ( ei->debug )
+ std::fprintf( ei->debug, "EditInteractor: Could not write to fd %d (%s)\n", fd, strerror( errno ) );
+ err = Error( GPG_ERR_GENERAL );
+ goto error;
+ }
+ }
+ errno = 0;
+ if ( writeAll( fd, "\n", 1 ) != 1 ) {
+ if ( ei->debug )
+ std::fprintf( ei->debug, "EditInteractor: Could not write to fd %d (%s)\n", fd, strerror( errno ) );
+ err = Error( GPG_ERR_GENERAL );
+ goto error;
+ }
} else {
if ( err )
goto error;
@@ -94,8 +126,8 @@
std::fprintf( ei->debug, "EditInteractor: no action executed\n" );
}
-
- error:
+
+ error:
if ( err ) {
ei->error = err;
ei->state = EditInteractor::ErrorState;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/gpgme++/key.cpp new/kdepimlibs-4.1.3/gpgme++/key.cpp
--- old/kdepimlibs-4.1.2/gpgme++/key.cpp 2008-06-25 09:58:44.000000000 +0200
+++ new/kdepimlibs-4.1.3/gpgme++/key.cpp 2008-10-30 14:22:48.000000000 +0100
@@ -203,19 +203,17 @@
}
const char * Key::keyID() const {
- if ( !key || !key->subkeys || !key->subkeys->fpr )
- return 0;
- const int len = strlen( key->subkeys->fpr );
- if ( len < 16 )
- return 0;
- return key->subkeys->fpr + len - 16; // return the last 8 bytes (in hex notation)
+ return key && key->subkeys ? key->subkeys->keyid : 0 ;
}
const char * Key::shortKeyID() const {
- if ( const char * keyid = keyID() )
- return keyid + 8 ;
- else
+ if ( !key || !key->subkeys || !key->subkeys->keyid )
return 0;
+ const int len = strlen( key->subkeys->keyid );
+ if ( len > 8 )
+ return key->subkeys->keyid + len - 8; // return the last 8 bytes (in hex notation)
+ else
+ return key->subkeys->keyid ;
}
const char * Key::primaryFingerprint() const {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kabc/formats/binary.desktop new/kdepimlibs-4.1.3/kabc/formats/binary.desktop
--- old/kdepimlibs-4.1.2/kabc/formats/binary.desktop 2008-08-28 10:06:49.000000000 +0200
+++ new/kdepimlibs-4.1.3/kabc/formats/binary.desktop 2008-10-30 14:22:49.000000000 +0100
@@ -13,6 +13,7 @@
Name[gl]=Binario
Name[hr]=Binarno
Name[hu]=Bináris
+Name[is]=Tvíundakerfi
Name[it]=Binario
Name[ja]=バイナリ
Name[km]=គោលពីរ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kabc/kabc_manager.desktop new/kdepimlibs-4.1.3/kabc/kabc_manager.desktop
--- old/kdepimlibs-4.1.2/kabc/kabc_manager.desktop 2008-08-28 10:06:49.000000000 +0200
+++ new/kdepimlibs-4.1.3/kabc/kabc_manager.desktop 2008-10-30 14:22:49.000000000 +0100
@@ -13,6 +13,7 @@
Name[gl]=Contactos
Name[hr]=Kontakti
Name[hu]=Partnerek
+Name[is]=Tengiliðir
Name[it]=Contatti
Name[ja]=コンタクト
Name[km]=ទំនាក់ទំនង
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kabc/plugins/dir/dir.desktop new/kdepimlibs-4.1.3/kabc/plugins/dir/dir.desktop
--- old/kdepimlibs-4.1.2/kabc/plugins/dir/dir.desktop 2008-08-28 10:06:49.000000000 +0200
+++ new/kdepimlibs-4.1.3/kabc/plugins/dir/dir.desktop 2008-10-30 14:22:49.000000000 +0100
@@ -13,6 +13,7 @@
Name[gl]=Cartafol
Name[hr]=Mapa
Name[hu]=Könyvtár
+Name[is]=Mappa
Name[it]=Elenco
Name[ja]=ディレクトリ
Name[km]=ថត
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kabc/plugins/file/file.desktop new/kdepimlibs-4.1.3/kabc/plugins/file/file.desktop
--- old/kdepimlibs-4.1.2/kabc/plugins/file/file.desktop 2008-08-28 10:06:48.000000000 +0200
+++ new/kdepimlibs-4.1.3/kabc/plugins/file/file.desktop 2008-10-30 14:22:49.000000000 +0100
@@ -13,6 +13,7 @@
Name[gl]=Ficheiro
Name[hr]=Datoteka
Name[hu]=Fájl
+Name[is]=Skrá
Name[ja]=ファイル
Name[km]=ឯកសារ
Name[lt]=Failas
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kabc/plugins/net/net.desktop new/kdepimlibs-4.1.3/kabc/plugins/net/net.desktop
--- old/kdepimlibs-4.1.2/kabc/plugins/net/net.desktop 2008-08-28 10:06:49.000000000 +0200
+++ new/kdepimlibs-4.1.3/kabc/plugins/net/net.desktop 2008-10-30 14:22:49.000000000 +0100
@@ -13,6 +13,7 @@
Name[gl]=Rede
Name[hr]=Mreža
Name[hu]=Hálózat
+Name[is]=Net
Name[it]=Rete
Name[ja]=ネットワーク
Name[km]=បណ្តាញ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kcal/icalformat_p.cpp new/kdepimlibs-4.1.3/kcal/icalformat_p.cpp
--- old/kdepimlibs-4.1.2/kcal/icalformat_p.cpp 2008-08-28 10:06:48.000000000 +0200
+++ new/kdepimlibs-4.1.3/kcal/icalformat_p.cpp 2008-10-30 14:22:48.000000000 +0100
@@ -2220,20 +2220,31 @@
if ( value < 0 ) {
value = -value;
}
+ // RFC2445 states that an ical duration value must be
+ // EITHER weeks OR days/time, not both.
if ( duration.isDaily() ) {
- d.weeks = value / 7;
- d.days = value % 7;
- d.hours = d.minutes = d.seconds = 0;
+ if ( !( value % 7 ) ) {
+ d.weeks = value / 7;
+ d.days = 0;
+ } else {
+ d.weeks = 0;
+ d.days = value;
+ d.hours = d.minutes = d.seconds = 0;
+ }
} else {
- d.weeks = value / gSecondsPerWeek;
- value %= gSecondsPerWeek;
- d.days = value / gSecondsPerDay;
- value %= gSecondsPerDay;
- d.hours = value / gSecondsPerHour;
- value %= gSecondsPerHour;
- d.minutes = value / gSecondsPerMinute;
- value %= gSecondsPerMinute;
- d.seconds = value;
+ if ( !( value % gSecondsPerWeek ) ) {
+ d.weeks = value / gSecondsPerWeek;
+ d.days = d.hours = d.minutes = d.seconds = 0;
+ } else {
+ d.weeks = 0;
+ d.days = value / gSecondsPerDay;
+ value %= gSecondsPerDay;
+ d.hours = value / gSecondsPerHour;
+ value %= gSecondsPerHour;
+ d.minutes = value / gSecondsPerMinute;
+ value %= gSecondsPerMinute;
+ d.seconds = value;
+ }
}
return d;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kcal/incidence.cpp new/kdepimlibs-4.1.3/kcal/incidence.cpp
--- old/kdepimlibs-4.1.2/kcal/incidence.cpp 2008-09-25 13:58:02.000000000 +0200
+++ new/kdepimlibs-4.1.3/kcal/incidence.cpp 2008-10-30 14:22:48.000000000 +0100
@@ -464,7 +464,7 @@
void Incidence::setRelatedToUid( const QString &relatedToUid )
{
- if ( mReadOnly || d->mRelatedToUid == relatedToUid ) {
+ if ( d->mRelatedToUid == relatedToUid ) {
return;
}
d->mRelatedToUid = relatedToUid;
@@ -478,7 +478,7 @@
void Incidence::setRelatedTo( Incidence *incidence )
{
- if ( mReadOnly || d->mRelatedTo == incidence ) {
+ if ( d->mRelatedTo == incidence ) {
return;
}
if ( d->mRelatedTo ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kcal/incidenceformatter.cpp new/kdepimlibs-4.1.3/kcal/incidenceformatter.cpp
--- old/kdepimlibs-4.1.2/kcal/incidenceformatter.cpp 2008-09-25 13:58:02.000000000 +0200
+++ new/kdepimlibs-4.1.3/kcal/incidenceformatter.cpp 2008-10-30 14:22:48.000000000 +0100
@@ -1371,10 +1371,10 @@
{
if ( incidence && incidence->revision() > 0 && ( existingIncidence || !helper->calendar() ) ) {
if ( incBase->type() == "Todo" ) {
- html += "";
+ html += " | ";
html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) );
} else {
- html += " | ";
+ html += " | ";
html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) );
}
html += "</td></tr><tr>";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kcal/kcal_manager.desktop new/kdepimlibs-4.1.3/kcal/kcal_manager.desktop
--- old/kdepimlibs-4.1.2/kcal/kcal_manager.desktop 2008-08-28 10:06:48.000000000 +0200
+++ new/kdepimlibs-4.1.3/kcal/kcal_manager.desktop 2008-10-30 14:22:48.000000000 +0100
@@ -14,6 +14,7 @@
Name[gl]=Axenda
Name[hr]=Kalendar
Name[hu]=Naptár
+Name[is]=Dagatal
Name[it]=Calendario
Name[ja]=カレンダー
Name[km]=ប្រតិទិន
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kcal/local.desktop new/kdepimlibs-4.1.3/kcal/local.desktop
--- old/kdepimlibs-4.1.2/kcal/local.desktop 2008-08-28 10:06:48.000000000 +0200
+++ new/kdepimlibs-4.1.3/kcal/local.desktop 2008-10-30 14:22:48.000000000 +0100
@@ -13,6 +13,7 @@
Name[gl]=Axenda nun ficheiro local
Name[hr]=Kalendar u lokalnoj datoteci
Name[hu]=Helyi naptárfájl
+Name[is]=Dagatal í staðbundinni skrá
Name[it]=Calendario in file locale
Name[ja]=ローカルファイルのカレンダー
Name[km]=ប្រតិទិនក្នុងឯកសារមូលដ្ឋាន
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kcal/localdir.desktop new/kdepimlibs-4.1.3/kcal/localdir.desktop
--- old/kdepimlibs-4.1.2/kcal/localdir.desktop 2008-08-28 10:06:48.000000000 +0200
+++ new/kdepimlibs-4.1.3/kcal/localdir.desktop 2008-10-30 14:22:48.000000000 +0100
@@ -13,6 +13,7 @@
Name[gl]=Axenda nun cartafol local
Name[hr]=Kalendar u lokalnoj mapi
Name[hu]=Naptár helyi könyvtárban
+Name[is]=Dagatal í staðbundinni möppu
Name[it]=Calendario nella cartella locale
Name[ja]=ローカルディレクトリのカレンダー
Name[km]=ប្រតិទិនក្នុងថតមូលដ្ឋាន
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kioslave/imap4/imap4.cpp new/kdepimlibs-4.1.3/kioslave/imap4/imap4.cpp
--- old/kdepimlibs-4.1.2/kioslave/imap4/imap4.cpp 2008-05-29 13:18:35.000000000 +0200
+++ new/kdepimlibs-4.1.3/kioslave/imap4/imap4.cpp 2008-10-30 14:22:48.000000000 +0100
@@ -68,6 +68,7 @@
#include
#include
#include
+#include
#ifdef HAVE_LIBSASL2
extern "C" {
@@ -145,6 +146,10 @@
void
sigchld_handler (int signo)
{
+ // A signal handler that calls for example waitpid has to save errno
+ // before and restore it afterwards.
+ // (cf. https://www.securecoding.cert.org/confluence/display/cplusplus/ERR32-CPP.+Do...)
+ const int save_errno = errno;
int pid, status;
while (signo == SIGCHLD)
@@ -156,9 +161,11 @@
// the signal occurred ( BSD handles it different, but it should do
// no harm ).
KDE_signal (SIGCHLD, sigchld_handler);
- return;
+ break;
}
}
+
+ errno = save_errno;
}
IMAP4Protocol::IMAP4Protocol (const QByteArray & pool, const QByteArray & app, bool isSSL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kioslave/sieve/sieve.cpp new/kdepimlibs-4.1.3/kioslave/sieve/sieve.cpp
--- old/kdepimlibs-4.1.2/kioslave/sieve/sieve.cpp 2008-08-28 10:06:48.000000000 +0200
+++ new/kdepimlibs-4.1.3/kioslave/sieve/sieve.cpp 2008-10-30 14:22:48.000000000 +0100
@@ -1227,7 +1227,7 @@
const int minor = regExp.cap( 2 ).toInt();
const int patch = regExp.cap( 3 ).toInt();
const QString vendor = regExp.cap( 4 );
- if ( major < 2 || (major == 2 && (minor < 3 || (major == 3 && patch < 11))) || (vendor == "-kolab-nocaps") ) {
+ if ( major < 2 || (major == 2 && (minor < 3 || (minor == 3 && patch < 11))) || (vendor == "-kolab-nocaps") ) {
ksDebug << k_funcinfo << "Enabling compat mode for Cyrus < 2.3.11 or Cyrus marked as \"kolab-nocaps\"" << endl;
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kresources/kresources.desktop new/kdepimlibs-4.1.3/kresources/kresources.desktop
--- old/kdepimlibs-4.1.2/kresources/kresources.desktop 2008-08-28 10:06:48.000000000 +0200
+++ new/kdepimlibs-4.1.3/kresources/kresources.desktop 2008-10-30 14:22:48.000000000 +0100
@@ -21,6 +21,7 @@
Name[gl]=Recursos de KDE
Name[hr]=KDE resursi
Name[hu]=KDE-erőforrások
+Name[is]=KDE auðlindir
Name[it]=Risorse di KDE
Name[ja]=KDE リソース
Name[km]=ធនធានរបស់ KDE
@@ -61,6 +62,7 @@
Comment[gl]=Configurar os recursos de KDE
Comment[hr]=Konfiguriranje KDE resursa
Comment[hu]=A KDE-erőforrások beállítása
+Comment[is]=Stilla KDE auðlindir
Comment[it]=Configura le risorse di KDE
Comment[ja]=KDE リソースの設定
Comment[km]=កំណត់រចនាសម្ព័ន្ធធនធាន KDE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kresources/kresources_manager.desktop new/kdepimlibs-4.1.3/kresources/kresources_manager.desktop
--- old/kdepimlibs-4.1.2/kresources/kresources_manager.desktop 2008-09-25 13:58:01.000000000 +0200
+++ new/kdepimlibs-4.1.3/kresources/kresources_manager.desktop 2008-10-30 14:22:48.000000000 +0100
@@ -24,6 +24,8 @@
Name[pt]=Gestor do KResources
Name[pt_BR]=Gerenciador do KResource
Name[ro]=Administrator KResurse
+Name[ru]=Администратор KResources
+Name[sl]=Upravnik KResources
Name[sr]=Менаџер к‑ресурса
Name[sr@latin]=Menadžer k‑resursa
Name[sv]=Resurshantering
@@ -59,6 +61,8 @@
Comment[pl]=Menadżer zasobów KDE (KResource)
Comment[pt]=Gestor do KResources
Comment[pt_BR]=Gerenciador do KResource
+Comment[ru]=Администратор KResources
+Comment[sl]=Upravnik KResources
Comment[sr]=Менаџер к‑ресурса
Comment[sr@latin]=Menadžer k‑resursa
Comment[sv]=Resurshantering
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/kresources/kresources_plugin.desktop new/kdepimlibs-4.1.3/kresources/kresources_plugin.desktop
--- old/kdepimlibs-4.1.2/kresources/kresources_plugin.desktop 2008-09-25 13:58:01.000000000 +0200
+++ new/kdepimlibs-4.1.3/kresources/kresources_plugin.desktop 2008-10-30 14:22:48.000000000 +0100
@@ -24,6 +24,8 @@
Name[pt]='Plugin' do KResources
Name[pt_BR]=Plug-in do KResource
Name[ro]=Modul KResurse
+Name[ru]=Модуль KResources
+Name[sl]=Vstavek KResources
Name[sr]=Прикључак радног оквира к‑ресурса
Name[sr@latin]=Priključak radnog okvira k‑resursa
Name[sv]=Insticksprogram för resurser
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/mailtransport/kcm_mailtransport.desktop new/kdepimlibs-4.1.3/mailtransport/kcm_mailtransport.desktop
--- old/kdepimlibs-4.1.2/mailtransport/kcm_mailtransport.desktop 2008-08-28 10:06:48.000000000 +0200
+++ new/kdepimlibs-4.1.3/mailtransport/kcm_mailtransport.desktop 2008-10-30 14:22:48.000000000 +0100
@@ -25,6 +25,7 @@
Name[gl]=Transporte de correo
Name[hr]=Prijenos pošte
Name[hu]=Levéltovábbítás
+Name[is]=Póstflutningsleiðir
Name[it]=Trasporto della posta
Name[ja]=メール送信手段
Name[km]=ការដឹកជញ្ជូនសំបុត្រ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.2/syndication/tools.cpp new/kdepimlibs-4.1.3/syndication/tools.cpp
--- old/kdepimlibs-4.1.2/syndication/tools.cpp 2008-07-17 23:32:46.000000000 +0200
+++ new/kdepimlibs-4.1.3/syndication/tools.cpp 2008-10-30 14:22:48.000000000 +0100
@@ -150,8 +150,10 @@
return str.trimmed();
}
-static QRegExp tagRegExp;
-static bool tagRegExpSet = false;
+namespace {
+ static QRegExp tagRegExp;
+ static bool tagRegExpSet = false;
+}
bool stringContainsMarkup(const QString& str)
{
@@ -159,8 +161,8 @@
if (str.contains(QRegExp("&[a-zA-Z0-9#]+;")))
return true;
- int ltc = str.count('<');
- if (ltc == 0 || ltc != str.count('>'))
+ const int ltc = str.count('<');
+ if (ltc == 0)
return false;
if (!tagRegExpSet)
@@ -177,8 +179,8 @@
if (str.contains(QRegExp("&[a-zA-Z0-9#]+;")))
return true;
- int ltc = str.count('<');
- if (ltc == 0 || ltc != str.count('>'))
+ const int ltc = str.count('<');
+ if (ltc == 0)
return false;
if (!tagRegExpSet)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
Show replies by date
| |