Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Fri Sep 3 14:07:06 CEST 2010. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2010-07-29 16:55:28.000000000 +0200 +++ kdepimlibs4/kdepimlibs4.changes 2010-08-27 13:37:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 27 13:36:57 CEST 2010 - dmueller@suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepimlibs-4.5.0.tar.bz2 New: ---- kdepimlibs-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.wkfrn3/_old 2010-09-03 14:05:59.000000000 +0200 +++ /var/tmp/diff_new_pack.wkfrn3/_new 2010-09-03 14:05:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 4.5.0) +# spec file for package kdepimlibs4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdepimlibs-%version.tar.bz2 Patch0: 4_5_BRANCH.diff ++++++ kdepimlibs-4.5.0.tar.bz2 -> kdepimlibs-4.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/CMakeLists.txt new/kdepimlibs-4.5.1/CMakeLists.txt --- old/kdepimlibs-4.5.0/CMakeLists.txt 2010-07-28 23:04:12.000000000 +0200 +++ new/kdepimlibs-4.5.1/CMakeLists.txt 2010-08-27 10:09:27.000000000 +0200 @@ -11,7 +11,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 5) -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.5.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop --- old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2010-08-27 10:09:27.000000000 +0200 @@ -11,6 +11,7 @@ Comment[de]=Novell-GroupWise-Nachrichtendienst Comment[en_GB]=Novell GroupWise Messenger Comment[eo]=Novell GroupWise mesaĝilo +Comment[es]=Mensajería de Novell GroupWise Comment[et]=Novell GroupWise Messenger Comment[fr]=Messagerie GroupWise Novell Comment[ga]=Teachtaire Novell GroupWise @@ -41,6 +42,7 @@ Name[de]=GroupWise Name[en_GB]=GroupWise Name[eo]=GroupWise +Name[es]=GroupWise Name[et]=GroupWise Name[fr]=GroupWise Name[ga]=GroupWise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/ircprotocol.desktop --- old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2010-08-27 10:09:27.000000000 +0200 @@ -11,6 +11,7 @@ Comment[de]=Internet Relay Chat Comment[en_GB]=Internet Relay Chat Comment[eo]=Interreta plusenda babilado +Comment[es]=Internet Relay Chat Comment[et]=Rühmadiskussioon internetis Comment[fr]=Relai Internet de discussion Comment[ga]=Internet Relay Chat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/entitymimetypefiltermodel.cpp new/kdepimlibs-4.5.1/akonadi/entitymimetypefiltermodel.cpp --- old/kdepimlibs-4.5.0/akonadi/entitymimetypefiltermodel.cpp 2010-05-20 13:41:04.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/entitymimetypefiltermodel.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -214,6 +214,13 @@ if (!sourceModel()) return false; + // QSortFilterProxyModel implementation is buggy in that it emits rowsAboutToBeInserted etc + // only after the source model has emitted rowsInserted, instead of emitting it when the + // source model emits rowsAboutToBeInserted. That means that the source and the proxy are out + // of sync around the time of insertions, so we can't use the optimization below. + return rowCount(parent) > 0; +#if 0 + if ( !parent.isValid() ) return sourceModel()->hasChildren(parent); @@ -233,6 +240,7 @@ } } return false; +#endif } bool EntityMimeTypeFilterModel::canFetchMore( const QModelIndex &parent ) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/itemsync.cpp new/kdepimlibs-4.5.1/akonadi/itemsync.cpp --- old/kdepimlibs-4.5.0/akonadi/itemsync.cpp 2010-07-06 08:54:00.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/itemsync.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -53,7 +53,8 @@ mStreaming( false ), mIncremental( false ), mLocalListDone( false ), - mDeliveryDone( false ) + mDeliveryDone( false ), + mFinished( false ) { // we want to fetch all data by default mFetchScope.fetchFullPayload(); @@ -106,6 +107,7 @@ bool mIncremental; bool mLocalListDone; bool mDeliveryDone; + bool mFinished; }; void ItemSync::Private::createLocalItem( const Item & item ) @@ -124,7 +126,10 @@ if ( mPendingJobs > 0 || !mDeliveryDone || mTransactionJobs > 0 ) return; - q->emitResult(); + if ( !mFinished ) { // prevent double result emission, can happen since checkDone() is called from all over the place + mFinished = true; + q->emitResult(); + } } ItemSync::ItemSync( const Collection &collection, QObject *parent ) : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/kdescendantsproxymodel.cpp new/kdepimlibs-4.5.1/akonadi/kdescendantsproxymodel.cpp --- old/kdepimlibs-4.5.0/akonadi/kdescendantsproxymodel.cpp 2010-07-23 23:11:01.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/kdescendantsproxymodel.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -171,7 +171,10 @@ Q_ASSERT(child.isValid()); if (q->sourceModel()->hasChildren(child)) + { + Q_ASSERT(q->sourceModel()->rowCount(child) > 0); newPendingParents.append(child); + } } } m_pendingParents += newPendingParents; @@ -335,6 +338,7 @@ if (d->m_mapping.isEmpty() && sourceModel()->hasChildren()) { + Q_ASSERT(sourceModel()->rowCount() > 0); const_cast<KDescendantsProxyModelPrivate*>(d)->synchronousMappingRefresh(); } return d->m_rowCount; @@ -538,6 +542,7 @@ if (!q->sourceModel()->hasChildren(parent)) { + Q_ASSERT(q->sourceModel()->rowCount(parent) == 0); // parent was not a parent before. return; } @@ -559,6 +564,7 @@ QModelIndex idx = q->sourceModel()->index(rowCount - 1, column, parent); while (q->sourceModel()->hasChildren(idx)) { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx); } // The last item in the list is getting a sibling below it. @@ -648,13 +654,16 @@ const QModelIndex idx = q->sourceModel()->index(row, column, parent); Q_ASSERT(idx.isValid()); if (q->sourceModel()->hasChildren(idx)) + { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); m_pendingParents.append(idx); + } } m_rowCount += difference; - scheduleProcessPendingParents(); q->endInsertRows(); + scheduleProcessPendingParents(); } void KDescendantsProxyModelPrivate::sourceRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) @@ -667,6 +676,7 @@ QModelIndex idx = q->sourceModel()->index(end, column, parent); while (q->sourceModel()->hasChildren(idx)) { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx); } const int proxyEnd = q->mapFromSource(idx).row(); @@ -751,6 +761,7 @@ resetInternalData(); if (q->sourceModel()->hasChildren()) { + Q_ASSERT(q->sourceModel()->rowCount() > 0); m_pendingParents.append(QModelIndex()); scheduleProcessPendingParents(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/session.cpp new/kdepimlibs-4.5.1/akonadi/session.cpp --- old/kdepimlibs-4.5.0/akonadi/session.cpp 2010-07-12 23:08:14.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/session.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -164,7 +164,6 @@ if ( currentJob ) currentJob->d_ptr->lostConnection(); connected = false; - QTimer::singleShot( 30000, mParent, SLOT( reconnect() ) ); } void SessionPrivate::dataReceived() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/tests/itemsynctest.cpp new/kdepimlibs-4.5.1/akonadi/tests/itemsynctest.cpp --- old/kdepimlibs-4.5.0/akonadi/tests/itemsynctest.cpp 2010-05-05 16:51:13.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/tests/itemsynctest.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -97,9 +97,10 @@ Item::List l; l << origItems[i]; syncer->setFullSyncItems( l ); - if ( i < origItems.count() - 1 ) + if ( i < origItems.count() - 1 ) { QTest::qWait( 10 ); // enter the event loop so itemsync actually can do something - QCOMPARE( spy.count(), 0 ); + QCOMPARE( spy.count(), 0 ); + } } QTest::qWait( 1000 ); // let it finish its job QCOMPARE( spy.count(), 1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/transactionsequence.cpp new/kdepimlibs-4.5.1/akonadi/transactionsequence.cpp --- old/kdepimlibs-4.5.0/akonadi/transactionsequence.cpp 2010-06-16 14:02:27.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/transactionsequence.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -104,7 +104,7 @@ else Job::removeSubjob( job ); - if ( subjobs().isEmpty() && d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { + if ( !hasSubjobs() && d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { d->mState = TransactionSequencePrivate::Committing; TransactionCommitJob *job = new TransactionCommitJob( this ); connect( job, SIGNAL( result( KJob* ) ), SLOT( commitResult( KJob* ) ) ); @@ -113,7 +113,14 @@ setError( job->error() ); setErrorText( job->errorText() ); removeSubjob( job ); + + // cancel all subjobs in case someone else is listening (such as ItemSync), but without notifying ourselves again + foreach ( KJob* job, subjobs() ) { + disconnect( job, SIGNAL(result(KJob*)), this, SLOT(slotResult(KJob*)) ); + job->kill( EmitResult ); + } clearSubjobs(); + if ( d->mState == TransactionSequencePrivate::Running || d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { d->mState = TransactionSequencePrivate::RollingBack; TransactionRollbackJob *job = new TransactionRollbackJob( this ); Files old/kdepimlibs-4.5.0/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.5.1/doc/kcontrol/kresources/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kcal/incidenceformatter.cpp new/kdepimlibs-4.5.1/kcal/incidenceformatter.cpp --- old/kdepimlibs-4.5.0/kcal/incidenceformatter.cpp 2010-07-07 19:08:52.000000000 +0200 +++ new/kdepimlibs-4.5.1/kcal/incidenceformatter.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -351,7 +351,11 @@ if ( (*it)->uri().startsWith( QLatin1String( "kmail:" ) ) ) { name = i18n( "Show mail" ); } else { - name = (*it)->label(); + if ( (*it)->label().isEmpty() ) { + name = (*it)->uri(); + } else { + name = (*it)->label(); + } } tmpStr += htmlAddLink( (*it)->uri(), name ); } else { @@ -395,7 +399,6 @@ //TODO: add a birthday cake icon QString tmpStr = displayViewLinkPerson( email_1, name_1, uid_1, iconPath ); - return tmpStr; } @@ -578,7 +581,7 @@ const bool isBirthday = event->customProperty( "KABC", "BIRTHDAY" ) == "YES"; const bool isAnniversary = event->customProperty( "KABC", "ANNIVERSARY" ) == "YES"; - if ( isBirthday || isAnniversary ) { + if ( isBirthday || isAnniversary ) { tmpStr += "<tr>"; if ( isAnniversary ) { tmpStr += "<td><b>" + i18n( "Anniversary:" ) + "</b></td>"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kimap/sessionthread.cpp new/kdepimlibs-4.5.1/kimap/sessionthread.cpp --- old/kdepimlibs-4.5.0/kimap/sessionthread.cpp 2010-06-24 18:26:24.000000000 +0200 +++ new/kdepimlibs-4.5.1/kimap/sessionthread.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -118,16 +118,12 @@ void SessionThread::closeSocket() { - QMutexLocker locker(&m_mutex); - - m_encryptedMode = false; QTimer::singleShot( 0, this, SLOT( doCloseSocket() ) ); } void SessionThread::doCloseSocket() { - QMutexLocker locker(&m_mutex); - + m_encryptedMode = false; m_socket->close(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kmime/kmime_content.cpp new/kdepimlibs-4.5.1/kmime/kmime_content.cpp --- old/kdepimlibs-4.5.0/kmime/kmime_content.cpp 2010-07-07 19:08:52.000000000 +0200 +++ new/kdepimlibs-4.5.1/kmime/kmime_content.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -513,6 +513,7 @@ // Add to new content. main->setHeader( *it ); // Remove from this content. + delete (*it); it = h_eaders.erase( it ); } else { ++it; @@ -575,6 +576,7 @@ foreach( Headers::Base *h, main->h_eaders ) { setHeader( h ); // Will remove the old one if present. } + qDeleteAll( main->h_eaders ); main->h_eaders.clear(); // Move the body. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org