Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at Thu Sep 22 10:46:43 CEST 2011. -------- --- KDE/kdepim4-runtime/kdepim4-runtime.changes 2011-09-07 14:46:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim4-runtime/kdepim4-runtime.changes 2011-09-21 21:10:35.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 21 19:06:56 UTC 2011 - ctrippe@opensuse.org + +- Fix mail loss when downloading from pop3 accounts (kde#279297) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- patch_fix_mail_loss_with_pop3_kde279297.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.OBOftt/_old 2011-09-22 10:46:40.000000000 +0200 +++ /var/tmp/diff_new_pack.OBOftt/_new 2011-09-22 10:46:40.000000000 +0200 @@ -26,7 +26,8 @@ Group: System/GUI/KDE Source0: kdepim-runtime-%{version}.tar.bz2 Source1: akonadi.png -Patch6: disable-knut.diff +Patch: disable-knut.diff +Patch1: patch_fix_mail_loss_with_pop3_kde279297.diff BuildRequires: fdupes BuildRequires: libkdepimlibs4-devel Suggests: kontact @@ -44,7 +45,8 @@ %prep %setup -q -n kdepim-runtime-%{version} -%patch6 +%patch +%patch1 %build %ifarch ppc64 ++++++ patch_fix_mail_loss_with_pop3_kde279297.diff ++++++ Subject: FIX mail loss with pop3 accounts Bug: kde#279297 Patch-upstream: ccd67f3e65c9ffe32858ca521aa1e56a42b026af|kde= 4.7.2 diff --git a/resources/maildir/retrieveitemsjob.cpp b/resources/maildir/retrieveitemsjob.cpp index 7253f7e..f0273ef 100644 --- resources/maildir/retrieveitemsjob.cpp +++ resources/maildir/retrieveitemsjob.cpp @@ -57,8 +57,10 @@ void RetrieveItemsJob::localListDone ( KJob* job ) const Akonadi::Item::List items = qobject_castAkonadi::ItemFetchJob*( job )->items(); m_localItems.reserve( items.size() ); - foreach ( const Akonadi::Item &item, items ) - m_localItems.insert( item.remoteId(), item ); + foreach ( const Akonadi::Item &item, items ) { + if ( !item.remoteId().isEmpty() ) + m_localItems.insert( item.remoteId(), item ); + } const QStringList entryList = m_maildir.entryList(); qint64 previousMtime = m_collection.remoteRevision().toLongLong(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org