[kdepim-runtime] Kmail has duplicated folders after migration from previous version (kde#283467)

[Rex Dieter]

commit 3e9bcf871dafb1321044cb5d65be5046bde45b69
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 8 19:36:05 2011 -0500

    Kmail has duplicated folders after migration from previous version (kde#283467)

 kdepim-runtime-4.7.2-kde283467.patch |   75 ++++++++++++++++++++++++++++++++++
 kdepim-runtime.spec                  |    8 +++-
 2 files changed, 82 insertions(+), 1 deletions(-)
---
diff --git a/kdepim-runtime-4.7.2-kde283467.patch b/kdepim-runtime-4.7.2-kde283467.patch
new file mode 100644
index 0000000..d85d813
--- /dev/null
+++ b/kdepim-runtime-4.7.2-kde283467.patch
@@ -0,0 +1,75 @@
+commit 6bdc6290632be5fc6c103064463d7421b5e3b60d
+Author: Montel Laurent <montel at 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 )
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 3849568..4b122e3 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -5,7 +5,7 @@ Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Epoch:   1
 Version: 4.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -21,6 +21,8 @@ Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
 Patch1: kdepim-runtime-4.7.1-sqlite-support.patch
 
 ## upstream patches
+# http://bugs.kde.org/283467
+Patch100: kdepim-runtime-4.7.2-kde283467.patch
 
 Provides: kdepim4-runtime = %{version}-%{release}
 
@@ -68,6 +70,7 @@ Install %{name}-devel if you want to write or compile %{name} plugins.
 
 %patch0 -p1 -b .show_akonadi_kcm
 %patch1 -p1 -b .sqlite-support
+%patch100 -p1 -b .kde283467
 
 
 %build
@@ -148,6 +151,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 08 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-2
+- Kmail has duplicated folders after migration from previous version (kde#283467)
+
 * Tue Oct 04 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-1
 - 4.7.2