summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2011-12-12 01:34:01 +0000
committerJonathan Callen <jcallen@gentoo.org>2011-12-12 01:34:01 +0000
commit1649455f513dd7081b29ab203fa105d911428a2b (patch)
treee41567d8330f6d498c7beaa8b778866d645b2c11 /kde-base/kdepim-runtime/files
parentFix type to build against /usr/src/linux sources and not the current running ... (diff)
downloadhistorical-1649455f513dd7081b29ab203fa105d911428a2b.tar.gz
historical-1649455f513dd7081b29ab203fa105d911428a2b.tar.bz2
historical-1649455f513dd7081b29ab203fa105d911428a2b.zip
rm old files
Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kdepim-runtime/files')
-rw-r--r--kde-base/kdepim-runtime/files/kdepim-runtime-4.7.1-emptyids.patch36
-rw-r--r--kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch75
2 files changed, 0 insertions, 111 deletions
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.1-emptyids.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.1-emptyids.patch
deleted file mode 100644
index 2a8397dd508c..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.1-emptyids.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ccd67f3e65c9ffe32858ca521aa1e56a42b026af Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Tue, 20 Sep 2011 10:12:40 +0200
-Subject: [PATCH] Ignore items with empty remote ids here.
-
-Items with empty remote id are those not yet stored by the resource,
-ie. we still have pending change replays for those. So, if we do a sync
-during that period (which could happen since the introduction of the
-file system watcher), we would remove a random one of those (only one
-since the map would only contain one without a remote id). This mostly
-affects the POP3 usage pattern.
-(cherry picked from commit f814b46a799ea8418ae17cf77d44da473124d12d)
----
- resources/maildir/retrieveitemsjob.cpp | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/resources/maildir/retrieveitemsjob.cpp b/resources/maildir/retrieveitemsjob.cpp
-index 7253f7e..f0273ef 100644
---- a/resources/maildir/retrieveitemsjob.cpp
-+++ b/resources/maildir/retrieveitemsjob.cpp
-@@ -57,8 +57,10 @@ void RetrieveItemsJob::localListDone ( KJob* job )
-
- const Akonadi::Item::List items = qobject_cast<Akonadi::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();
---
-1.7.1
-
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch
deleted file mode 100644
index d85d813e8af5..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-commit 6bdc6290632be5fc6c103064463d7421b5e3b60d
-Author: Montel Laurent <montel@kde.org>
-Date: Fri Oct 7 17:14:06 2011 +0200
-
- Fix Bug 283467 - Kmail has duplicated folders after migration from previous version.
-
- By default in config we don't translate config name.
- We use "inbox" "sent-mail" etc.
-
- BUG: 283467
- FIXED-IN: 4.7.3
-
-diff --git a/migration/kmail/localfolderscollectionmigrator.cpp b/migration/kmail/localfolderscollectionmigrator.cpp
-index 3edc59e..ea9f163 100644
---- a/migration/kmail/localfolderscollectionmigrator.cpp
-+++ b/migration/kmail/localfolderscollectionmigrator.cpp
-@@ -64,23 +64,41 @@ void LocalFoldersCollectionMigrator::setKMailConfig( const KSharedConfigPtr &con
-
- const KConfigGroup group( config, QLatin1String( "General" ) );
-
-- QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox", "inbox" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Inbox );
--
-- name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox", "outbox" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Outbox );
--
-- name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail", "sent-mail" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::SentMail );
--
-- name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash", "trash" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Trash );
--
-- name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts", "drafts" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Drafts );
--
-- name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates", "templates" ) );
-- d->mSystemFolders.insert( name, SpecialMailCollections::Templates );
-+ if ( group.hasKey( QLatin1String( "inboxFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox", "inbox" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Inbox );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "inbox" ), SpecialMailCollections::Inbox );
-+
-+ if ( group.hasKey( QLatin1String( "outboxFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox", "outbox" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Outbox );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "outbox" ), SpecialMailCollections::Outbox );
-+
-+ if ( group.hasKey( QLatin1String( "sentFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail", "sent-mail" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::SentMail );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "sent-mail" ), SpecialMailCollections::SentMail );
-+
-+ if ( group.hasKey( QLatin1String( "trashFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash", "trash" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Trash );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "trash" ), SpecialMailCollections::Trash );
-+
-+ if ( group.hasKey( QLatin1String( "draftsFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts", "drafts" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Drafts );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "drafts" ), SpecialMailCollections::Drafts );
-+
-+ if ( group.hasKey( QLatin1String( "templatesFolder" ) ) ) {
-+ const QString name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates", "templates" ) );
-+ d->mSystemFolders.insert( name, SpecialMailCollections::Templates );
-+ } else
-+ d->mSystemFolders.insert( QLatin1String( "templates" ), SpecialMailCollections::Templates );
- }
-
- void LocalFoldersCollectionMigrator::migrateCollection( const Collection &collection, const QString &folderId )