Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2015-05-15 09:03:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepimlibs4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2015-05-02 17:27:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2015-05-15 09:03:17.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 11 10:41:57 UTC 2015 - [email protected] + +- Update to 4.14.8 + * KDE Applications 15.04.1 + * https://www.kde.org/announcements/announce-applications-15.04.1.php + + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.14.7.tar.xz New: ---- kdepimlibs-4.14.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.Rwk7ay/_old 2015-05-15 09:03:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Rwk7ay/_new 2015-05-15 09:03:18.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepimlibs4 -Version: 4.14.7 +Version: 4.14.8 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ ++++++ kdepimlibs-4.14.7.tar.xz -> kdepimlibs-4.14.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/CMakeLists.txt new/kdepimlibs-4.14.8/CMakeLists.txt --- old/kdepimlibs-4.14.7/CMakeLists.txt 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/CMakeLists.txt 2015-05-05 07:49:31.000000000 +0200 @@ -7,7 +7,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 14) -set(KDEPIMLIBS_VERSION_PATCH 7) +set(KDEPIMLIBS_VERSION_PATCH 8) 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.14.7/akonadi/contact/contactgroupmodel.cpp new/kdepimlibs-4.14.8/akonadi/contact/contactgroupmodel.cpp --- old/kdepimlibs-4.14.7/akonadi/contact/contactgroupmodel.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/contact/contactgroupmodel.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -37,10 +37,10 @@ { } - bool isReference; KABC::ContactGroup::ContactReference reference; KABC::ContactGroup::Data data; KABC::Addressee referencedContact; + bool isReference; bool loadingError; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/contact/editor/dateeditwidget.h new/kdepimlibs-4.14.8/akonadi/contact/editor/dateeditwidget.h --- old/kdepimlibs-4.14.7/akonadi/contact/editor/dateeditwidget.h 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/contact/editor/dateeditwidget.h 2015-05-05 07:49:31.000000000 +0200 @@ -73,11 +73,11 @@ void updateView(); private: - QDate mDate; DateView *mView; QToolButton *mSelectButton; QToolButton *mClearButton; KDatePickerPopup *mMenu; + QDate mDate; bool mReadOnly; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/contact/editor/displaynameeditwidget.h new/kdepimlibs-4.14.8/akonadi/contact/editor/displaynameeditwidget.h --- old/kdepimlibs-4.14.7/akonadi/contact/editor/displaynameeditwidget.h 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/contact/editor/displaynameeditwidget.h 2015-05-05 07:49:31.000000000 +0200 @@ -77,9 +77,9 @@ void updateView(); KComboBox *mView; - DisplayType mDisplayType; KABC::Addressee mContact; QWidget *mViewport; + DisplayType mDisplayType; int mAdditionalPopupWidth; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/contact/editor/imagewidget.cpp new/kdepimlibs-4.14.8/akonadi/contact/editor/imagewidget.cpp --- old/kdepimlibs-4.14.7/akonadi/contact/editor/imagewidget.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/contact/editor/imagewidget.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -107,10 +107,10 @@ ImageWidget::ImageWidget(Type type, QWidget *parent) : QPushButton(parent) + , mImageLoader(0) , mType(type) , mHasImage(false) , mReadOnly(false) - , mImageLoader(0) { setAcceptDrops(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/contact/editor/imagewidget.h new/kdepimlibs-4.14.8/akonadi/contact/editor/imagewidget.h --- old/kdepimlibs-4.14.7/akonadi/contact/editor/imagewidget.h 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/contact/editor/imagewidget.h 2015-05-05 07:49:31.000000000 +0200 @@ -74,13 +74,12 @@ private: ImageLoader *imageLoader(); - Type mType; KABC::Picture mPicture; - bool mHasImage; - bool mReadOnly; - QPoint mDragStartPos; ImageLoader *mImageLoader; + Type mType; + bool mHasImage; + bool mReadOnly; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/entitytreemodel.cpp new/kdepimlibs-4.14.8/akonadi/entitytreemodel.cpp --- old/kdepimlibs-4.14.7/akonadi/entitytreemodel.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/entitytreemodel.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -319,6 +319,9 @@ case IsPopulatedRole: { return d->m_populatedCols.contains(collection.id()); } + case OriginalCollectionNameRole: { + return entityData(collection, index.column(), Qt::DisplayRole); + } case Qt::BackgroundRole: { if (collection.hasAttribute<EntityDisplayAttribute>()) { EntityDisplayAttribute *eda = collection.attribute<EntityDisplayAttribute>(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/entitytreemodel.h new/kdepimlibs-4.14.8/akonadi/entitytreemodel.h --- old/kdepimlibs-4.14.7/akonadi/entitytreemodel.h 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/entitytreemodel.h 2015-05-05 07:49:31.000000000 +0200 @@ -351,6 +351,7 @@ FetchStateRole, ///< Returns the FetchState of a particular item. @since 4.5 CollectionSyncProgressRole, ///< Returns the progress of synchronization in percent for a particular collection. @since 4.6. Deprecated since 4.14.3. IsPopulatedRole, ///< Returns whether a Collection has been populated, i.e. whether its items have been fetched. @since 4.10 + OriginalCollectionNameRole, ///< Returns original name for collection @since 4.14 UserRole = Qt::UserRole + 500, ///< First role for user extensions. TerminalUserRole = 2000, ///< Last role for user extensions. Don't use a role beyond this or headerData will break. EndRole = 65535 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/entitytreemodel_p.cpp new/kdepimlibs-4.14.8/akonadi/entitytreemodel_p.cpp --- old/kdepimlibs-4.14.7/akonadi/entitytreemodel_p.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/entitytreemodel_p.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -1369,7 +1369,8 @@ // If collections are not in the model, there will be no valid index for them. if ((m_collectionFetchStrategy != EntityTreeModel::InvisibleCollectionFetch) && - (m_collectionFetchStrategy != EntityTreeModel::FetchNoCollections)) { + (m_collectionFetchStrategy != EntityTreeModel::FetchNoCollections) && + !(!m_showRootCollection && collectionId == m_rootCollection.id())) { const QModelIndex index = indexForCollection(Collection(collectionId)); Q_ASSERT(index.isValid()); //To notify about the changed fetch and population state diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/favoritecollectionsmodel.cpp new/kdepimlibs-4.14.8/akonadi/favoritecollectionsmodel.cpp --- old/kdepimlibs-4.14.7/akonadi/favoritecollectionsmodel.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/favoritecollectionsmodel.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -60,10 +60,9 @@ QModelIndex idx = collectionIdx.parent(); while (idx != QModelIndex()) { - accountName = idx.data().toString(); + accountName = idx.data(EntityTreeModel::OriginalCollectionNameRole).toString(); idx = idx.parent(); } - if (accountName.isEmpty()) { return nameOfCollection; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/notes/noteutils.cpp new/kdepimlibs-4.14.8/akonadi/notes/noteutils.cpp --- old/kdepimlibs-4.14.7/akonadi/notes/noteutils.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/notes/noteutils.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -151,8 +151,8 @@ } NoteMessageWrapperPrivate( const KMime::Message::Ptr &msg ) - : textFormat( Qt::PlainText ), - classification( Public ) + : classification( Public ), + textFormat( Qt::PlainText ) { readMimeMessage(msg); } @@ -168,13 +168,13 @@ QString uid; QString title; QString text; - Qt::TextFormat textFormat; QString from; KDateTime creationDate; KDateTime lastModifiedDate; QMap< QString, QString > custom; QList<Attachment> attachments; Classification classification; + Qt::TextFormat textFormat; }; void NoteMessageWrapper::NoteMessageWrapperPrivate::readMimeMessage(const KMime::Message::Ptr& msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/resourcebase.cpp new/kdepimlibs-4.14.8/akonadi/resourcebase.cpp --- old/kdepimlibs-4.14.7/akonadi/resourcebase.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/resourcebase.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -1192,6 +1192,9 @@ void ResourceBase::setDisableAutomaticItemDeliveryDone(bool disable) { Q_D(ResourceBase); + if (d->mItemSyncer) { + d->mItemSyncer->setDisableAutomaticDeliveryDone(disable); + } d->mDisableAutomaticItemDeliveryDone = disable; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/akonadi/tests/testresource/CMakeLists.txt new/kdepimlibs-4.14.8/akonadi/tests/testresource/CMakeLists.txt --- old/kdepimlibs-4.14.7/akonadi/tests/testresource/CMakeLists.txt 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/akonadi/tests/testresource/CMakeLists.txt 2015-05-05 07:49:31.000000000 +0200 @@ -56,6 +56,6 @@ ) install( TARGETS akonadi_knut_resource DESTINATION ${PLUGIN_INSTALL_DIR}/ ) -install( FILES knutresource.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/akonadi/agents" ) +install( FILES knutresource.desktop DESTINATION "${SHARE_INSTALL_PREFIX}/akonadi/agents" ) install( FILES knut-template.xml DESTINATION ${DATA_INSTALL_DIR}/akonadi_knut_resource/ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kabc/tests/addresseetest.cpp new/kdepimlibs-4.14.8/kabc/tests/addresseetest.cpp --- old/kdepimlibs-4.14.7/kabc/tests/addresseetest.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kabc/tests/addresseetest.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -55,6 +55,8 @@ QStringList customs; customs << QLatin1String( "X-Danger: high" ); + KABC::Lang lang(QLatin1String("lang")); + addressee.setLangs(KABC::Lang::List() << lang); KABC::Gender gender(QLatin1String("H")); addressee.setGender(gender); addressee.setUid( QLatin1String( "My uid" ) ); @@ -86,11 +88,13 @@ addressee.setKeys( keys ); addressee.setCategories( categories ); addressee.setCustoms( customs ); + addressee.setKind(QLatin1String("foo")); #ifndef KDEPIM_NO_KRESOURCES addressee.setResource( 0 ); #endif addressee.setChanged( false ); + QVERIFY( addressee.langs() == (KABC::Lang::List() << lang)); QVERIFY( addressee.gender() == gender ); QVERIFY( addressee.uid() == QLatin1String( "My uid" ) ); QVERIFY( addressee.name() == QLatin1String( "John Sinclair" ) ); @@ -125,6 +129,7 @@ QVERIFY( addressee.resource() == 0 ); #endif QVERIFY( addressee.changed() == false ); + QCOMPARE( addressee.kind(), QLatin1String("foo")); } void AddresseeTest::equalsTest() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kabc/vcardtool.cpp new/kdepimlibs-4.14.8/kabc/vcardtool.cpp --- old/kdepimlibs-4.14.7/kabc/vcardtool.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kabc/vcardtool.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -1210,7 +1210,10 @@ if ( key.isBinary() ) { if ( !key.binaryData().isEmpty() ) { line.setValue( key.binaryData() ); - line.addParameter( QLatin1String( "encoding" ), QLatin1String( "b" ) ); + if (version == VCard::v2_1) + line.addParameter( QLatin1String( "ENCODING" ), QLatin1String( "BASE64" ) ); + else + line.addParameter( QLatin1String( "encoding" ), QLatin1String( "b" ) ); } } else if ( !key.textData().isEmpty() ) { line.setValue( key.textData() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kmbox/mbox_p.cpp new/kdepimlibs-4.14.8/kmbox/mbox_p.cpp --- old/kdepimlibs-4.14.7/kmbox/mbox_p.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kmbox/mbox_p.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -26,8 +26,8 @@ using namespace KMBox; MBoxPrivate::MBoxPrivate( MBox *mbox ) - : mInitialMboxFileSize( 0 ), mMBox( mbox ), mReadOnly( false ), - mSeparatorMatcher( QLatin1String( "^From .*[0-9][0-9]:[0-9][0-9]" ) ) + : mInitialMboxFileSize( 0 ), mMBox( mbox ), + mSeparatorMatcher( QLatin1String( "^From .*[0-9][0-9]:[0-9][0-9]" ) ), mReadOnly( false ) { connect( &mUnlockTimer, SIGNAL(timeout()), SLOT(unlockMBox()) ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kmbox/mbox_p.h new/kdepimlibs-4.14.8/kmbox/mbox_p.h --- old/kdepimlibs-4.14.7/kmbox/mbox_p.h 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kmbox/mbox_p.h 2015-05-05 07:49:31.000000000 +0200 @@ -53,15 +53,16 @@ public: QByteArray mAppendedEntries; MBoxEntry::List mEntries; - bool mFileLocked; quint64 mInitialMboxFileSize; QString mLockFileName; - MBox::LockType mLockType; MBox *mMBox; QFile mMboxFile; - bool mReadOnly; QTimer mUnlockTimer; QRegExp mSeparatorMatcher; + MBox::LockType mLockType; + bool mFileLocked; + bool mReadOnly; + public: /// Static helper methods static QByteArray escapeFrom( const QByteArray &msg ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kmime/kmime_header_parsing.cpp new/kdepimlibs-4.14.8/kmime/kmime_header_parsing.cpp --- old/kdepimlibs-4.14.7/kmime/kmime_header_parsing.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kmime/kmime_header_parsing.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -2024,8 +2024,19 @@ const char sign = *scursor++; // numerical timezone: int maybeTimeZone; - if ( parseDigits( scursor, send, maybeTimeZone ) != 4 ) { - return false; + const int tzDigits = parseDigits( scursor, send, maybeTimeZone ); + if ( tzDigits != 4 ) { + // Allow timezones in 02:00 format + if (tzDigits == 2 && scursor != send && *scursor == ':') { + scursor++; + int maybeTimeZone2; + if (parseDigits( scursor, send, maybeTimeZone2 ) != 2) { + return false; + } + maybeTimeZone = maybeTimeZone * 100 + maybeTimeZone2; + } else { + return false; + } } secsEastOfGMT = 60 * ( maybeTimeZone / 100 * 60 + maybeTimeZone % 100 ); if ( sign == '-' ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kmime/tests/auto/CMakeLists.txt new/kdepimlibs-4.14.8/kmime/tests/auto/CMakeLists.txt --- old/kdepimlibs-4.14.7/kmime/tests/auto/CMakeLists.txt 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kmime/tests/auto/CMakeLists.txt 2015-05-05 07:49:31.000000000 +0200 @@ -23,5 +23,6 @@ add_kmime_test(rfc2231test.cpp) add_kmime_test(base64benchmark.cpp) add_kmime_test(sizetest.cpp) +add_kmime_test(parsedatetimetest.cpp) target_link_libraries(messagetest akonadi-kde akonadi-kmime) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kmime/tests/auto/parsedatetimetest.cpp new/kdepimlibs-4.14.8/kmime/tests/auto/parsedatetimetest.cpp --- old/kdepimlibs-4.14.7/kmime/tests/auto/parsedatetimetest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.14.8/kmime/tests/auto/parsedatetimetest.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -0,0 +1,60 @@ +/* + Copyright (c) 2015 Albert Astals Cid <[email protected]> + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#include "parsedatetimetest.h" + +#include <qtest_kde.h> + +#include <kmime_header_parsing.h> + +using namespace KMime; + +QTEST_KDEMAIN( ParseDateTimeTest, NoGUI ) + +void ParseDateTimeTest::testParseDateTime_data() +{ + QTest::addColumn<QString>( "input" ); + QTest::addColumn<KDateTime>( "expResult" ); + + QTest::newRow("1") << "Sat, 25 Apr 2015 12:10:48 +0000" << KDateTime(QDateTime::fromString("2015-04-25T12:10:48+00:00", Qt::ISODate)); + QTest::newRow("2") << "Fri, 24 Apr 2015 10:22:42 +0200" << KDateTime(QDateTime::fromString("2015-04-24T10:22:42+02:00", Qt::ISODate)); + QTest::newRow("3") << "Thu, 23 Apr 2015 21:43:32 -0300" << KDateTime(QDateTime::fromString("2015-04-23T21:43:32-03:00", Qt::ISODate)); + QTest::newRow("4") << "Fri 24 Apr 2015 10:39:15 +0200" << KDateTime(QDateTime::fromString("2015-04-24T10:39:15+02:00", Qt::ISODate)); + QTest::newRow("5") << "Fri 24 Apr 2015 10:39:15 +02:00" << KDateTime(QDateTime::fromString("2015-04-24T10:39:15+02:00", Qt::ISODate)); + QTest::newRow("6") << "Fri 24 Apr 2015 10:39:15 +02:23" << KDateTime(QDateTime::fromString("2015-04-24T10:39:15+02:23", Qt::ISODate)); + QTest::newRow("7") << "Fri 24 Apr 2015 10:39:15 +02a" << KDateTime(); + QTest::newRow("8") << "Fri 24 Apr 2015 10:39:15 +02:" << KDateTime(); + QTest::newRow("9") << "Fri 24 Apr 2015 10:39:15 +02:af" << KDateTime(); + QTest::newRow("10") << "Fri 24 Apr 2015 10:39:15 +in:af" << KDateTime(); +} + +void ParseDateTimeTest::testParseDateTime() +{ + QFETCH( QString, input ); + QFETCH( KDateTime, expResult ); + + KDateTime result; + const char *scursor = input.toLatin1().constData(); + const char *send = input.toLatin1().constData() + input.length(); + + KMime::HeaderParsing::parseDateTime(scursor, send, result, false); + + QCOMPARE(result, expResult); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kmime/tests/auto/parsedatetimetest.h new/kdepimlibs-4.14.8/kmime/tests/auto/parsedatetimetest.h --- old/kdepimlibs-4.14.7/kmime/tests/auto/parsedatetimetest.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.14.8/kmime/tests/auto/parsedatetimetest.h 2015-05-05 07:49:31.000000000 +0200 @@ -0,0 +1,34 @@ +/* + Copyright (c) 2015 Albert Astals Cid <[email protected]> + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef PARSEDATETIMETEST_H +#define PARSEDATETIMETEST_H + +#include <QtCore/QObject> + +class ParseDateTimeTest : public QObject +{ + Q_OBJECT + private Q_SLOTS: + void testParseDateTime(); + void testParseDateTime_data(); +}; + + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kontactinterface/plugin.cpp new/kdepimlibs-4.14.8/kontactinterface/plugin.cpp --- old/kdepimlibs-4.14.7/kontactinterface/plugin.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kontactinterface/plugin.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -67,8 +67,8 @@ QString serviceName; QByteArray partLibraryName; QByteArray pluginName; - bool hasPart; KParts::ReadOnlyPart *part; + bool hasPart; bool disabled; }; //@endcond diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kpimidentities/signatureconfigurator.cpp new/kdepimlibs-4.14.8/kpimidentities/signatureconfigurator.cpp --- old/kdepimlibs-4.14.7/kpimidentities/signatureconfigurator.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kpimidentities/signatureconfigurator.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -143,6 +143,7 @@ page = new QWidget( widgetStack ); widgetStack->insertWidget( pageno, page ); page_vlay = new QVBoxLayout( page ); + page_vlay->setMargin(0); #ifndef QT_NO_TOOLBAR q->mEditToolBar = new KToolBar( q ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/kpimtextedit/textedit.cpp new/kdepimlibs-4.14.8/kpimtextedit/textedit.cpp --- old/kdepimlibs-4.14.7/kpimtextedit/textedit.cpp 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/kpimtextedit/textedit.cpp 2015-05-05 07:49:31.000000000 +0200 @@ -131,6 +131,15 @@ /// The parent class TextEdit *q; + /** + * The names of embedded images. + * Used to easily obtain the names of the images. + * New images are compared to the list and not added as resource if already present. + */ + QStringList mImageNames; + + QString configFile; + QFont saveFont; /// Whether or not adding or pasting images is supported bool imageSupportEnabled; @@ -139,12 +148,6 @@ bool insertHtmlSupportEnabled; bool insertTableSupportEnabled; - /** - * The names of embedded images. - * Used to easily obtain the names of the images. - * New images are compared to the list and not added as resource if already present. - */ - QStringList mImageNames; /** * Although KTextEdit keeps track of the spell checking state, we override @@ -159,8 +162,6 @@ */ bool spellCheckingEnabled; - QString configFile; - QFont saveFont; }; } // namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.14.7/mailtransport/transport_p.h new/kdepimlibs-4.14.8/mailtransport/transport_p.h --- old/kdepimlibs-4.14.7/mailtransport/transport_p.h 2015-04-07 22:56:29.000000000 +0200 +++ new/kdepimlibs-4.14.8/mailtransport/transport_p.h 2015-05-05 07:49:31.000000000 +0200 @@ -31,11 +31,11 @@ public: MailTransport::TransportType transportType; QString password; + QString oldName; bool passwordLoaded; bool passwordDirty; bool storePasswordInFile; bool needsWalletMigration; - QString oldName; bool passwordNeedsUpdateFromWallet; };
