Hello community,
here is the log from the commit of package kdepim4-runtime for openSUSE:Factory
checked in at Tue Oct 11 16:56:21 CEST 2011.
--------
--- openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2011-10-06
16:35:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdepim4-runtime/kdepim4-runtime.changes
2011-10-10 20:01:26.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 10 17:59:18 UTC 2011 - jav...@opensuse.org
+
+- Add patch to avoid duplicate messages during migration from kmail1
+ (bko #283467)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
localfolderscollectionmigrator.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.jAsKq8/_old 2011-10-11 16:56:16.000000000 +0200
+++ /var/tmp/diff_new_pack.jAsKq8/_new 2011-10-11 16:56:16.000000000 +0200
@@ -27,6 +27,7 @@
Source0: kdepim-runtime-%{version}.tar.bz2
Source1: akonadi.png
Patch1: disable-knut.diff
+Patch2: localfolderscollectionmigrator.diff
BuildRequires: fdupes
BuildRequires: libkdepimlibs4-devel
Suggests: kontact
@@ -45,6 +46,7 @@
%prep
%setup -q -n kdepim-runtime-%{version}
%patch1
+%patch2 -p1
%build
%ifarch ppc64
++++++ localfolderscollectionmigrator.diff ++++++
commit 6bdc6290632be5fc6c103064463d7421b5e3b60d
Author: Montel Laurent <mon...@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 )
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
