Hello community,
here is the log from the commit of package kdepimlibs4
checked in at Fri Jul 18 00:25:09 CEST 2008.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2008-07-11 10:58:06.000000000 +0200
+++ kdepimlibs4/kdepimlibs4.changes 2008-07-15 01:19:43.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jul 15 01:19:09 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.98
+
+-------------------------------------------------------------------
Old:
----
kdepimlibs-4.0.85.tar.bz2
New:
----
kdepimlibs-4.0.98.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.Pr5355/_old 2008-07-18 00:23:52.000000000 +0200
+++ /var/tmp/diff_new_pack.Pr5355/_new 2008-07-18 00:23:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 4.0.85)
+# spec file for package kdepimlibs4 (Version 4.0.98)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 4.0.85
+Version: 4.0.98
Release: 1
Source0: kdepimlibs-%version.tar.bz2
Source1: _upstream
@@ -184,6 +184,8 @@
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Tue Jul 15 2008 dmueller@suse.de
+- update to 4.0.98
* Fri Jul 04 2008 dmueller@suse.de
- update to 4.0.85
* Thu Jun 26 2008 dmueller@suse.de
++++++ kdepimlibs-4.0.85.tar.bz2 -> kdepimlibs-4.0.98.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/akonadi/itemmodifyjob.h new/kdepimlibs-4.0.98/akonadi/itemmodifyjob.h
--- old/kdepimlibs-4.0.85/akonadi/itemmodifyjob.h 2008-06-10 13:40:55.000000000 +0200
+++ new/kdepimlibs-4.0.98/akonadi/itemmodifyjob.h 2008-07-09 13:02:35.000000000 +0200
@@ -86,15 +86,15 @@
/**
* Sets whether the payload of the modified item shall be
- * transmitted to the Akonadi storage as well.
- * The default is @c true, however it can be disabled for
+ * omitted from transmission to the Akonadi storage.
+ * The default is @c false, however it can be set for
* performance reasons.
*/
void setIgnorePayload( bool ignore );
/**
* Returns whether the payload of the modified item shall be
- * transmitted to the Akonadi storage as well.
+ * omitted from transmission to the Akonadi storage.
*/
bool ignorePayload() const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/akonadi/itemsync.h new/kdepimlibs-4.0.98/akonadi/itemsync.h
--- old/kdepimlibs-4.0.85/akonadi/itemsync.h 2008-07-03 07:05:13.000000000 +0200
+++ new/kdepimlibs-4.0.98/akonadi/itemsync.h 2008-07-08 11:57:01.000000000 +0200
@@ -150,7 +150,7 @@
* Reimplement this method to customize the synchronization algorithm.
*
* You can update the @p newItem according to the @p storedItem before
- * it gets commited.
+ * it gets committed.
*/
virtual bool updateItem( const Item &storedItem, Item &newItem );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/gpgme++/gpgsignkeyeditinteractor.cpp new/kdepimlibs-4.0.98/gpgme++/gpgsignkeyeditinteractor.cpp
--- old/kdepimlibs-4.0.85/gpgme++/gpgsignkeyeditinteractor.cpp 2008-06-25 09:58:44.000000000 +0200
+++ new/kdepimlibs-4.0.98/gpgme++/gpgsignkeyeditinteractor.cpp 2008-07-08 11:57:01.000000000 +0200
@@ -57,7 +57,6 @@
bool started;
int options;
- Key secretKey;
std::vector<unsigned int> userIDs;
std::vector<unsigned int>::const_iterator currentId, nextId;
unsigned int checkLevel;
@@ -281,11 +280,6 @@
d->checkLevel = checkLevel;
}
-void GpgSignKeyEditInteractor::setSigningKey( const Key & secretKey ) {
- assert( !d->started );
- d->secretKey = secretKey;
-}
-
void GpgSignKeyEditInteractor::setUserIDsToSign( const std::vector<unsigned int> & userIDsToSign ) {
assert( !d->started );
d->userIDs = userIDsToSign;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/gpgme++/gpgsignkeyeditinteractor.h new/kdepimlibs-4.0.98/gpgme++/gpgsignkeyeditinteractor.h
--- old/kdepimlibs-4.0.85/gpgme++/gpgsignkeyeditinteractor.h 2008-06-25 09:58:44.000000000 +0200
+++ new/kdepimlibs-4.0.98/gpgme++/gpgsignkeyeditinteractor.h 2008-07-08 11:57:01.000000000 +0200
@@ -45,7 +45,6 @@
~GpgSignKeyEditInteractor();
void setCheckLevel( unsigned int checkLevel );
- void setSigningKey( const Key & secretKey );
void setUserIDsToSign( const std::vector<unsigned int> & userIDsToSign );
void setSigningOptions( int options );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/gpgme++/importresult.cpp new/kdepimlibs-4.0.98/gpgme++/importresult.cpp
--- old/kdepimlibs-4.0.85/gpgme++/importresult.cpp 2008-06-25 09:58:44.000000000 +0200
+++ new/kdepimlibs-4.0.98/gpgme++/importresult.cpp 2008-07-08 11:57:01.000000000 +0200
@@ -58,20 +58,18 @@
GpgME::ImportResult::ImportResult( gpgme_ctx_t ctx, int error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
GpgME::ImportResult::ImportResult( gpgme_ctx_t ctx, const Error & error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
void GpgME::ImportResult::init( gpgme_ctx_t ctx ) {
+ if ( !ctx )
+ return;
gpgme_import_result_t res = gpgme_op_import_result( ctx );
if ( !res )
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/gpgme++/keygenerationresult.cpp new/kdepimlibs-4.0.98/gpgme++/keygenerationresult.cpp
--- old/kdepimlibs-4.0.85/gpgme++/keygenerationresult.cpp 2008-06-25 09:58:44.000000000 +0200
+++ new/kdepimlibs-4.0.98/gpgme++/keygenerationresult.cpp 2008-07-08 11:57:01.000000000 +0200
@@ -50,20 +50,18 @@
GpgME::KeyGenerationResult::KeyGenerationResult( gpgme_ctx_t ctx, int error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
GpgME::KeyGenerationResult::KeyGenerationResult( gpgme_ctx_t ctx, const Error & error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
void GpgME::KeyGenerationResult::init( gpgme_ctx_t ctx ) {
+ if ( !ctx )
+ return;
gpgme_genkey_result_t res = gpgme_op_genkey_result( ctx );
if ( !res )
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/gpgme++/keylistresult.cpp new/kdepimlibs-4.0.98/gpgme++/keylistresult.cpp
--- old/kdepimlibs-4.0.85/gpgme++/keylistresult.cpp 2008-06-25 09:58:44.000000000 +0200
+++ new/kdepimlibs-4.0.98/gpgme++/keylistresult.cpp 2008-07-08 11:57:01.000000000 +0200
@@ -41,20 +41,18 @@
GpgME::KeyListResult::KeyListResult( gpgme_ctx_t ctx, int error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
GpgME::KeyListResult::KeyListResult( gpgme_ctx_t ctx, const Error & error )
: GpgME::Result( error ), d()
{
- if ( error || !ctx )
- return;
init( ctx );
}
void GpgME::KeyListResult::init( gpgme_ctx_t ctx ) {
+ if ( !ctx )
+ return;
gpgme_keylist_result_t res = gpgme_op_keylist_result( ctx );
if ( !res )
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kcal/icalformat_p.cpp new/kdepimlibs-4.0.98/kcal/icalformat_p.cpp
--- old/kdepimlibs-4.0.85/kcal/icalformat_p.cpp 2008-07-03 07:05:12.000000000 +0200
+++ new/kdepimlibs-4.0.98/kcal/icalformat_p.cpp 2008-07-08 11:57:00.000000000 +0200
@@ -1221,7 +1221,7 @@
}
QString name;
- QString uid = QString();
+ QString uid;
p = icalproperty_get_first_parameter( attendee, ICAL_CN_PARAMETER );
if ( p ) {
name = QString::fromUtf8( icalparameter_get_cn( p ) );
@@ -1676,7 +1676,7 @@
CustomProperties *properties )
{
QMap customProperties;
- QString lastProperty = QString();
+ QString lastProperty;
icalproperty *p = icalcomponent_get_first_property( parent, ICAL_X_PROPERTY );
while ( p ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kcal/incidence.cpp new/kdepimlibs-4.0.98/kcal/incidence.cpp
--- old/kdepimlibs-4.0.85/kcal/incidence.cpp 2008-06-18 14:41:06.000000000 +0200
+++ new/kdepimlibs-4.0.98/kcal/incidence.cpp 2008-07-08 11:57:00.000000000 +0200
@@ -188,9 +188,6 @@
(*it)->d->mRelatedTo = 0;
}
}
- if ( relatedTo() ) {
- relatedTo()->removeRelation( this );
- }
delete d->mRecurrence;
delete d;
@@ -200,7 +197,7 @@
// A string comparison that considers that null and empty are the same
static bool stringCompare( const QString &s1, const QString &s2 )
{
- return s1.isEmpty() && s2.isEmpty() || s1 == s2;
+ return ( s1.isEmpty() && s2.isEmpty() ) || ( s1 == s2 );
}
//@endcond
@@ -512,7 +509,7 @@
void Incidence::removeRelation( Incidence *incidence )
{
d->mRelations.removeRef( incidence );
- d->mRelatedToUid = QString();
+ d->mRelatedToUid.clear();
// if (incidence->getRelatedTo() == this) incidence->setRelatedTo(0);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kcal/resourcecalendar.cpp new/kdepimlibs-4.0.98/kcal/resourcecalendar.cpp
--- old/kdepimlibs-4.0.85/kcal/resourcecalendar.cpp 2008-02-28 18:55:13.000000000 +0100
+++ new/kdepimlibs-4.0.98/kcal/resourcecalendar.cpp 2008-07-08 11:57:00.000000000 +0200
@@ -239,8 +239,8 @@
bool ResourceCalendar::save( QString &err, Incidence *incidence )
{
- d->mLastError = QString();
- bool ret = save( incidence );
+ d->mLastError.clear();
+ bool ret = save( incidence ); // a new mLastError may be set in here
err = d->mLastError;
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kmime/kmime_content.cpp new/kdepimlibs-4.0.98/kmime/kmime_content.cpp
--- old/kdepimlibs-4.0.85/kmime/kmime_content.cpp 2008-01-05 00:53:09.000000000 +0100
+++ new/kdepimlibs-4.0.98/kmime/kmime_content.cpp 2008-07-08 11:57:00.000000000 +0200
@@ -95,7 +95,7 @@
bts.setCodec( "ISO 8859-1" );
bool isHead = true;
- foreach ( QByteArray line, l ) {
+ foreach ( const QByteArray& line, l ) {
if ( isHead && line.isEmpty() ) {
isHead = false;
continue;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kmime/kmime_contentindex.cpp new/kdepimlibs-4.0.98/kmime/kmime_contentindex.cpp
--- old/kdepimlibs-4.0.85/kmime/kmime_contentindex.cpp 2008-01-05 00:53:09.000000000 +0100
+++ new/kdepimlibs-4.0.98/kmime/kmime_contentindex.cpp 2008-07-08 11:57:00.000000000 +0200
@@ -53,8 +53,8 @@
KMime::ContentIndex::ContentIndex( const QString &index ) : d( new Private )
{
- QStringList l = index.split( '.' );
- foreach ( QString s, l ) {
+ const QStringList l = index.split( '.' );
+ foreach ( const QString &s, l ) {
bool ok;
unsigned int i = s.toUInt( &ok );
if ( !ok ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kmime/kmime_util.cpp new/kdepimlibs-4.0.98/kmime/kmime_util.cpp
--- old/kdepimlibs-4.0.85/kmime/kmime_util.cpp 2008-05-07 11:05:12.000000000 +0200
+++ new/kdepimlibs-4.0.98/kmime/kmime_util.cpp 2008-07-08 11:57:00.000000000 +0200
@@ -50,7 +50,7 @@
QByteArray cachedCharset( const QByteArray &name )
{
- foreach ( QByteArray charset, c_harsetCache ) {
+ foreach ( const QByteArray& charset, c_harsetCache ) {
if ( qstricmp( name.data(), charset.data() ) == 0 ) {
return charset;
}
@@ -63,7 +63,7 @@
QByteArray cachedLanguage( const QByteArray &name )
{
- foreach ( QByteArray language, l_anguageCache ) {
+ foreach ( const QByteArray& language, l_anguageCache ) {
if ( qstricmp( name.data(), language.data() ) == 0 ) {
return language;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kpimutils/kfileio.cpp new/kdepimlibs-4.0.98/kpimutils/kfileio.cpp
--- old/kdepimlibs-4.0.85/kpimutils/kfileio.cpp 2008-02-21 10:27:39.000000000 +0100
+++ new/kdepimlibs-4.0.98/kpimutils/kfileio.cpp 2008-07-08 11:56:59.000000000 +0200
@@ -278,7 +278,7 @@
if ( !g.isReadable() ){
error.append( i18n( "Folder %1 is inaccessible.", toCheck ) + '\n' );
} else {
- foreach ( QFileInfo fi, g.entryInfoList() ) {
+ foreach ( const QFileInfo &fi, g.entryInfoList() ) {
QString newToCheck = toCheck + '/' + fi.fileName();
QFileInfo fiNewToCheck(newToCheck);
if ( fi.fileName() != "." && fi.fileName() != ".." ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kpimutils/linklocator.cpp new/kdepimlibs-4.0.98/kpimutils/linklocator.cpp
--- old/kdepimlibs-4.0.85/kpimutils/linklocator.cpp 2008-05-21 10:32:38.000000000 +0200
+++ new/kdepimlibs-4.0.98/kpimutils/linklocator.cpp 2008-07-08 11:56:59.000000000 +0200
@@ -155,7 +155,7 @@
( ch == 'v' && mText.mid( mPos, 6 ) == "vnc://" ) ||
( ch == 'f' && ( mText.mid( mPos, 7 ) == "fish://" ||
mText.mid( mPos, 6 ) == "ftp://" ||
- mText.mid( mPos, 7 ) == "ftps://") ) ||
+ mText.mid( mPos, 7 ) == "ftps://" ) ) ||
( ch == 's' && ( mText.mid( mPos, 7 ) == "sftp://" ||
mText.mid( mPos, 6 ) == "smb://" ) ) ||
( ch == 'm' && mText.mid( mPos, 7 ) == "mailto:" ) ||
@@ -363,8 +363,9 @@
if ( flags & ReplaceSmileys ) {
QStringList exclude;
exclude << "(c)" << "(C)" << ">:-(" << ">:(" << "(B)" << "(b)" << "(P)" << "(p)";
- exclude << "(O)" << "(o)" << "(D)" << "(d)" << "(E)" << "(e)" << "(K)" << "(k)" << "(I)" << "(i)";
- exclude << "(L)" << "(l)" << "(8)" << "(T)" << "(t)" << "(G)" << "(g)" << "(F)" << "(f)" << "(H)";
+ exclude << "(O)" << "(o)" << "(D)" << "(d)" << "(E)" << "(e)" << "(K)" << "(k)";
+ exclude << "(I)" << "(i)" << "(L)" << "(l)" << "(8)" << "(T)" << "(t)" << "(G)";
+ exclude << "(g)" << "(F)" << "(f)" << "(H)";
exclude << "8)" << "(N)" << "(n)" << "(Y)" << "(y)" << "(U)" << "(u)" << "(W)" << "(w)";
result = sEmoticons->theme().parseEmoticons( result, KEmoticonsTheme::StrictParse |
KEmoticonsTheme::SkipHTML,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kresources/kcmkresources.cpp new/kdepimlibs-4.0.98/kresources/kcmkresources.cpp
--- old/kdepimlibs-4.0.85/kresources/kcmkresources.cpp 2008-06-10 13:40:54.000000000 +0200
+++ new/kdepimlibs-4.0.98/kresources/kcmkresources.cpp 2008-07-08 11:57:00.000000000 +0200
@@ -36,7 +36,7 @@
: KCModule( ResourcesFactory::componentData(), parent, QVariantList() )
{
Q_UNUSED( l );
- KGlobal::locale()->insertCatalog("libkresources");
+ KGlobal::locale()->insertCatalog( "libkresources" );
QVBoxLayout *layout = new QVBoxLayout( this );
mConfigPage = new KRES::ConfigPage( this );
layout->addWidget( mConfigPage );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kresources/kresources_manager.desktop new/kdepimlibs-4.0.98/kresources/kresources_manager.desktop
--- old/kdepimlibs-4.0.85/kresources/kresources_manager.desktop 2008-06-25 09:58:43.000000000 +0200
+++ new/kdepimlibs-4.0.98/kresources/kresources_manager.desktop 2008-07-08 11:56:59.000000000 +0200
@@ -5,7 +5,7 @@
Name[da]=KResources-håndtering
Name[de]=Ressourcenverwaltung
Name[el]=Διαχειριστής KResources
-Name[es]=Administrador de KResource
+Name[es]=Administrador de KResources
Name[et]=KDE ressursside haldur
Name[fr]=Gestionnaire de ressources
Name[ga]=Bainisteoir KResources
@@ -35,7 +35,7 @@
Comment[da]=KResources-håndtering
Comment[de]=Ressourcenverwaltung
Comment[el]=Διαχειριστής KResources
-Comment[es]=Administrador de KResource
+Comment[es]=Administrador de KResources
Comment[et]=KDE ressursside haldur
Comment[fr]=Gestionnaire de ressources
Comment[ga]=Bainisteoir KResources
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/kresources/kresources_plugin.desktop new/kdepimlibs-4.0.98/kresources/kresources_plugin.desktop
--- old/kdepimlibs-4.0.85/kresources/kresources_plugin.desktop 2008-06-25 09:58:43.000000000 +0200
+++ new/kdepimlibs-4.0.98/kresources/kresources_plugin.desktop 2008-07-08 11:57:00.000000000 +0200
@@ -5,7 +5,7 @@
Name[da]=KResources-plugin
Name[de]=KRessourcen-Modul
Name[el]=Πρόσθετο KResources
-Name[es]=Complemento de KResource
+Name[es]=Complemento de KResources
Name[et]=KDE ressursside plugin
Name[fr]=Module externe de gestion de ressources
Name[ga]=Breiseán KResources
@@ -35,7 +35,7 @@
Comment[da]=KResource-strukturplugin
Comment[de]=Modul für KRessourcen-Grundgerüst
Comment[el]=Πρόσθετο πλαισίου εργασίας του KResource
-Comment[es]=Complemento de estructura de KResource
+Comment[es]=Complemento de estructura de KResources
Comment[et]=KDE ressursside raamistiku plugin
Comment[fr]=Module externe d'infrastructure de ressources
Comment[ga]=Breiseán Creatlaí KResources
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/mailtransport/smtpjob.cpp new/kdepimlibs-4.0.98/mailtransport/smtpjob.cpp
--- old/kdepimlibs-4.0.85/mailtransport/smtpjob.cpp 2008-06-25 09:58:44.000000000 +0200
+++ new/kdepimlibs-4.0.98/mailtransport/smtpjob.cpp 2008-07-08 11:57:01.000000000 +0200
@@ -132,13 +132,13 @@
destination.addQueryItem( QLatin1String( "headers" ), QLatin1String( "0" ) );
destination.addQueryItem( QLatin1String( "from" ), sender() );
- foreach ( QString str, to() ) {
+ foreach ( const QString& str, to() ) {
destination.addQueryItem( QLatin1String( "to" ), str );
}
- foreach ( QString str, cc() ) {
+ foreach ( const QString& str, cc() ) {
destination.addQueryItem( QLatin1String( "cc" ), str );
}
- foreach ( QString str, bcc() ) {
+ foreach ( const QString& str, bcc() ) {
destination.addQueryItem( QLatin1String( "bcc" ), str );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/mailtransport/transportmanager.cpp new/kdepimlibs-4.0.98/mailtransport/transportmanager.cpp
--- old/kdepimlibs-4.0.85/mailtransport/transportmanager.cpp 2008-06-25 09:58:44.000000000 +0200
+++ new/kdepimlibs-4.0.98/mailtransport/transportmanager.cpp 2008-07-08 11:57:01.000000000 +0200
@@ -230,7 +230,6 @@
return createTransportJob( t->id() );
}
- Q_ASSERT( false );
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/qgpgme/dataprovider.cpp new/kdepimlibs-4.0.98/qgpgme/dataprovider.cpp
--- old/kdepimlibs-4.0.85/qgpgme/dataprovider.cpp 2008-01-15 02:47:24.000000000 +0100
+++ new/kdepimlibs-4.0.98/qgpgme/dataprovider.cpp 2008-07-08 11:56:58.000000000 +0200
@@ -133,7 +133,8 @@
QIODeviceDataProvider::QIODeviceDataProvider( const boost::shared_ptr<QIODevice> & io )
: GpgME::DataProvider(),
- mIO( io )
+ mIO( io ),
+ mErrorOccurred( false )
{
assert( mIO );
}
@@ -150,6 +151,14 @@
}
}
+namespace {
+ struct Enabler {
+ explicit Enabler( bool* b_ ) : b( b_) {}
+ ~Enabler() { if ( b ) *b = true; }
+ bool* const b;
+ };
+}
+
ssize_t QIODeviceDataProvider::read( void * buffer, size_t bufSize ) {
#ifndef NDEBUG
//qDebug( "QIODeviceDataProvider::read( %p, %d )", buffer, bufSize );
@@ -160,7 +169,18 @@
errno = EINVAL;
return -1;
}
- return mIO->read( static_cast(buffer), bufSize );
+ //workaround: some QIODevices (known example: QProcess) might not return 0 (EOF), but immediately -1 when finished. If no
+ //errno is set, gpgme doesn't detect the error and loops forever. So return 0 on the very first -1 in case errno is 0
+
+ const qint64 numRead = mIO->read( static_cast(buffer), bufSize );
+
+ Enabler en( numRead < 0 ? &mErrorOccurred : 0 );
+ if ( numRead < 0 && errno == 0 )
+ if ( mErrorOccurred )
+ errno = EIO;
+ else
+ return 0;
+ return numRead;
}
ssize_t QIODeviceDataProvider::write( const void * buffer, size_t bufSize ) {
@@ -173,6 +193,7 @@
errno = EINVAL;
return -1;
}
+
return mIO->write( static_cast(buffer), bufSize );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/qgpgme/dataprovider.h new/kdepimlibs-4.0.98/qgpgme/dataprovider.h
--- old/kdepimlibs-4.0.85/qgpgme/dataprovider.h 2008-01-15 02:47:24.000000000 +0100
+++ new/kdepimlibs-4.0.98/qgpgme/dataprovider.h 2008-07-08 11:56:58.000000000 +0200
@@ -83,6 +83,7 @@
private:
const boost::shared_ptr<QIODevice> mIO;
+ bool mErrorOccurred;
};
} // namespace QGpgME
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.0.85/syndication/tests/atom/heise-foto.xml new/kdepimlibs-4.0.98/syndication/tests/atom/heise-foto.xml
--- old/kdepimlibs-4.0.85/syndication/tests/atom/heise-foto.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/kdepimlibs-4.0.98/syndication/tests/atom/heise-foto.xml 2008-07-08 11:56:59.000000000 +0200
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- absolute links on www.heise.de without scheme nor hostname -->
+<feed xmlns="http://www.w3.org/2005/Atom">
+ <title>heise Foto - Produktdaten</title>
+ <subtitle>neueste Spiegelreflexkameras</subtitle>
+ <id>http://www.heise.de/foto/produktdaten</id>
+ <link type="text/html" href="http://www.heise.de/foto/produktdaten"/>
+ <link type="text/html" rel="self" href="http://www.heise.de/foto/produktdatenkameras/spiegelreflex"/>
+ <author>
+ <name>heise Foto</name>
+ <email>red@heise-foto.de</email>
+ </author>
+ <entry>
+ <id>28131</id>
+ <title>Canon PowerShot A590 IS</title>
+ <link type="text/html" href="/foto/produktdaten/kameras/spiegelreflex/canon/powershot-a590-is-28131"/>
+ <updated>2008-07-03T00:00:00</updated>
+ <summary>8,0 Megapixel , Preis: 121 Euro / verfügbar</summary>
+ </entry>
+ <updated>2008-07-03T00:00:00</updated>
+</feed>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org