Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Sun Sep 11 19:25:03 CEST 2011.
-------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2011-08-18 16:17:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2011-09-01 23:17:49.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Sep 1 23:17:47 CEST 2011 - [email protected] + +- update to 4.7.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepimlibs-4.7-branch.patch kdepimlibs-4.7.0.tar.bz2 New: ---- kdepimlibs-4.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.4s3G8i/_old 2011-09-11 19:24:58.000000000 +0200 +++ /var/tmp/diff_new_pack.4s3G8i/_new 2011-09-11 19:24:58.000000000 +0200 @@ -18,14 +18,13 @@ Name: kdepimlibs4 -Version: 4.7.0 -Release: 6 +Version: 4.7.1 +Release: 1 License: LGPLv2.1+ Summary: KDE PIM Libraries Url: http://www.kde.org Group: System/GUI/KDE Source0: kdepimlibs-%{version}.tar.bz2 -Patch0: kdepimlibs-4.7-branch.patch BuildRequires: boost-devel BuildRequires: fdupes BuildRequires: gpgme-devel @@ -49,7 +48,6 @@ %prep %setup -q -n kdepimlibs-%{version} -%patch0 -p1 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FINAL=1 ++++++ kdepimlibs-4.7.0.tar.bz2 -> kdepimlibs-4.7.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/CMakeLists.txt new/kdepimlibs-4.7.1/CMakeLists.txt --- old/kdepimlibs-4.7.0/CMakeLists.txt 2011-07-19 23:36:16.000000000 +0200 +++ new/kdepimlibs-4.7.1/CMakeLists.txt 2011-09-01 22:58:26.000000000 +0200 @@ -7,7 +7,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 7) -set(KDEPIMLIBS_VERSION_PATCH 00) +set(KDEPIMLIBS_VERSION_PATCH 1) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/changerecorder_p.h new/kdepimlibs-4.7.1/akonadi/changerecorder_p.h --- old/kdepimlibs-4.7.0/akonadi/changerecorder_p.h 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/changerecorder_p.h 2011-08-22 15:22:19.000000000 +0200 @@ -165,13 +165,13 @@ void addToStream( QDataStream &stream, const NotificationMessage &msg ) { stream << msg.sessionId(); - stream << msg.type(); - stream << msg.operation(); - stream << msg.uid(); + stream << int(msg.type()); + stream << int(msg.operation()); + stream << qulonglong(msg.uid()); stream << msg.remoteId(); stream << msg.resource(); - stream << msg.parentCollection(); - stream << msg.parentDestCollection(); + stream << qulonglong(msg.parentCollection()); + stream << qulonglong(msg.parentDestCollection()); stream << msg.mimeType(); stream << msg.itemParts(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/collectionstatisticsdelegate.cpp new/kdepimlibs-4.7.1/akonadi/collectionstatisticsdelegate.cpp --- old/kdepimlibs-4.7.0/akonadi/collectionstatisticsdelegate.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/collectionstatisticsdelegate.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -269,11 +269,12 @@ QString folderName = text; QFontMetrics fm( painter->fontMetrics() ); int unreadWidth = fm.width( unread ); - if ( fm.width( folderName ) + unreadWidth > textRect.width() ) { + int folderWidth( fm.width( folderName ) ); + if ( folderWidth + unreadWidth > textRect.width() ) { folderName = fm.elidedText( folderName, Qt::ElideRight, textRect.width() - unreadWidth ); + folderWidth = fm.width( folderName ); } - int folderWidth = fm.width( folderName ); QRect folderRect = textRect; QRect unreadRect = textRect; folderRect.setRight( textRect.left() + folderWidth ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/contact/contactviewer.cpp new/kdepimlibs-4.7.1/akonadi/contact/contactviewer.cpp --- old/kdepimlibs-4.7.0/akonadi/contact/contactviewer.cpp 2011-06-22 16:28:23.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/contact/contactviewer.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -93,8 +93,12 @@ KIcon( QLatin1String( "document-open-remote" ) ).pixmap( QSize( 16, 16 ) ) ); #ifdef HAVE_PRISON + { KABC::VCardConverter converter; - const QString data = QString::fromUtf8( converter.createVCard( mCurrentContact ) ); + KABC::Addressee addr(mCurrentContact); + addr.setPhoto(KABC::Picture()); + addr.setLogo(KABC::Picture()); + const QString data = QString::fromUtf8( converter.createVCard( addr ) ); mQRCode->setData( data ); mDataMatrix->setData( data ); mBrowser->document()->addResource( QTextDocument::ImageResource, @@ -103,6 +107,7 @@ mBrowser->document()->addResource( QTextDocument::ImageResource, QUrl( QLatin1String( "datamatrix" ) ), mDataMatrix->toImage( QSizeF(50,50) ) ); + } #endif // HAVE_PRISON // merge local and global custom field descriptions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/contact/editor/im/kaddressbookimprotocol.desktop new/kdepimlibs-4.7.1/akonadi/contact/editor/im/kaddressbookimprotocol.desktop --- old/kdepimlibs-4.7.0/akonadi/contact/editor/im/kaddressbookimprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/contact/editor/im/kaddressbookimprotocol.desktop 2011-09-01 22:47:09.000000000 +0200 @@ -30,10 +30,10 @@ Name[pt_BR]=Protocolo de Mensagens Instantâneas do KAddressbook Name[ro]=Protocol de mesagerie instantanee a cărții de adrese Name[ru]=Протокол обмена мгновенными сообщениями KAddressBook -Name[sr]=Брзогласнички протокол К‑адресра -Name[sr@ijekavian]=Брзогласнички протокол К‑адресра -Name[sr@ijekavianlatin]=Brzoglasnički protokol K‑adresra -Name[sr@latin]=Brzoglasnički protokol K‑adresra +Name[sr]=Брзогласнички протокол К‑адресара +Name[sr@ijekavian]=Брзогласнички протокол К‑адресара +Name[sr@ijekavianlatin]=Brzoglasnički protokol K‑adresara +Name[sr@latin]=Brzoglasnički protokol K‑adresara Name[sv]=Addressbokens direktmeddelandeprotokoll Name[th]=โพรโทคอลข้อความด่วนทันใจของสมุดที่อยู่-K Name[tr]=KAdresDefteri Anlık Mesajlaşma Prokolü diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop new/kdepimlibs-4.7.1/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop --- old/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2011-08-22 15:22:19.000000000 +0200 @@ -38,6 +38,7 @@ Comment[sv]=Novell GroupWise-meddelandeklient Comment[th]=ข้อความด่วนทันใจ GroupWise ของโนเวลล์ Comment[tr]=Novell GroupWise Messenger +Comment[ug]=Novell GroupWise مۇڭداشقۇسى Comment[uk]=Програма обміну повідомленнями Novell GroupWise Comment[wa]=Messaedjî Novell GroupWise Comment[x-test]=xxNovell GroupWise Messengerxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop new/kdepimlibs-4.7.1/akonadi/contact/editor/im/protocols/ircprotocol.desktop --- old/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2011-08-22 15:22:19.000000000 +0200 @@ -39,6 +39,7 @@ Comment[sr@latin]=Ćaskanje putem Interneta Comment[sv]=Internet Relay Chat Comment[tr]=Internet Relay Chat +Comment[ug]=ئىنتېرنېت ئۇلاپ تارقىتىش سۆھبىتى(IRC) Comment[uk]=Internet Relay Chat Comment[wa]=Internet Relay Chat Comment[x-test]=xxInternet Relay Chatxx @@ -81,6 +82,7 @@ Name[sv]=IRC Name[th]=IRC Name[tr]=IRC +Name[ug]=IRC Name[uk]=IRC Name[wa]=IRC Name[x-test]=xxIRCxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop new/kdepimlibs-4.7.1/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop --- old/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/contact/editor/im/protocols/meanwhileprotocol.desktop 2011-08-22 15:22:19.000000000 +0200 @@ -80,6 +80,7 @@ Name[sv]=Meanwhile Name[th]=Meanwhile Name[tr]=Meanwhile +Name[ug]=Meanwhile Name[uk]=Meanwhile Name[wa]=Meanwhile Name[x-test]=xxMeanwhilexx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/msnprotocol.desktop new/kdepimlibs-4.7.1/akonadi/contact/editor/im/protocols/msnprotocol.desktop --- old/kdepimlibs-4.7.0/akonadi/contact/editor/im/protocols/msnprotocol.desktop 2011-07-19 23:33:40.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/contact/editor/im/protocols/msnprotocol.desktop 2011-08-22 15:22:19.000000000 +0200 @@ -38,6 +38,7 @@ Comment[sr@latin]=MSN Messenger Comment[sv]=MSN Messenger Comment[tr]=MSN Messenger +Comment[ug]=MSN Messenger Comment[uk]=MSN Messenger Comment[wa]=MSN Messenger Comment[x-test]=xxMSN Messengerxx @@ -79,6 +80,7 @@ Name[sr@latin]=MSN Messenger Name[sv]=MSN Messenger Name[tr]=MSN Messenger +Name[ug]=MSN Messenger Name[uk]=MSN Messenger Name[wa]=MSN Messenger Name[x-test]=xxMSN Messengerxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/contact/kcm/akonadicontact_actions.desktop new/kdepimlibs-4.7.1/akonadi/contact/kcm/akonadicontact_actions.desktop --- old/kdepimlibs-4.7.0/akonadi/contact/kcm/akonadicontact_actions.desktop 2011-07-19 23:33:40.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/contact/kcm/akonadicontact_actions.desktop 2011-08-22 15:22:19.000000000 +0200 @@ -47,6 +47,7 @@ Name[sv]=Kontaktåtgärder Name[th]=การกระทำต่าง ๆ ของที่อยู่ติดต่อ Name[tr]=Kişi Eylemleri +Name[ug]=ئالاقەداش مەشغۇلاتى Name[uk]=Дії контакту Name[wa]=Accions des contaks Name[x-test]=xxContact Actionsxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/resourcescheduler.cpp new/kdepimlibs-4.7.1/akonadi/resourcescheduler.cpp --- old/kdepimlibs-4.7.0/akonadi/resourcescheduler.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/resourcescheduler.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -456,6 +456,7 @@ "SyncAll", "SyncCollectionTree", "SyncCollection", + "SyncCollectionAttributes", "FetchItem", "ChangeReplay", "DeleteResourceCollection", @@ -467,7 +468,7 @@ { d << task.serial << s_taskTypes[task.type]; if ( task.type != ResourceScheduler::Invalid ) { - if ( task.collection.id() != -1 ) + if ( task.collection.isValid() ) d << "collection" << task.collection.id(); if ( task.item.id() != -1 ) d << "item" << task.item.id(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/akonadi/resourcescheduler_p.h new/kdepimlibs-4.7.1/akonadi/resourcescheduler_p.h --- old/kdepimlibs-4.7.0/akonadi/resourcescheduler_p.h 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/akonadi/resourcescheduler_p.h 2011-08-22 15:22:19.000000000 +0200 @@ -45,6 +45,7 @@ Q_OBJECT public: + // If you change this enum, keep s_taskTypes in sync in resourcescheduler.cpp enum TaskType { Invalid, SyncAll, Files old/kdepimlibs-4.7.0/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.7.1/doc/kcontrol/kresources/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kabc/plugins/ldapkio/ldapkio.desktop new/kdepimlibs-4.7.1/kabc/plugins/ldapkio/ldapkio.desktop --- old/kdepimlibs-4.7.0/kabc/plugins/ldapkio/ldapkio.desktop 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kabc/plugins/ldapkio/ldapkio.desktop 2011-08-22 15:22:19.000000000 +0200 @@ -46,6 +46,7 @@ Name[sv]=LDAP Name[th]=ระบบ LDAP Name[tr]=LDAP +Name[ug]=LDAP Name[uk]=LDAP Name[wa]=LDAP Name[x-test]=xxLDAPxx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kcal/filestorage.cpp new/kdepimlibs-4.7.1/kcal/filestorage.cpp --- old/kdepimlibs-4.7.0/kcal/filestorage.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kcal/filestorage.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -109,22 +109,27 @@ // Always try to load with iCalendar. It will detect, if it is actually a // vCalendar file. bool success; + QString productId; // First try the supplied format. Otherwise fall through to iCalendar, then // to vCalendar success = saveFormat() && saveFormat()->load( calendar(), d->mFileName ); - if ( !success ) { + if ( success ) { + productId = saveFormat()->loadedProductId(); + } else { ICalFormat iCal; success = iCal.load( calendar(), d->mFileName ); - if ( !success ) { + if ( success ) { + productId = iCal.loadedProductId(); + } else { if ( iCal.exception() ) { if ( iCal.exception()->errorCode() == ErrorFormat::CalVersion1 ) { // Expected non vCalendar file, but detected vCalendar kDebug() << "Fallback to VCalFormat"; VCalFormat vCal; success = vCal.load( calendar(), d->mFileName ); - calendar()->setProductId( vCal.productId() ); + productId = vCal.loadedProductId(); } else { return false; } @@ -132,11 +137,10 @@ kDebug() << "Warning! There should be an exception set."; return false; } - } else { - calendar()->setProductId( iCal.loadedProductId() ); } } + calendar()->setProductId( productId ); calendar()->setModified( false ); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kcalcore/filestorage.cpp new/kdepimlibs-4.7.1/kcalcore/filestorage.cpp --- old/kdepimlibs-4.7.0/kcalcore/filestorage.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kcalcore/filestorage.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -105,22 +105,27 @@ // Always try to load with iCalendar. It will detect, if it is actually a // vCalendar file. bool success; + QString productId; // First try the supplied format. Otherwise fall through to iCalendar, then // to vCalendar success = saveFormat() && saveFormat()->load( calendar(), d->mFileName ); - if ( !success ) { + if ( success ) { + productId = saveFormat()->loadedProductId(); + } else { ICalFormat iCal; success = iCal.load( calendar(), d->mFileName ); - if ( !success ) { + if ( success ) { + productId = iCal.loadedProductId(); + } else { if ( iCal.exception() ) { if ( iCal.exception()->code() == Exception::CalVersion1 ) { // Expected non vCalendar file, but detected vCalendar kDebug() << "Fallback to VCalFormat"; VCalFormat vCal; success = vCal.load( calendar(), d->mFileName ); - calendar()->setProductId( vCal.productId() ); + productId = vCal.loadedProductId(); } else { return false; } @@ -128,11 +133,10 @@ kDebug() << "Warning! There should be an exception set."; return false; } - } else { - calendar()->setProductId( iCal.loadedProductId() ); } } + calendar()->setProductId( productId ); calendar()->setModified( false ); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kcalcore/icalformat_p.cpp new/kdepimlibs-4.7.1/kcalcore/icalformat_p.cpp --- old/kdepimlibs-4.7.0/kcalcore/icalformat_p.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kcalcore/icalformat_p.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -72,8 +72,9 @@ void removeAllICal( QVector< QSharedPointer<K> > &c, const QSharedPointer<K> &x ) { if ( c.count( x ) != 1 ) { - qDebug() << "The size of the vector is " << c.count(); + qCritical() << "The size of the vector is " << c.count(); Q_ASSERT_X( false, "removeAllICal", "Count is not 1." ); + return; } c.remove( c.indexOf( x ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kimap/fetchjob.cpp new/kdepimlibs-4.7.1/kimap/fetchjob.cpp --- old/kdepimlibs-4.7.0/kimap/fetchjob.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kimap/fetchjob.cpp 2011-09-01 22:47:09.000000000 +0200 @@ -489,7 +489,7 @@ continue; } if ( structure[pos] == '"' ) { - result = structure.mid( start+1, pos - start ); + result = structure.mid( start+1, pos - start - 1); pos++; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kimap/imapstreamparser.cpp new/kdepimlibs-4.7.1/kimap/imapstreamparser.cpp --- old/kdepimlibs-4.7.0/kimap/imapstreamparser.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kimap/imapstreamparser.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -242,6 +242,9 @@ } if ( m_data.at(i) == '[' ) { concatToLast = true; + if ( result.isEmpty() ) { + result.append( QByteArray() ); + } result.last()+='['; ++i; continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kimap/session.cpp new/kdepimlibs-4.7.1/kimap/session.cpp --- old/kdepimlibs-4.7.0/kimap/session.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kimap/session.cpp 2011-09-01 22:47:09.000000000 +0200 @@ -110,7 +110,7 @@ void KIMAP::Session::close() { - d->socketDisconnected(); + d->thread->closeSocket(); } void SessionPrivate::handleSslError(const KSslErrorUiData& errorData) @@ -360,14 +360,11 @@ if ( state != Session::Disconnected ) { setState(Session::Disconnected); emit q->connectionLost(); - } - - if (!isSocketConnected) { + } else { emit q->connectionFailed(); } isSocketConnected = false; - thread->closeSocket(); clearJobQueue(); } @@ -379,7 +376,7 @@ } if ( isSocketConnected ) { - socketDisconnected(); + thread->closeSocket(); } else { emit q->connectionFailed(); emit q->connectionLost(); // KDE5: Remove this. We shouldn't emit connectionLost() if we weren't connected in the first place @@ -465,7 +462,6 @@ if ( socketTimerInterval<0 ) { return; } - Q_ASSERT( socketTimer.isActive() ); socketTimer.stop(); @@ -483,7 +479,7 @@ void SessionPrivate::onSocketTimeout() { - socketDisconnected(); + thread->closeSocket(); } void Session::setTimeout( int timeout ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kimap/sessionthread.cpp new/kdepimlibs-4.7.1/kimap/sessionthread.cpp --- old/kdepimlibs-4.7.0/kimap/sessionthread.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kimap/sessionthread.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -104,6 +104,9 @@ literal+= m_stream->readLiteralPart(); } *payload << Message::Part(literal); + } else { + // Oops! Something really bad happened + throw ImapParserException( "Inconsistent state, probably due to some packet loss" ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kimap/tests/fetchjobtest.cpp new/kdepimlibs-4.7.1/kimap/tests/fetchjobtest.cpp --- old/kdepimlibs-4.7.0/kimap/tests/fetchjobtest.cpp 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kimap/tests/fetchjobtest.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -104,7 +104,29 @@ << "S: From: John Smith <[email protected]>\r\nTo: \"[email protected]\"\r\n\t<[email protected]>\r\nDate: Mon, 11 Oct 2010 03:34:48 +0100\r\nSubject: unsubscribe\r\nMessage-ID: <[email protected]>\r\n\r\n" << "X"; scope.mode = KIMAP::FetchJob::FetchScope::Headers; - QTest::newRow( "partial" ) << false << KIMAP::ImapSet( 11, 11 ) << 1 << scenario << scope; + QTest::newRow( "connection drop" ) << false << KIMAP::ImapSet( 11, 11 ) << 1 << scenario << scope; + + + scenario.clear(); + // Important bit here if "([127.0.0.1])" which used to crash the stream parser + scenario << FakeServer::preauth() + << "C: A000001 FETCH 11 (RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] FLAGS UID)" + << "S: * 11 FETCH (RFC822.SIZE 770 INTERNALDATE \"11-Oct-2010 03:33:50 +0100\" BODY[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] {246}" + << "S: ([127.0.0.1])\r\nDate: Mon, 11 Oct 2010 03:34:48 +0100\r\nSubject: unsubscribe\r\nMessage-ID: <[email protected]>\r\n\r\n" + << "X"; + scope.mode = KIMAP::FetchJob::FetchScope::Headers; + QTest::newRow( "buffer overwrite" ) << false << KIMAP::ImapSet( 11, 11 ) << 1 << scenario << scope; + + + scenario.clear(); + // We're assuming a buffer overwrite here which made us miss the opening parenthesis + // for the properties list + scenario << FakeServer::preauth() + << "C: A000001 FETCH 11 (RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (TO FROM MESSAGE-ID REFERENCES IN-REPLY-TO SUBJECT DATE)] FLAGS UID)" + << "S: * 11 FETCH {10}doh!\r\n\r\n\r\n)\r\n" + << "X"; + scope.mode = KIMAP::FetchJob::FetchScope::Headers; + QTest::newRow( "buffer overwrite 2" ) << false << KIMAP::ImapSet( 11, 11 ) << 1 << scenario << scope; } void testFetch() @@ -139,7 +161,9 @@ bool result = job->exec(); - QEXPECT_FAIL("partial" , "Expected failure on partial response", Continue); + QEXPECT_FAIL("connection drop", "Expected failure on connection drop", Continue); + QEXPECT_FAIL("buffer overwrite", "Expected failure on confused list", Continue); + QEXPECT_FAIL("buffer overwrite 2", "Expected beginning of message missing", Continue); QVERIFY( result ); if ( result ) { QVERIFY( m_signals.count()>0 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kimap/tests/kimaptest/CMakeLists.txt new/kdepimlibs-4.7.1/kimap/tests/kimaptest/CMakeLists.txt --- old/kdepimlibs-4.7.0/kimap/tests/kimaptest/CMakeLists.txt 2011-05-20 22:31:22.000000000 +0200 +++ new/kdepimlibs-4.7.1/kimap/tests/kimaptest/CMakeLists.txt 2011-09-01 22:47:09.000000000 +0200 @@ -7,11 +7,10 @@ set(kimaptest_LIB_SRCS fakeserver.cpp mockjob.cpp - ../../imapstreamparser.cpp ) kde4_add_library(kimaptest STATIC ${kimaptest_LIB_SRCS}) -target_link_libraries(kimaptest ${KDE4_KDECORE_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY}) +target_link_libraries(kimaptest ${KDE4_KDECORE_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} kimap) install(TARGETS kimaptest ${INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kioslave/mbox/readmbox.cpp new/kdepimlibs-4.7.1/kioslave/mbox/readmbox.cpp --- old/kdepimlibs-4.7.0/kioslave/mbox/readmbox.cpp 2011-07-19 23:33:40.000000000 +0200 +++ new/kdepimlibs-4.7.1/kioslave/mbox/readmbox.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -192,7 +192,7 @@ if( m_prev_time ) { utime( QFile::encodeName( m_info->filename() ), m_prev_time ); - delete m_prev_time; + delete m_prev_time; m_prev_time = 0; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kmime/kmime_content.cpp new/kdepimlibs-4.7.1/kmime/kmime_content.cpp --- old/kdepimlibs-4.7.0/kmime/kmime_content.cpp 2011-05-20 22:31:23.000000000 +0200 +++ new/kdepimlibs-4.7.1/kmime/kmime_content.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -558,8 +558,8 @@ void Content::removeContent( Content *c, bool del ) { Q_D( Content ); - Q_ASSERT( d->multipartContents.contains( c ) ); - + if( !d->multipartContents.contains( c ) ) + return; // This method makes no sense for encapsulated messages. Should be covered by the above // assert already, though. Q_ASSERT( !bodyIsMessage() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kpimidentities/identity.cpp new/kdepimlibs-4.7.1/kpimidentities/identity.cpp --- old/kdepimlibs-4.7.0/kpimidentities/identity.cpp 2011-05-20 22:31:23.000000000 +0200 +++ new/kdepimlibs-4.7.1/kpimidentities/identity.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -79,7 +79,7 @@ while ( i != mPropertiesMap.constEnd() ) { // Take into account that the dictionary for a null identity is not empty - if ( i.key() == s_dict && dictionary() == Sonnet::defaultLanguageName() ) { + if ( i.key() == s_dict ) { ++i; continue; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kpimutils/email.cpp new/kdepimlibs-4.7.1/kpimutils/email.cpp --- old/kdepimlibs-4.7.0/kpimutils/email.cpp 2011-05-20 22:31:23.000000000 +0200 +++ new/kdepimlibs-4.7.1/kpimutils/email.cpp 2011-08-22 15:22:19.000000000 +0200 @@ -35,6 +35,10 @@ #include <QtCore/QRegExp> #include <QtCore/QByteArray> +#include <kglobal.h> + +static const KCatalogLoader loader("libkpimutils"); + using namespace KPIMUtils; //----------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.7.0/kresources/kresources_manager.desktop new/kdepimlibs-4.7.1/kresources/kresources_manager.desktop --- old/kdepimlibs-4.7.0/kresources/kresources_manager.desktop 2011-05-20 22:31:23.000000000 +0200 +++ new/kdepimlibs-4.7.1/kresources/kresources_manager.desktop 2011-08-22 15:22:19.000000000 +0200 @@ -43,6 +43,7 @@ Name[sv]=Resurshantering Name[th]=ตัวจัดการทรัพยากร-K Name[tr]=KResources Yöneticisi +Name[ug]=KResources باشقۇرغۇچ Name[uk]=Менеджер KResource-ів Name[wa]=Manaedjeu KResources Name[x-test]=xxKResources Managerxx @@ -94,6 +95,7 @@ Comment[sv]=Resurshantering Comment[th]=ตัวจัดการทรัพยากร Comment[tr]=KResources Yöneticisi +Comment[ug]=KResources باشقۇرغۇچ Comment[uk]=Менеджер KResource-ів Comment[wa]=Manaedjeu KResources Comment[x-test]=xxKResources Managerxx ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
