Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at 2013-04-17 22:30:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepimlibs4 (Old) and /work/SRC/openSUSE:Factory/.kdepimlibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepimlibs4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepimlibs4/kdepimlibs4.changes 2013-03-14 11:31:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepimlibs4.new/kdepimlibs4.changes 2013-04-17 22:30:31.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 1 19:10:55 UTC 2013 - [email protected] + +- Update to 4.10.2 \n * Bugfixes + +------------------------------------------------------------------- Old: ---- kdepimlibs-4.10.1.tar.xz New: ---- kdepimlibs-4.10.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.LqFcSi/_old 2013-04-17 22:30:39.000000000 +0200 +++ /var/tmp/diff_new_pack.LqFcSi/_new 2013-04-17 22:30:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepimlibs4 -Version: 4.10.1 +Version: 4.10.2 Release: 0 Summary: KDE PIM Libraries License: LGPL-2.1+ ++++++ kdepimlibs-4.10.1.tar.xz -> kdepimlibs-4.10.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/.emacs-dirvars new/kdepimlibs-4.10.2/.emacs-dirvars --- old/kdepimlibs-4.10.1/.emacs-dirvars 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/.emacs-dirvars 2013-03-29 08:04:05.000000000 +0100 @@ -3,11 +3,12 @@ ;; This file is processed by the dirvars emacs package. Each variable ;; setting below is performed when this dirvars file is loaded. ;; -c-block-comment-prefix: "" indent-tabs-mode: nil tab-width: 8 -c-basic-offset: 2 +c-basic-offset: 4 evaluate: (c-set-offset 'innamespace '0) -evaluate: (c-set-offset 'access-label '0) -;evaluate: (c-set-offset 'topmost-intro '+) -evaluate: (c-set-offset 'inline-open '+) +kde-emacs-after-parent-string: "" +evaluate: (c-set-offset 'inline-open '0) +kdab-qt-version: 4 +kdab-jump-project-name: kde +magic-parens-mode: nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/CMakeLists.txt new/kdepimlibs-4.10.2/CMakeLists.txt --- old/kdepimlibs-4.10.1/CMakeLists.txt 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/CMakeLists.txt 2013-03-29 08:04:05.000000000 +0100 @@ -11,7 +11,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 10) -set(KDEPIMLIBS_VERSION_PATCH 1) +set(KDEPIMLIBS_VERSION_PATCH 2) 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.10.1/akonadi/collectionpropertiesdialog.cpp new/kdepimlibs-4.10.2/akonadi/collectionpropertiesdialog.cpp --- old/kdepimlibs-4.10.1/akonadi/collectionpropertiesdialog.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/collectionpropertiesdialog.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -90,7 +90,8 @@ CollectionPropertiesDialog::Private::Private( CollectionPropertiesDialog *qq, const Akonadi::Collection &collection, const QStringList &pageNames ) : q( qq ), mCollection( collection ), - mPageNames( pageNames ) + mPageNames( pageNames ), + mTabWidget( 0 ) { if ( s_defaultPage ) { registerBuiltinPages(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/collectionsync.cpp new/kdepimlibs-4.10.2/akonadi/collectionsync.cpp --- old/kdepimlibs-4.10.1/akonadi/collectionsync.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/collectionsync.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -26,6 +26,7 @@ #include "collectionmodifyjob.h" #include "collectionfetchscope.h" #include "collectionmovejob.h" +#include "entitydisplayattribute.h" #include <kdebug.h> #include <KLocale> @@ -338,6 +339,11 @@ Collection upd( remoteNode->collection ); Q_ASSERT( !upd.remoteId().isEmpty() ); upd.setId( localNode->collection.id() ); + if ( localNode->collection.attribute<EntityDisplayAttribute>() ) { + upd.removeAttribute<EntityDisplayAttribute>(); + upd.addAttribute( localNode->collection.attribute<EntityDisplayAttribute>()->clone() ); + } + { // ### HACK to work around the implicit move attempts of CollectionModifyJob // which we do explicitly below diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/contact/contactgroupeditordialog.cpp new/kdepimlibs-4.10.2/akonadi/contact/contactgroupeditordialog.cpp --- old/kdepimlibs-4.10.1/akonadi/contact/contactgroupeditordialog.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/contact/contactgroupeditordialog.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -40,7 +40,7 @@ { public: Private( ContactGroupEditorDialog *qq, ContactGroupEditorDialog::Mode mode ) - : q( qq ), mAddressBookBox( 0 ), mMode( mode ) + : q( qq ), mAddressBookBox( 0 ), mEditor( 0 ), mMode( mode ) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/contact/contactsearchjob.cpp new/kdepimlibs-4.10.2/akonadi/contact/contactsearchjob.cpp --- old/kdepimlibs-4.10.1/akonadi/contact/contactsearchjob.cpp 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/contact/contactsearchjob.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -210,7 +210,7 @@ " " " ?r <" + akonadiItemIdUri().toEncoded() + "> ?reqProp1 . " " { ?r ?p \"%1\"^^<http://www.w3.org/2001/XMLSchema#string>. " - " FILTER(?p in (nco:fullname, nco:nameGiven, nco:nameFamily)) . }" + " FILTER(?p in (nco:fullname, nco:nameGiven, nco:nameFamily, nco:nameAdditional)) . }" " UNION " " { ?r nco:hasEmailAddress ?email . " " ?email nco:emailAddress \"%1\"^^<http://www.w3.org/2001/XMLSchema#string> . } " @@ -369,7 +369,7 @@ " " " ?r <" + akonadiItemIdUri().toEncoded() + "> ?reqProp1 . " " { ?r ?p ?v . " - " FILTER(?p in (nco:fullname, nco:nameGiven, nco:nameFamily)). " + " FILTER(?p in (nco:fullname, nco:nameGiven, nco:nameFamily, nco:nameAdditional)). " " ?v bif:contains \"'%1'\" . }" " UNION " " { ?r nco:hasEmailAddress ?email . " @@ -534,7 +534,7 @@ " " " ?r<" + akonadiItemIdUri().toEncoded() + "> ?reqProp1 . " " { ?r ?p ?v ." - " FILTER(?p in (nco:fullname, nco:nameGiven, nco:nameFamily) ) ." + " FILTER(?p in (nco:fullname, nco:nameGiven, nco:nameFamily, nco:nameAdditional) ) ." "%1 } UNION" " { ?r nco:hasEmailAddress ?email . " " ?email nco:emailAddress ?v . " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/contact/editor/emaileditwidget.cpp new/kdepimlibs-4.10.2/akonadi/contact/editor/emaileditwidget.cpp --- old/kdepimlibs-4.10.1/akonadi/contact/editor/emaileditwidget.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/contact/editor/emaileditwidget.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -139,7 +139,7 @@ // ... and prepend the one from the line edit if ( !mEmailEdit->text().isEmpty() ) { - emails.prepend( mEmailEdit->text() ); + emails.prepend( mEmailEdit->text().toLower() ); } contact.setEmails( emails ); @@ -268,7 +268,7 @@ return; } - email = KPIMUtils::extractEmailAddress( email ); + email = KPIMUtils::extractEmailAddress( email.toLower() ); // check if item already available, ignore if so... for ( int i = 0; i < mEmailListBox->count(); ++i ) { @@ -296,7 +296,7 @@ return; } - email = KPIMUtils::extractEmailAddress( email ); + email = KPIMUtils::extractEmailAddress( email.toLower() ); // check if item already available, ignore if so... for ( int i = 0; i < mEmailListBox->count(); ++i ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/entitytreemodel_p.cpp new/kdepimlibs-4.10.2/akonadi/entitytreemodel_p.cpp --- old/kdepimlibs-4.10.1/akonadi/entitytreemodel_p.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/entitytreemodel_p.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -182,6 +182,7 @@ ItemFetchJob *itemJob = new Akonadi::ItemFetchJob( parent, m_session ); itemJob->setFetchScope( scope ); itemJob->fetchScope().setAncestorRetrieval( ItemFetchScope::All ); + itemJob->fetchScope().setIgnoreRetrievalErrors( true ); return itemJob; } @@ -189,6 +190,7 @@ { ItemFetchJob *itemJob = new Akonadi::ItemFetchJob( item, m_session ); itemJob->setFetchScope( scope ); + itemJob->fetchScope().setIgnoreRetrievalErrors( true ); return itemJob; } @@ -1070,7 +1072,11 @@ node->id = item.id(); node->parent = collection.id(); node->type = Node::Item; - m_childEntities[ collection.id() ].append( node ); + if ( m_collectionFetchStrategy != EntityTreeModel::InvisibleCollectionFetch ) { + m_childEntities[ collection.id() ].append( node ); + } else { + m_childEntities[ m_rootCollection.id() ].append( node ); + } q->endInsertRows(); } @@ -1854,6 +1860,7 @@ } ItemFetchJob *itemFetch = new ItemFetchJob( items, m_session ); itemFetch->setFetchScope( m_monitor->itemFetchScope() ); + itemFetch->fetchScope().setIgnoreRetrievalErrors( true ); q->connect( itemFetch, SIGNAL(finished(KJob*)), q, SLOT(monitoredItemsRetrieved(KJob*)) ); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/itemfetchjob.cpp new/kdepimlibs-4.10.2/akonadi/itemfetchjob.cpp --- old/kdepimlibs-4.10.1/akonadi/itemfetchjob.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/itemfetchjob.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -27,6 +27,7 @@ #include "job_p.h" #include "protocol_p.h" #include "protocolhelper_p.h" +#include "session_p.h" #include <kdebug.h> #include <KLocale> @@ -105,6 +106,13 @@ } } + //This is only required for 4.10 + if ( protocolVersion() < 30 ) { + if ( mFetchScope.ignoreRetrievalErrors() ) { + kDebug() << "IGNOREERRORS is not available with this akonadi protocol version"; + } + mFetchScope.setIgnoreRetrievalErrors( false ); + } command += ProtocolHelper::itemFetchScopeToByteArray( mFetchScope ); writeData( command ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/itemfetchscope.cpp new/kdepimlibs-4.10.2/akonadi/itemfetchscope.cpp --- old/kdepimlibs-4.10.1/akonadi/itemfetchscope.cpp 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/itemfetchscope.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -128,3 +128,13 @@ return d->mFetchMtime; } +void ItemFetchScope::setIgnoreRetrievalErrors( bool ignore ) +{ + d->mIgnoreRetrievalErrors = ignore; +} + +bool ItemFetchScope::ignoreRetrievalErrors() const +{ + return d->mIgnoreRetrievalErrors; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/itemfetchscope.h new/kdepimlibs-4.10.2/akonadi/itemfetchscope.h --- old/kdepimlibs-4.10.1/akonadi/itemfetchscope.h 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/itemfetchscope.h 2013-03-29 08:04:05.000000000 +0100 @@ -226,6 +226,27 @@ bool fetchModificationTime() const; /** + * Ignore retrieval errors while fetching items, and always deliver what is available. + * If items have missing parts and the part can't be retrieved from the resource (i.e. because the system is offline), + * the fetch job would normally just fail. By setting this flag, the errors are ignored, + * and all items which could be fetched completely are returned. + * Note that all items that are returned are completely fetched, and incomplete items are simply ignored. + * This flag is useful for displaying everything that is available, where it is not crucial to have all items. + * Never use this for things like data migration or alike. + * + * @since 4.11 + */ + void setIgnoreRetrievalErrors( bool enabled ); + + /** + * Returns whether retrieval errors should be ignored. + * + * @see setIgnoreRetrievalErrors() + * @since 4.11 + */ + bool ignoreRetrievalErrors() const; + + /** * Returns @c true if there is nothing to fetch. */ bool isEmpty() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/itemfetchscope_p.h new/kdepimlibs-4.10.2/akonadi/itemfetchscope_p.h --- old/kdepimlibs-4.10.1/akonadi/itemfetchscope_p.h 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/itemfetchscope_p.h 2013-03-29 08:04:05.000000000 +0100 @@ -37,7 +37,8 @@ mFullPayload( false ), mAllAttributes( false ), mCacheOnly( false ), - mFetchMtime( true ) + mFetchMtime( true ), + mIgnoreRetrievalErrors( false ) { } @@ -61,6 +62,7 @@ bool mAllAttributes; bool mCacheOnly; bool mFetchMtime; + bool mIgnoreRetrievalErrors; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/job.cpp new/kdepimlibs-4.10.2/akonadi/job.cpp --- old/kdepimlibs-4.10.1/akonadi/job.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/job.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -232,6 +232,11 @@ Q_UNUSED( oldRevision ); Q_UNUSED( newRevision ); } + +int JobPrivate::protocolVersion() const +{ + return mSession->d->protocolVersion; +} //@endcond diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/job_p.h new/kdepimlibs-4.10.2/akonadi/job_p.h --- old/kdepimlibs-4.10.1/akonadi/job_p.h 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/job_p.h 2013-03-29 08:04:05.000000000 +0100 @@ -85,6 +85,8 @@ */ virtual void doUpdateItemRevision( Akonadi::Item::Id, int oldRevision, int newRevision ); + int protocolVersion() const; + Job *q_ptr; Q_DECLARE_PUBLIC( Job ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/kmime/tests/CMakeLists.txt new/kdepimlibs-4.10.2/akonadi/kmime/tests/CMakeLists.txt --- old/kdepimlibs-4.10.1/akonadi/kmime/tests/CMakeLists.txt 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/kmime/tests/CMakeLists.txt 2013-03-29 08:04:05.000000000 +0100 @@ -49,7 +49,9 @@ find_program(_testrunner akonaditest) - add_test( akonadikmime-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml ${_executable} ) + if (KDEPIMLIBS_RUN_ISOLATED_TESTS) + add_test( akonadikmime-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml ${_executable} ) + endif() endmacro(add_akonadi_isolated_test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/kmime/tests/racetest.cpp new/kdepimlibs-4.10.2/akonadi/kmime/tests/racetest.cpp --- old/kdepimlibs-4.10.1/akonadi/kmime/tests/racetest.cpp 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/kmime/tests/racetest.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -34,6 +34,9 @@ #define MAXCOUNT 10 // NOTE: REQUESTER_EXE is defined by cmake. +Q_DECLARE_METATYPE(QProcess::ProcessError) +Q_DECLARE_METATYPE(QProcess::ExitStatus) + using namespace Akonadi; @@ -41,6 +44,8 @@ { QVERIFY( Control::start() ); QTest::qWait( 1000 ); // give the MDA time to start so that we can kill it in peace + qRegisterMetaType<QProcess::ProcessError>(); + qRegisterMetaType<QProcess::ExitStatus>(); } void RaceTest::testMultipleProcesses_data() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/protocolhelper.cpp new/kdepimlibs-4.10.2/akonadi/protocolhelper.cpp --- old/kdepimlibs-4.10.1/akonadi/protocolhelper.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/protocolhelper.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -269,6 +269,8 @@ command += " " AKONADI_PARAM_ALLATTRIBUTES; if ( fetchScope.cacheOnly() ) command += " " AKONADI_PARAM_CACHEONLY; + if ( fetchScope.ignoreRetrievalErrors() ) + command += " " "IGNOREERRORS"; if ( fetchScope.ancestorRetrieval() != ItemFetchScope::None ) { switch ( fetchScope.ancestorRetrieval() ) { case ItemFetchScope::Parent: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/socialutils/serializer/akonadi_serializer_socialfeeditem.desktop new/kdepimlibs-4.10.2/akonadi/socialutils/serializer/akonadi_serializer_socialfeeditem.desktop --- old/kdepimlibs-4.10.1/akonadi/socialutils/serializer/akonadi_serializer_socialfeeditem.desktop 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/socialutils/serializer/akonadi_serializer_socialfeeditem.desktop 2013-03-29 08:04:05.000000000 +0100 @@ -46,7 +46,7 @@ Comment[gl]=Un complemento serializador de Akonadi para SocialFeedItem. Comment[hu]=Egy Akonadi sorosító bővítmény a SocialFeedItemhez Comment[ia]=Un plugin pro serializar de Akonadi pro SocialFeedItem -Comment[it]=Un plugin di serializzazione per SocialFeedItem +Comment[it]=Un'estensione di serializzazione per SocialFeedItem Comment[kk]=Akonadi SocialFeedItem тізбектеуіш плагині Comment[mr]=सोशल-फीड-आयटेम करिता आकोनाडी सीरियलायझर प्लगइन Comment[nb]=Et Akonadi programtillegg for SocialFeedItem-serialisering diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/socialutils/tests/image-provider-tests.cpp new/kdepimlibs-4.10.2/akonadi/socialutils/tests/image-provider-tests.cpp --- old/kdepimlibs-4.10.1/akonadi/socialutils/tests/image-provider-tests.cpp 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/socialutils/tests/image-provider-tests.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -24,6 +24,8 @@ #include <QImage> +#define IMAGE_URL "http://twimg0-a.akamaihd.net/profile_images/1171007559/79ac2ace-f87d-4dce-ac6c-825b6b12729d.png"; + void ImageProviderTests::setup() { //use special cache @@ -34,7 +36,7 @@ Akonadi::ImageProvider i; QImage image = i.loadImage( QLatin1String( "mck182" ), - KUrl( "https://twimg0-a.akamaihd.net/profile_images/1171007559/79ac2ace-f87d-4dce-ac6c-825b6b12729d.png"; ), + KUrl( IMAGE_URL ), true, cache ); @@ -55,7 +57,7 @@ Akonadi::ImageProvider i; QImage image = i.loadImage( QLatin1String( "mck182" ), - KUrl( "https://twimg0-a.akamaihd.net/profile_images/1171007559/79ac2ace-f87d-4dce-ac6c-825b6b12729d.png"; ), + KUrl( IMAGE_URL ), true, cache); @@ -94,8 +96,8 @@ { setup(); - QCOMPARE( m_url, KUrl( "https://twimg0-a.akamaihd.net/profile_images/1171007559/79ac2ace-f87d-4dce-ac6c-825b6b12729d.png"; ) ); + QCOMPARE( m_url, KUrl( IMAGE_URL ) ); } -QTEST_MAIN( ImageProviderTests ); +QTEST_KDEMAIN( ImageProviderTests, GUI ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/socialutils/tests/image-provider-tests.h new/kdepimlibs-4.10.2/akonadi/socialutils/tests/image-provider-tests.h --- old/kdepimlibs-4.10.1/akonadi/socialutils/tests/image-provider-tests.h 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/socialutils/tests/image-provider-tests.h 2013-03-29 08:04:05.000000000 +0100 @@ -22,6 +22,7 @@ #include <QtTest/QTest> #include <QtCore/QObject> +#include <qtest_kde.h> #include <QImage> #include <KUrl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/specialcollections.cpp new/kdepimlibs-4.10.2/akonadi/specialcollections.cpp --- old/kdepimlibs-4.10.1/akonadi/specialcollections.cpp 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/specialcollections.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -195,22 +195,12 @@ bool SpecialCollections::hasCollection( const QByteArray &type, const AgentInstance &instance ) const { - - if ( !d->mFoldersForResource.contains( instance.identifier() ) ) { - // We do not know any folders in this resource. - return false; - } - - return d->mFoldersForResource[ instance.identifier() ].contains( type ); + return d->mFoldersForResource.value(instance.identifier()).contains(type); } Akonadi::Collection SpecialCollections::collection( const QByteArray &type, const AgentInstance &instance ) const { - if ( !d->mFoldersForResource.contains( instance.identifier() ) ) { - // We do not know any folders in this resource. - return Collection( -1 ); - } - return d->mFoldersForResource[ instance.identifier() ][ type ]; + return d->mFoldersForResource.value(instance.identifier()).value(type); } bool SpecialCollections::registerCollection( const QByteArray &type, const Collection &collection ) @@ -234,17 +224,11 @@ new CollectionModifyJob( attributeCollection ); } - if ( !d->mFoldersForResource.contains( resourceId ) ) { - // We do not know any folders in this resource yet. - d->mFoldersForResource.insert( resourceId, QHash<QByteArray, Collection>() ); - } - - if ( !d->mFoldersForResource[ resourceId ].contains( type ) ) { - d->mFoldersForResource[ resourceId ].insert( type, Collection() ); - } - - if ( d->mFoldersForResource[ resourceId ][ type ] != collection ) { - d->mMonitor->setCollectionMonitored( d->mFoldersForResource[ resourceId ][ type ], false ); + const Collection oldCollection = d->mFoldersForResource.value(resourceId).value(type); + if (oldCollection != collection) { + if (oldCollection.isValid()) { + d->mMonitor->setCollectionMonitored(oldCollection, false); + } d->mMonitor->setCollectionMonitored( collection, true ); d->mFoldersForResource[ resourceId ].insert( type, collection ); d->emitChanged( resourceId ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/specialcollectionsrequestjob.cpp new/kdepimlibs-4.10.2/akonadi/specialcollectionsrequestjob.cpp --- old/kdepimlibs-4.10.1/akonadi/specialcollectionsrequestjob.cpp 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/specialcollectionsrequestjob.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -300,12 +300,7 @@ void SpecialCollectionsRequestJob::requestCollection( const QByteArray &type, const AgentInstance &instance ) { - if ( !d->mFoldersForResource.contains( instance.identifier() ) ) { - // This resource was previously unknown. - d->mFoldersForResource[ instance.identifier() ] = QHash<QByteArray, bool>(); - } d->mFoldersForResource[ instance.identifier() ][ type ] = true; - d->mRequestedType = type; d->mRequestedResource = instance; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/standardactionmanager.cpp new/kdepimlibs-4.10.2/akonadi/standardactionmanager.cpp --- old/kdepimlibs-4.10.1/akonadi/standardactionmanager.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/standardactionmanager.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -434,7 +434,7 @@ if ( !favoritesModel ) return false; - return favoritesModel->collections().contains( collection ); + return favoritesModel->collectionIds().contains( collection.id() ); } void encodeToClipboard( QItemSelectionModel* selectionModel, bool cut = false ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/akonadi/tests/CMakeLists.txt new/kdepimlibs-4.10.2/akonadi/tests/CMakeLists.txt --- old/kdepimlibs-4.10.1/akonadi/tests/CMakeLists.txt 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/akonadi/tests/CMakeLists.txt 2013-03-29 08:04:05.000000000 +0100 @@ -7,6 +7,7 @@ set( TEST_RESULT_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/testresults ) file(MAKE_DIRECTORY ${TEST_RESULT_OUTPUT_PATH}) +option(KDEPIMLIBS_RUN_ISOLATED_TESTS "Run the isolated tests." FALSE) option(KDEPIMLIBS_TESTS_XML "Use XML files for the test results, instead of plain text." FALSE) option(KDEPIMLIBS_TESTS_SQLITE "Run all isolated tests with sqlite3 as backend in addition to the default backends" FALSE) @@ -80,25 +81,27 @@ set( SQLITE_EXTRA_OPTIONS -xml -o ${TEST_RESULT_OUTPUT_PATH}/sqlite-${_name}.xml ) endif() - find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin ) - if ( MYSQLD_EXECUTABLE ) - add_test( akonadi-mysql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-db.xml ${_executable} - ${MYSQL_EXTRA_OPTIONS_DB} ) - add_test( akonadi-mysql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-fs.xml ${_executable} - ${MYSQL_EXTRA_OPTIONS_FS} ) - endif() + if ( KDEPIMLIBS_RUN_ISOLATED_TESTS ) + find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/mysql/libexec /usr/mysql/bin ) + if ( MYSQLD_EXECUTABLE ) + add_test( akonadi-mysql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-db.xml ${_executable} + ${MYSQL_EXTRA_OPTIONS_DB} ) + add_test( akonadi-mysql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-mysql-fs.xml ${_executable} + ${MYSQL_EXTRA_OPTIONS_FS} ) + endif() - find_program( POSTGRES_EXECUTABLE postgres ) - if ( POSTGRES_EXECUTABLE ) - add_test( akonadi-postgresql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-db.xml ${_executable} - ${POSTGRESL_EXTRA_OPTIONS_DB} ) - add_test( akonadi-postgresql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-fs.xml ${_executable} - ${POSTGRESL_EXTRA_OPTIONS_FS} ) - endif() + find_program( POSTGRES_EXECUTABLE postgres ) + if ( POSTGRES_EXECUTABLE ) + add_test( akonadi-postgresql-db-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-db.xml ${_executable} + ${POSTGRESL_EXTRA_OPTIONS_DB} ) + add_test( akonadi-postgresql-fs-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-postgresql-fs.xml ${_executable} + ${POSTGRESL_EXTRA_OPTIONS_FS} ) + endif() - if ( KDEPIMLIBS_TESTS_SQLITE ) - add_test( akonadi-sqlite-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite-db.xml ${_executable} - ${SQLITE_EXTRA_OPTIONS} ) + if ( KDEPIMLIBS_TESTS_SQLITE ) + add_test( akonadi-sqlite-${_name} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config-sqlite-db.xml ${_executable} + ${SQLITE_EXTRA_OPTIONS} ) + endif() endif() endmacro(add_akonadi_isolated_test) Files old/kdepimlibs-4.10.1/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.10.2/doc/kcontrol/kresources/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kabc/plugins/dir/dir.desktop new/kdepimlibs-4.10.2/kabc/plugins/dir/dir.desktop --- old/kdepimlibs-4.10.1/kabc/plugins/dir/dir.desktop 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kabc/plugins/dir/dir.desktop 2013-03-29 08:04:05.000000000 +0100 @@ -68,7 +68,7 @@ Comment[he]=מספק גישה אל אנשי הקשר, כל אחד שמור בתור קובץ אחד בתיקייה. תומך בקבצי VCard תיקנים או תסדירים אחרים בהתאם לזמינות של תוספים. Comment[hu]=Névjegyek elérését biztosítja. Minden névjegy külön fájlban található, egy adott mappában. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők. Comment[ia]=Il provide accessos a contactos, cata un immagazinate in un singule file, in un date dossier. Il supporta file de standard VCard e altere formatos dependente ab le disponibilitate de plugins. -Comment[it]=Fornisce accesso a contatti, ciascuno dei quali memorizzato in un singolo file in una cartella data. Gestisce file in standard VCard e altri formati in base ai plugin disponibili. +Comment[it]=Fornisce accesso a contatti, ciascuno dei quali memorizzato in un singolo file in una cartella data. Gestisce file in standard VCard e altri formati in base alle estensioni disponibili. Comment[ja]=それぞれが単一のファイルに保存されている任意のフォルダ内の連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。 Comment[kk]=Көрсетілген қапшықта, әрбірі бөлек файлда сақталған контакттарға қатынау мүмкіндігін береді. Плагині бар-жоғына қарай, vCard және басқа да пішімдерді тани алады. Comment[km]=ផ្ដល់ការចូលដំណើរការទៅកាន់ទំនាក់ទំនង ដែលទំនាក់ទំនងនីមួយៗត្រូវបានផ្ទុកនៅក្នុងឯកសារតែមួយ នៅក្នុងថតដែលបានផ្ដល់ឲ្យ ។ គាំទ្រឯកសារ VCard និងទ្រង់ទ្រាយផ្សេងៗ ដោយអាស្រ័យលើកម្មវិធីជំនួយដែលមាន ។ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kabc/plugins/file/file.desktop new/kdepimlibs-4.10.2/kabc/plugins/file/file.desktop --- old/kdepimlibs-4.10.1/kabc/plugins/file/file.desktop 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kabc/plugins/file/file.desktop 2013-03-29 08:04:05.000000000 +0100 @@ -73,7 +73,7 @@ Comment[he]=מספק גישה אל אנשי קשר בתור קובץ בודד. תומך בקובץ VCard תיקנים או תסדירים אחרים בהתאם לזמינות של תוספים. Comment[hu]=Névjegyek elérését biztosítja. Minden névjegy egy közös helyi fájlban található. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők. Comment[ia]=Il provide accessos a contactos immagazinate in un singule file local. Il supporta files de standard VCard e altere formatos in dependentia de plugins disponibile. -Comment[it]=Fornisce accesso a contatti memorizzati in un singolo file locale. Gestisce file in standard VCard e altri formati in base ai plugin disponibili. +Comment[it]=Fornisce accesso a contatti memorizzati in un singolo file locale. Gestisce file in standard VCard e altri formati in base alle estensioni disponibili. Comment[ja]=単一のローカルファイルに保存されている連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。 Comment[kk]=Бір файлда сақталған контакттарға қатынау мүмкіндігін береді. Плагині бар-жоғына қарай, vCard және басқа да пішімдерді тани алады. Comment[km]=ផ្ដល់ការចូលដំណើរការទៅទំនាក់ទំនងនៅក្នុងឯកសារមូលដ្ឋានតែមួយ ។ គាំទ្រឯកសារ VCard ស្តង់ដារ និងទ្រង់ទ្រាយផ្សេងៗ ដោយអាស្រ័យលើកម្មវិធីជំនួយដែលមាន ។ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kabc/plugins/net/net.desktop new/kdepimlibs-4.10.2/kabc/plugins/net/net.desktop --- old/kdepimlibs-4.10.1/kabc/plugins/net/net.desktop 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kabc/plugins/net/net.desktop 2013-03-29 08:04:05.000000000 +0100 @@ -73,7 +73,7 @@ Comment[he]=מספק גישה את אנשי קשר בקבצים מרוחקים באמצעות מערכת KIO של KDE. תומך בקבצי VCard תיקנים או תסדירים אחרים בהתאם לזמינות של תוספים. Comment[hu]=Távoli fájlokban található névjegyek elérését biztosítja a KDE KIO keretrendszeren keresztül. Támogatja a standard vCard formátumot, és bővítmények segítségével más formátumok is kezelhetők. Comment[ia]=Il provide accesso a contactos in files remote usante le schema de rete de KDE KIO. Il suppporta files de standard VCard e altere formatos in dependentia de plugins disponibile. -Comment[it]=Fornisce accesso a contatti su file remoti usando KIO, l'infrastruttura di rete di KDE. Gestisce file in standard VCard e altri formati in base ai plugin disponibili. +Comment[it]=Fornisce accesso a contatti su file remoti usando KIO, l'infrastruttura di rete di KDE. Gestisce file in standard VCard e altri formati in base alle estensioni disponibili. Comment[ja]=KDE のネットワークフレームワーク KIO を使って、リモートファイルに保存されている連絡先へのアクセスを提供します。標準の VCard ファイルと、利用可能なプラグインに応じたフォーマットをサポートします。 Comment[kk]=KDE-нің KIO желі құрылымы арқылы қашықтағы файлдарда сақталған контакттарға қатынау мүмкіндігін береді. Плагині бар-жоғына қарай, vCard және басқа да пішімдерді тани алады. Comment[km]=ផ្ដល់ការចូលដំណើរការទៅកាន់ទំនាក់ទំនងក្នុងឯកសារពីចម្ងាយ ដោយប្រើ KIO គ្រោងការណ៍បណ្ដាញរបស់ KDE ។ គាំទ្រឯកសារ VCard ស្តង់ដារ និងទ្រង់ទ្រាយផ្សេងៗទៀត ដោយអាស្រ័យលើកម្មវិធីជំនួយដែលមាន ។ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kabc/vcardtool.cpp new/kdepimlibs-4.10.2/kabc/vcardtool.cpp --- old/kdepimlibs-4.10.1/kabc/vcardtool.cpp 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/kabc/vcardtool.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -503,7 +503,7 @@ // EMAIL else if ( identifier == QLatin1String( "email" ) ) { const QStringList types = ( *lineIt ).parameters( QLatin1String( "type" ) ); - addr.insertEmail( ( *lineIt ).value().toString(), + addr.insertEmail( ( *lineIt ).value().toString().toLower(), types.contains( QLatin1String( "PREF" ) ) ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kcal/localdir.desktop new/kdepimlibs-4.10.2/kcal/localdir.desktop --- old/kdepimlibs-4.10.1/kcal/localdir.desktop 2013-03-01 07:58:42.000000000 +0100 +++ new/kdepimlibs-4.10.2/kcal/localdir.desktop 2013-03-29 08:04:05.000000000 +0100 @@ -25,7 +25,7 @@ Name[km]=ប្រតិទិនក្នុងថតមូលដ្ឋាន Name[lt]=Kalendorius vietiniame aplanke Name[lv]=Kalendārs lokālā mapē -Name[mr]=स्थानीय संचयीकेतील दिनदर्शिका +Name[mr]=स्थानिक संचयीकेतील दिनदर्शिका Name[nb]=Kalender i lokal mappe Name[nds]=Kalenner in'n lokalen Orner Name[nl]=Agenda in lokale map diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kcal/tests/CMakeLists.txt new/kdepimlibs-4.10.2/kcal/tests/CMakeLists.txt --- old/kdepimlibs-4.10.1/kcal/tests/CMakeLists.txt 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kcal/tests/CMakeLists.txt 2013-03-29 08:04:05.000000000 +0100 @@ -5,7 +5,6 @@ ${LIBICAL_INCLUDE_DIRS} ) -add_definitions( -DICALTESTDATADIR="\\"${CMAKE_SOURCE_DIR}/kcal/tests/data/\\"" ) MACRO(KCAL_UNIT_TESTS) FOREACH(_testname ${ARGN}) @@ -46,6 +45,8 @@ testtodo testtimesininterval ) + +set_target_properties(testcalendarlocal PROPERTIES COMPILE_FLAGS -DICALTESTDATADIR="\\"${CMAKE_SOURCE_DIR}/kcal/tests/data/\\"" ) # this test cannot work with msvc because libical should not be altered # and therefore we can't add KCAL_EXPORT_DEPRECATED there # it should work fine with mingw because of the auto-import feature diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kcal/tests/testcalendarlocal.cpp new/kdepimlibs-4.10.2/kcal/tests/testcalendarlocal.cpp --- old/kdepimlibs-4.10.1/kcal/tests/testcalendarlocal.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kcal/tests/testcalendarlocal.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -154,9 +154,9 @@ // the incidences had special relations. // This test tests that scenario, and will crash if it fails. CalendarLocal cal( KDateTime::UTC ); - cal.load( ICALTESTDATADIR "test_relations.ics" ); + QVERIFY( cal.load( ICALTESTDATADIR "test_relations.ics" ) ); Todo::List oldTodos = cal.todos(); - cal.load( ICALTESTDATADIR "test_relations.ics" ); + QVERIFY( cal.load( ICALTESTDATADIR "test_relations.ics" ) ); Todo::List newTodos = cal.todos(); // We can saftely access the old deleted todos here, since they are not really deleted diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kcalcore/tests/CMakeLists.txt new/kdepimlibs-4.10.2/kcalcore/tests/CMakeLists.txt --- old/kdepimlibs-4.10.1/kcalcore/tests/CMakeLists.txt 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kcalcore/tests/CMakeLists.txt 2013-03-29 08:04:05.000000000 +0100 @@ -4,7 +4,6 @@ ${LIBICAL_INCLUDE_DIRS} ) -add_definitions( -DICALTESTDATADIR="\\"${CMAKE_SOURCE_DIR}/kcalcore/tests/data/\\"" ) MACRO(KCALCORE_UNIT_TESTS) FOREACH(_testname ${ARGN}) @@ -44,6 +43,9 @@ testtimesininterval testcreateddatecompat ) + +set_target_properties(testmemorycalendar PROPERTIES COMPILE_FLAGS -DICALTESTDATADIR="\\"${CMAKE_SOURCE_DIR}/kcalcore/tests/data/\\"" ) + # this test cannot work with msvc because libical should not be altered # and therefore we can't add KCALCORE_EXPORT there # it should work fine with mingw because of the auto-import feature diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kcalcore/tests/testmemorycalendar.cpp new/kdepimlibs-4.10.2/kcalcore/tests/testmemorycalendar.cpp --- old/kdepimlibs-4.10.1/kcalcore/tests/testmemorycalendar.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kcalcore/tests/testmemorycalendar.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -137,12 +137,12 @@ // This test tests that scenario, and will crash if it fails. MemoryCalendar::Ptr cal( new MemoryCalendar( KDateTime::UTC ) ); FileStorage store1( cal, ICALTESTDATADIR "test_relations.ics" ); - store1.load(); + QVERIFY(store1.load()); const Todo::List oldTodos = cal->todos(); kDebug() << "Loaded " << oldTodos.count() << " todos into oldTodos."; FileStorage store2( cal, ICALTESTDATADIR "test_relations.ics" ); - store2.load(); + QVERIFY(store2.load()); const Todo::List newTodos = cal->todos(); kDebug() << "Loaded " << newTodos.count() << " into newTodos."; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kholidays/holidays/plan2/holiday_no_nb new/kdepimlibs-4.10.2/kholidays/holidays/plan2/holiday_no_nb --- old/kdepimlibs-4.10.1/kholidays/holidays/plan2/holiday_no_nb 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kholidays/holidays/plan2/holiday_no_nb 2013-03-29 08:04:05.000000000 +0100 @@ -62,7 +62,7 @@ "H.M. Dronning Sonjas fødselsdag" on july 4 "H.K.H. Kronprins Haakon Magnus’ fødselsdag" on july 20 "Olsokdagen" on july 29 -"H.K.H. Kronprinsesse Mette-Marits fødselsdag " on august 19 +"H.K.H. Kronprinsesse Mette-Marits fødselsdag" on august 19 :: Nyttår "Nyttårsaften" on 31.12 :: Andre diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kholidays/holidays/plan2/holiday_no_nn new/kdepimlibs-4.10.2/kholidays/holidays/plan2/holiday_no_nn --- old/kdepimlibs-4.10.1/kholidays/holidays/plan2/holiday_no_nn 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepimlibs-4.10.2/kholidays/holidays/plan2/holiday_no_nn 2013-03-29 08:04:05.000000000 +0100 @@ -0,0 +1,90 @@ +:: +:: Country: Norway +:: +:: Language: Norwegian Nynorsk +:: +:: Author: <[email protected]> +:: Karl Ove Hufthammer <[email protected]> +:: Updated: +:: +:: Source: +:: + +:: Metadata +country "NO" +language "nn" +:name "optional - defaults to country name" +:description "(please add description in source language) National holiday file for Norway" + +:: Public Holidays +"Nyttårsdag" weekend on january 1 +"Palmesøndag" weekend on easter minus 7 +"Skjærtorsdag" weekend on easter minus 3 +"Langfredag" weekend on easter minus 2 +"Første påskedag" weekend on easter +"Andre påskedag" weekend on easter plus 1 +"Arbeidaranes internasjonale kampdag" weekend on may 1 +"Grunnlovsdagen" weekend on may 17 +"Kristi himmelfartsdag" weekend on easter plus 39 days +"Første pinsedag" weekend on easter plus 49 days +"Andre pinsedag" weekend on easter plus 50 days +"Første juledag" weekend on december 25 +"Andre juledag" weekend on december 26 + +:: Religious +:: Påske og pinse +"Fastelavnssøndag" on easter minus 49 +"Feitetysdag" on easter minus 47 +"Askeonsdag" on easter minus 46 +"Påskeaftan" on easter minus 1 +"Pinseaftan" on easter plus 48 days +"Bots- og bededag" on last sunday in october +:: Jul +"Første søndag i advent" on sunday before 24.12 minus 21 days +"Andre søndag i advent" on sunday before 24.12 minus 14 days +"Tredje søndag i advent" on sunday before 24.12 minus 7 days +"Fjerde søndag i advent" on sunday before 24.12 +"Luciadagen" on 13.12 +"Litlejulaftan" on 23.12 +"Julaften" on 24.12 + +:: Financial + +:: Cultural +:: Mors- og farsdag +"Morsdag" on second sunday in february +"Farsdag" on second sunday in november +:: Offisielle flaggdager som ikkje er høgtidsdagar +"Prinsesse Ingrid Alexandras fødselsdag" on january 21 +"Samefolkets dag" on february 6 +"H.M. Kong Harald Vs fødselsdag" on february 21 +"Frigjeringsdagen 1945" on may 8 +"H.M. Dronning Sonjas fødselsdag" on july 4 +"Kronprins Haakon Magnus’ fødselsdag" on july 20 +"Olsokdagen" on july 29 +"Kronprinsesse Mette-Marits fødselsdag" on august 19 +:: Nyttår +"Nyttårsaftan" on 31.12 +:: Andre +"Valentinsdagen" on february 14 +:: Re-enable when new parser which has noop ability +::"Skotårsdagen" on ((leapyear year) ? [2/29] : noop) +"Den internasjonale kvinnedagen" on march 8 +"Aprilsnarr" on april 1 +"Unionsoppløysinga 1905" on june 7 +"Jonsokaftan" on june 23 +"Jonsokdagen" on june 24 +"Mikkelsmesse" on september 29 +"SN-dagen" on october 24 +"Allehelgensaftan" on october 31 +"Allehelgensdag" on first sunday in november + +:: School + +:: Daylight Saving + +:: Seasons +"Sommartid startar" on last sunday in march +"Vintertid startar" on last sunday in october + +:: Name Days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kimap/sessionthread.cpp new/kdepimlibs-4.10.2/kimap/sessionthread.cpp --- old/kdepimlibs-4.10.1/kimap/sessionthread.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kimap/sessionthread.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -143,7 +143,7 @@ void SessionThread::reconnect() { QMutexLocker locker( &m_mutex ); - + kDebug() << this << "state=" << m_socket->state(); if ( m_socket->state() != SessionSocket::ConnectedState && m_socket->state() != SessionSocket::ConnectingState ) { if ( m_encryptedMode ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kimap/tests/CMakeLists.txt new/kdepimlibs-4.10.2/kimap/tests/CMakeLists.txt --- old/kdepimlibs-4.10.1/kimap/tests/CMakeLists.txt 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kimap/tests/CMakeLists.txt 2013-03-29 08:04:05.000000000 +0100 @@ -9,7 +9,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} kimap kimaptest kmime) - add_definitions(-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"") + set_target_properties(${_testname} PROPERTIES COMPILE_FLAGS -DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"") ENDFOREACH(_testname) ENDMACRO(KIMAP_UNIT_TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kimap/tests/loginjobtest.cpp new/kdepimlibs-4.10.2/kimap/tests/loginjobtest.cpp --- old/kdepimlibs-4.10.1/kimap/tests/loginjobtest.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kimap/tests/loginjobtest.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -102,6 +102,7 @@ QList<QByteArray> scenario; scenario << FakeServer::greeting() << "C: A000001 AUTHENTICATE PLAIN" + << "S: A000001 OK (success)" << "C: A000001 LOGIN \"proxy\" \"user\" \"password\"" << "S: A000001 OK User logged in"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kmime/tests/auto/CMakeLists.txt new/kdepimlibs-4.10.2/kmime/tests/auto/CMakeLists.txt --- old/kdepimlibs-4.10.1/kmime/tests/auto/CMakeLists.txt 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kmime/tests/auto/CMakeLists.txt 2013-03-29 08:04:05.000000000 +0100 @@ -1,5 +1,3 @@ -add_definitions( -DMAIL_DATA_DIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/../data/mails\\"" ) -add_definitions( -DCODEC_DIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/../data\\"" ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") macro(add_kmime_test _source) @@ -7,6 +5,7 @@ get_filename_component(_name ${_source} NAME_WE) kde4_add_unit_test(${_name} TESTNAME kmime-${_name} ${_test}) target_link_libraries(${_name} kmime ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} ) + set_target_properties(${_name} PROPERTIES COMPILE_FLAGS -DTEST_DATA_DIR="\\"${CMAKE_CURRENT_SOURCE_DIR}/../data\\"" ) endmacro(add_kmime_test) add_kmime_test(rfc2047test.cpp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kmime/tests/auto/codectest.cpp new/kdepimlibs-4.10.2/kmime/tests/auto/codectest.cpp --- old/kdepimlibs-4.10.1/kmime/tests/auto/codectest.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kmime/tests/auto/codectest.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -39,12 +39,12 @@ QTest::addColumn<QString>( "tag" ); QTest::addColumn<Mode>( "mode" ); - QDir codecBaseDir( CODEC_DIR ); + QDir codecBaseDir( TEST_DATA_DIR ); foreach ( const QString &dir, codecBaseDir.entryList( QStringList(), QDir::Dirs | QDir::NoDotAndDotDot, QDir::NoSort ) ) { if ( dir.toLower().startsWith( "codec_" ) ) { const QString codecName = dir.right( dir.size() - 6 ); - QDir codecDir( CODEC_DIR"/" + dir ); + QDir codecDir( TEST_DATA_DIR"/" + dir ); foreach ( const QString &file, codecDir.entryList( QStringList(), QDir::Files, QDir::NoSort ) ) { if ( file.toLower().endsWith( ".expected" ) ) { const QString dataFileNameBase = file.left( file.size() - 9 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kmime/tests/auto/messagetest.cpp new/kdepimlibs-4.10.2/kmime/tests/auto/messagetest.cpp --- old/kdepimlibs-4.10.1/kmime/tests/auto/messagetest.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kmime/tests/auto/messagetest.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -587,8 +587,11 @@ KMime::Message::Ptr MessageTest::readAndParseMail( const QString &mailFile ) const { - QFile file( MAIL_DATA_DIR"/" + mailFile ); + QFile file( TEST_DATA_DIR"/mails/" + mailFile ); const bool ok = file.open( QIODevice::ReadOnly ); + if ( !ok ) { + qWarning() << file.fileName() << "not found"; + } Q_ASSERT( ok ); const QByteArray data = KMime::CRLFtoLF( file.readAll() ); Q_ASSERT( !data.isEmpty() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kontactinterface/kontactplugin.desktop new/kdepimlibs-4.10.2/kontactinterface/kontactplugin.desktop --- old/kdepimlibs-4.10.1/kontactinterface/kontactplugin.desktop 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kontactinterface/kontactplugin.desktop 2013-03-29 08:04:05.000000000 +0100 @@ -19,7 +19,7 @@ Name[he]=תוסף Kontact Name[hu]=Kontact-modul Name[ia]=Plug-in de Kontact -Name[it]=Plugin di Kontact +Name[it]=Estensione di Kontact Name[ja]=Kontact プラグイン Name[kk]=Kontact плагині Name[km]=កម្មវិធីជំនួយ Kontact diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kpimtextedit/emoticontexteditselector.cpp new/kdepimlibs-4.10.2/kpimtextedit/emoticontexteditselector.cpp --- old/kdepimlibs-4.10.1/kpimtextedit/emoticontexteditselector.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kpimtextedit/emoticontexteditselector.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -99,9 +99,18 @@ } const QHash<QString, QStringList> list = sEmoticons->theme( cachedEmoticonsThemeName ).emoticonsMap(); + //Keep in sync with linklocator.cpp + QStringList exclude; + exclude << QLatin1String("(c)") << QLatin1String("(C)") << QLatin1String(">:-(") << QLatin1String(">:(") << QLatin1String("(B)") << QLatin1String("(b)") << QLatin1String("(P)") << QLatin1String("(p)"); + exclude << QLatin1String("(O)") << QLatin1String("(o)") << QLatin1String("(D)") << QLatin1String("(d)") << QLatin1String("(E)") << QLatin1String("(e)") << QLatin1String("(K)") << QLatin1String("(k)"); + exclude << QLatin1String("(I)") << QLatin1String("(i)") << QLatin1String("(L)") << QLatin1String("(l)") << QLatin1String("(8)") << QLatin1String("(T)") << QLatin1String("(t)") << QLatin1String("(G)"); + exclude << QLatin1String("(g)") << QLatin1String("(F)") << QLatin1String("(f)") << QLatin1String("(H)"); + exclude << QLatin1String("8)") << QLatin1String("(N)") << QLatin1String("(n)") << QLatin1String("(Y)") << QLatin1String("(y)") << QLatin1String("(U)") << QLatin1String("(u)") << QLatin1String("(W)") << QLatin1String("(w)"); + QHash<QString, QStringList>::const_iterator end = list.constEnd(); for ( QHash<QString, QStringList>::const_iterator it = list.constBegin(); it != end; ++it ) { - new EmoticonTextEditItem( it.value().first(), it.key(), d->listEmoticon ); + if (!exclude.contains(it.value().first())) + new EmoticonTextEditItem( it.value().first(), it.key(), d->listEmoticon ); } d->listEmoticon->setIconSize( QSize( 32, 32 ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kpimutils/email.h new/kdepimlibs-4.10.2/kpimutils/email.h --- old/kdepimlibs-4.10.1/kpimutils/email.h 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kpimutils/email.h 2013-03-29 08:04:05.000000000 +0100 @@ -323,7 +323,7 @@ KPIMUTILS_EXPORT QString normalizedAddress( const QString &displayName, const QString &addrSpec, - const QString &comment ); + const QString &comment = QString() ); /** @} */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kpimutils/linklocator.cpp new/kdepimlibs-4.10.2/kpimutils/linklocator.cpp --- old/kdepimlibs-4.10.1/kpimutils/linklocator.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kpimutils/linklocator.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -157,7 +157,7 @@ // even though that is not wanted. So work around that here. // Most real-life URLs hopefully don't end with dots or commas. QList<QChar> wordBoundaries; - wordBoundaries << '.' << ',' << ':' << '!' << '?' << ')'; + wordBoundaries << '.' << ',' << ':' << '!' << '?' << ')' << '>'; if ( url.length() > 1 ) { do { if ( wordBoundaries.contains( url.at( url.length() - 1 ) ) ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/kresources/kresources_plugin.desktop new/kdepimlibs-4.10.2/kresources/kresources_plugin.desktop --- old/kdepimlibs-4.10.1/kresources/kresources_plugin.desktop 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/kresources/kresources_plugin.desktop 2013-03-29 08:04:05.000000000 +0100 @@ -18,7 +18,7 @@ Name[hne]=केरिसोर्स प्लगइन Name[hu]=KResources-modul Name[ia]=Plugin de KResources -Name[it]=Plugin di KResources +Name[it]=Estensione di KResources Name[ja]=KDE リソースプラグイン Name[kk]=KResources плагині Name[km]=កម្មវិធីជំនួយរបស់ KResources @@ -72,7 +72,7 @@ Comment[hne]=केरिसोर्स फ्रेमवर्क प्लगइन Comment[hu]=Modul a KResources keretrendszerhez Comment[ia]=Plugin de schema de KResources -Comment[it]=Plugin di infrastruttura di KResources +Comment[it]=Estensione dell'infrastruttura di KResources Comment[ja]=KDE リソースフレームワークのプラグイン Comment[kk]=KResources құрылым плагині Comment[km]=កម្មវិធីជំនួយគ្រោងការរបស់ KResources diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.10.1/mailtransport/precommandjob.cpp new/kdepimlibs-4.10.2/mailtransport/precommandjob.cpp --- old/kdepimlibs-4.10.1/mailtransport/precommandjob.cpp 2013-03-01 07:58:43.000000000 +0100 +++ new/kdepimlibs-4.10.2/mailtransport/precommandjob.cpp 2013-03-29 08:04:05.000000000 +0100 @@ -49,7 +49,7 @@ }; PreCommandJobPrivate::PreCommandJobPrivate( PrecommandJob *parent ) - : q( parent ) + : process( 0 ), q( parent ) { } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
![http://twimg0-a.akamaihd.net/profile_images/1171007559/79ac2ace-f87d-4dce-ac6c-825b6b12729d.png"](http://twimg0-a.akamaihd.net/profile_images/1171007559/79ac2ace-f87d-4dce-ac6c-825b6b12729d.png"){kind=link}
![https://twimg0-a.akamaihd.net/profile_images/1171007559/79ac2ace-f87d-4dce-ac6c-825b6b12729d.png"](https://twimg0-a.akamaihd.net/profile_images/1171007559/79ac2ace-f87d-4dce-ac6c-825b6b12729d.png"){kind=link}