Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2011-11-14 14:18:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4-runtime", Maintainer is "wstephen...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2011-10-21 16:31:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2011-11-14 14:18:11.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 2 20:23:21 CET 2011 - dmuel...@suse.de + +- update to 4.7.3 + * see http://kde.org/announcements/changelogs/changelog4_7_2to4_7_3.php for details + +------------------------------------------------------------------- Old: ---- kdepim-runtime-4.7.2.tar.bz2 New: ---- kdepim-runtime-4.7.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.FGCucw/_old 2011-11-14 14:18:12.000000000 +0100 +++ /var/tmp/diff_new_pack.FGCucw/_new 2011-11-14 14:18:12.000000000 +0100 @@ -18,7 +18,7 @@ Name: kdepim4-runtime -Version: 4.7.2 +Version: 4.7.3 Release: 1 License: LGPLv2.1+ Summary: Base package of kdepim ++++++ 4_7_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.FGCucw/_old 2011-11-14 14:18:12.000000000 +0100 +++ /var/tmp/diff_new_pack.FGCucw/_new 2011-11-14 14:18:12.000000000 +0100 @@ -5,213 +5,3 @@ +git diff v4.7.2..origin/KDE/4.7 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a72fb9..f74c6c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,7 +38,7 @@ if (NOT DEFINED KDEPIM_RUNTIME_DEV_VERSION) - set( KDEPIM_RUNTIME_DEV_VERSION "" ) - endif () - --set( KDEPIM_RUNTIME_VERSION "4.7.1${KDEPIM_RUNTIME_DEV_VERSION}" ) -+set( KDEPIM_RUNTIME_VERSION "4.7.2${KDEPIM_RUNTIME_DEV_VERSION}" ) - - ############### search-related options ################ - option(KDEPIM_NO_NEPOMUK "Build without nepomuk dependency" FALSE) -diff --git a/agents/invitations/invitationsagent.desktop b/agents/invitations/invitationsagent.desktop -index d36b304..829d039 100644 ---- a/agents/invitations/invitationsagent.desktop -+++ b/agents/invitations/invitationsagent.desktop -@@ -1,6 +1,6 @@ - [Desktop Entry] - Name=Invitations Dispatcher Agent --Name[ca]=Agent de fils d'invitacions -+Name[ca]=Agent distribuïdor d'invitacions - Name[ca@valencia]=Agent de fils d'invitacions - Name[da]=Invitationsafsendingsagent - Name[de]=Agent zur Einladungs-Auslieferung -diff --git a/agents/maildispatcher/maildispatcheragent.desktop b/agents/maildispatcher/maildispatcheragent.desktop -index 78e9458..eaf4362 100644 ---- a/agents/maildispatcher/maildispatcheragent.desktop -+++ b/agents/maildispatcher/maildispatcheragent.desktop -@@ -1,7 +1,7 @@ - [Desktop Entry] - Name=Mail Dispatcher Agent - Name[bs]=Dispačer mail agent --Name[ca]=Agent de fils de correu -+Name[ca]=Agent distribuïdor de correu - Name[ca@valencia]=Agent de fils de correu - Name[da]=Mailafsendingsagent (MDA) - Name[de]=Agent zur Nachrichten-Auslieferung -diff --git a/agents/maildispatcher/sendjob.cpp b/agents/maildispatcher/sendjob.cpp -index 2d59a2b..52b0e27 100644 ---- a/agents/maildispatcher/sendjob.cpp -+++ b/agents/maildispatcher/sendjob.cpp -@@ -301,15 +301,20 @@ void SendJob::Private::doPostJob( bool transportSuccess, const QString &transpor - void SendJob::Private::slotSentMailCollectionFetched(KJob* job) - { - Akonadi::Collection fetchCol; -- if( job->error() ) { -+ bool ok = false; -+ if( !job->error() ) { -+ const CollectionFetchJob *const fetchJob = qobject_cast<CollectionFetchJob*>( job ); -+ if ( !fetchJob->collections().isEmpty() ) { -+ fetchCol = fetchJob->collections().first(); -+ ok = true; -+ } -+ } -+ if ( !ok ) { - if ( !SpecialMailCollections::self()->hasDefaultCollection( SpecialMailCollections::SentMail ) ) { - abortPostJob(); - return; - } - fetchCol = SpecialMailCollections::self()->defaultCollection( SpecialMailCollections::SentMail ); -- } else { -- const CollectionFetchJob *const fetchJob = qobject_cast<CollectionFetchJob*>( job ); -- fetchCol = fetchJob->collections().first(); - } - currentJob = new ItemMoveJob( item, fetchCol, q ); - QObject::connect( currentJob, SIGNAL( result( KJob* ) ), q, SLOT( postJobResult( KJob* ) ) ); -diff --git a/defaultsetup/defaultcalendar-ce.desktop b/defaultsetup/defaultcalendar-ce.desktop -index 0653ea4..e3fa1da 100644 ---- a/defaultsetup/defaultcalendar-ce.desktop -+++ b/defaultsetup/defaultcalendar-ce.desktop -@@ -19,6 +19,7 @@ Name[nl]=Persoonlijke agenda - Name[pl]=Kalendarz osobisty - Name[pt]=Calendário Pessoal - Name[pt_BR]=Calendário pessoal -+Name[ro]=Calendar personal - Name[ru]=Личный календарь - Name[sr]=Лични календар - Name[sr@ijekavian]=Лични календар -diff --git a/defaultsetup/defaultcalendar.desktop b/defaultsetup/defaultcalendar.desktop -index 8cac2ac..cd833dc 100644 ---- a/defaultsetup/defaultcalendar.desktop -+++ b/defaultsetup/defaultcalendar.desktop -@@ -19,6 +19,7 @@ Name[nl]=Persoonlijke agenda - Name[pl]=Kalendarz osobisty - Name[pt]=Calendário Pessoal - Name[pt_BR]=Calendário pessoal -+Name[ro]=Calendar personal - Name[ru]=Личный календарь - Name[sr]=Лични календар - Name[sr@ijekavian]=Лични календар -diff --git a/migration/kmail/kmailmigrator.cpp b/migration/kmail/kmailmigrator.cpp -index 3238460..b0300a7 100644 ---- a/migration/kmail/kmailmigrator.cpp -+++ b/migration/kmail/kmailmigrator.cpp -@@ -286,6 +286,11 @@ void KMailMigrator::migrateTags() - #endif - } - -+ //Cleanup migrated group -+ Q_FOREACH( const QString &groupName, newlyMigratedTags ) { -+ deleteOldGroup( groupName ); -+ } -+ - if ( !newlyMigratedTags.isEmpty() ) { - tagMigrationConfig.writeEntry( "MigratedTags", migratedTags + newlyMigratedTags ); - tagMigrationConfig.sync(); -@@ -437,6 +442,12 @@ void KMailMigrator::cleanupConfigFile() - } - - deleteOldGroup( "FavoriteFolderView" ); -+ -+ if ( mConfig->hasGroup( "Internal" ) ) -+ { -+ KConfigGroup cfgGroup( mConfig, "General" ); -+ cfgGroup.deleteEntry( "MsgDictSizeHint" ); -+ } - } - - void KMailMigrator::migrateInstanceTrashFolder() -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 ); -+ 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 ); - -- name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox", "outbox" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Outbox ); -+ 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 ); - -- name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail", "sent-mail" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::SentMail ); -+ 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 ); - -- name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash", "trash" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Trash ); -+ 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 ); - -- name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts", "drafts" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Drafts ); -+ 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 ); - -- name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates", "templates" ) ); -- d->mSystemFolders.insert( name, SpecialMailCollections::Templates ); -+ 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/resources/imap/subscriptiondialog.cpp b/resources/imap/subscriptiondialog.cpp -index fe36b42..c1f21d5 100644 ---- a/resources/imap/subscriptiondialog.cpp -+++ b/resources/imap/subscriptiondialog.cpp -@@ -100,6 +100,7 @@ SubscriptionDialog::SubscriptionDialog( QWidget *parent ) - connect( m_lineEdit, SIGNAL(textChanged(QString)), - m_filter, SLOT(setSearchPattern(QString)) ); - filterBarLayout->addWidget( m_lineEdit ); -+ m_lineEdit->setFocus(); - - #ifndef KDEPIM_MOBILE_UI - QCheckBox *checkBox = new QCheckBox( i18n("Subscribed only"), mainWidget ); -diff --git a/resources/maildir/retrieveitemsjob.cpp b/resources/maildir/retrieveitemsjob.cpp -index 56d961f..89c3e0e 100644 ---- a/resources/maildir/retrieveitemsjob.cpp -+++ b/resources/maildir/retrieveitemsjob.cpp -@@ -146,6 +146,8 @@ void RetrieveItemsJob::entriesProcessed() - - if ( !m_transaction ) // no jobs created here -> done - emitResult(); -+ else -+ m_transaction->commit(); - } - - -@@ -154,6 +156,7 @@ Akonadi::TransactionSequence* RetrieveItemsJob::transaction() - { - if ( !m_transaction ) { - m_transaction = new Akonadi::TransactionSequence( this ); -+ m_transaction->setAutomaticCommittingEnabled( false ); - connect( m_transaction, SIGNAL(result(KJob*)), SLOT(transactionDone(KJob*)) ); - } - return m_transaction; -/space/work/OBS/kdf/kdepim4-runtime ++++++ kdepim-runtime-4.7.2.tar.bz2 -> kdepim-runtime-4.7.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/CMakeLists.txt new/kdepim-runtime-4.7.3/CMakeLists.txt --- old/kdepim-runtime-4.7.2/CMakeLists.txt 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/CMakeLists.txt 2011-10-28 09:51:28.000000000 +0200 @@ -38,7 +38,7 @@ set( KDEPIM_RUNTIME_DEV_VERSION "" ) endif () -set( KDEPIM_RUNTIME_VERSION "4.7.1${KDEPIM_RUNTIME_DEV_VERSION}" ) +set( KDEPIM_RUNTIME_VERSION "4.7.3${KDEPIM_RUNTIME_DEV_VERSION}" ) ############### search-related options ################ option(KDEPIM_NO_NEPOMUK "Build without nepomuk dependency" FALSE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/accountwizard/ispdb/ispdb.cpp new/kdepim-runtime-4.7.3/accountwizard/ispdb/ispdb.cpp --- old/kdepim-runtime-4.7.2/accountwizard/ispdb/ispdb.cpp 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/accountwizard/ispdb/ispdb.cpp 2011-10-28 09:43:28.000000000 +0200 @@ -25,7 +25,8 @@ #include <kmime/kmime_header_parsing.h> #include <QDomDocument> -Ispdb::Ispdb( QObject *parent ) : QObject( parent ) +Ispdb::Ispdb( QObject *parent ) + : QObject( parent ), mServerType( IspAutoConfig ) { } @@ -47,11 +48,8 @@ lookupInDb(); } -void Ispdb::lookupInDb() +void Ispdb::startJob( const KUrl&url ) { - const KUrl url( "https://live.mozillamessaging.com/autoconfig/v1.1/"; + mAddr.domain ); - kDebug() << mAddr.domain << url; - QMap< QString, QVariant > map; map["errorPage"] = false; @@ -63,12 +61,56 @@ this, SLOT( dataArrived( KIO::Job*, const QByteArray& ) ) ); } +void Ispdb::lookupInDb() +{ + KUrl url; + switch( mServerType ) + { + case IspAutoConfig: + { + url = KUrl( "http://autoconfig."; + mAddr.domain.toLower() + "/mail/config-v1.1.xml" ); + } + break; + case IspWellKnow: + { + url = KUrl( "http://"; + mAddr.domain.toLower() + "/.well-known/autoconfig/mail/config-v1.1.xml" ); + break; + } + case DataBase: + url = KUrl( "https://live.mozillamessaging.com/autoconfig/v1.1/"; + mAddr.domain.toLower() ); + break; + } + startJob( url ); +} + void Ispdb::slotResult( KJob* job ) { if ( job->error() ) { - kDebug() << "Fetching failed" << job->errorString(); + kDebug() << "Fetching failed" << job->errorString(); + bool lookupFinished = false; + + switch( mServerType ) { + case IspAutoConfig: { + mServerType = IspWellKnow; + break; + } + case IspWellKnow: { + mServerType = DataBase; + break; + } + case DataBase: { + lookupFinished = true; + break; + } + } + + if ( lookupFinished ) + { emit finished( false ); return; + } + lookupInDb(); + return; } //kDebug() << mData; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/accountwizard/ispdb/ispdb.h new/kdepim-runtime-4.7.3/accountwizard/ispdb/ispdb.h --- old/kdepim-runtime-4.7.2/accountwizard/ispdb/ispdb.h 2011-10-02 15:24:48.000000000 +0200 +++ new/kdepim-runtime-4.7.3/accountwizard/ispdb/ispdb.h 2011-10-28 09:43:28.000000000 +0200 @@ -96,9 +96,12 @@ void finished( bool ); private: + enum searchServerType { IspAutoConfig = 0, IspWellKnow, DataBase }; + server createServer( const QDomElement& n ); void lookupInDb(); QString replacePlaceholders( const QString& ); + void startJob( const KUrl&url ); KMime::Types::AddrSpec mAddr; // emailaddress QByteArray mData; // storage of incoming data from kio @@ -107,6 +110,7 @@ QStringList mDomains; QString mDisplayName, mDisplayShortName; QList< server > mImapServers, mPop3Servers, mSmtpServers; + Ispdb::searchServerType mServerType; }; struct server { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/agents/invitations/invitationsagent.desktop new/kdepim-runtime-4.7.3/agents/invitations/invitationsagent.desktop --- old/kdepim-runtime-4.7.2/agents/invitations/invitationsagent.desktop 2011-10-02 15:24:48.000000000 +0200 +++ new/kdepim-runtime-4.7.3/agents/invitations/invitationsagent.desktop 2011-10-28 09:43:28.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Name=Invitations Dispatcher Agent -Name[ca]=Agent de fils d'invitacions +Name[ca]=Agent distribuïdor d'invitacions Name[ca@valencia]=Agent de fils d'invitacions Name[da]=Invitationsafsendingsagent Name[de]=Agent zur Einladungs-Auslieferung diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/agents/maildispatcher/maildispatcheragent.desktop new/kdepim-runtime-4.7.3/agents/maildispatcher/maildispatcheragent.desktop --- old/kdepim-runtime-4.7.2/agents/maildispatcher/maildispatcheragent.desktop 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/agents/maildispatcher/maildispatcheragent.desktop 2011-10-28 09:43:28.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Name=Mail Dispatcher Agent Name[bs]=Dispačer mail agent -Name[ca]=Agent de fils de correu +Name[ca]=Agent distribuïdor de correu Name[ca@valencia]=Agent de fils de correu Name[da]=Mailafsendingsagent (MDA) Name[de]=Agent zur Nachrichten-Auslieferung diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/agents/maildispatcher/sendjob.cpp new/kdepim-runtime-4.7.3/agents/maildispatcher/sendjob.cpp --- old/kdepim-runtime-4.7.2/agents/maildispatcher/sendjob.cpp 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/agents/maildispatcher/sendjob.cpp 2011-10-28 09:43:28.000000000 +0200 @@ -301,15 +301,20 @@ void SendJob::Private::slotSentMailCollectionFetched(KJob* job) { Akonadi::Collection fetchCol; - if( job->error() ) { + bool ok = false; + if( !job->error() ) { + const CollectionFetchJob *const fetchJob = qobject_cast<CollectionFetchJob*>( job ); + if ( !fetchJob->collections().isEmpty() ) { + fetchCol = fetchJob->collections().first(); + ok = true; + } + } + if ( !ok ) { if ( !SpecialMailCollections::self()->hasDefaultCollection( SpecialMailCollections::SentMail ) ) { abortPostJob(); return; } fetchCol = SpecialMailCollections::self()->defaultCollection( SpecialMailCollections::SentMail ); - } else { - const CollectionFetchJob *const fetchJob = qobject_cast<CollectionFetchJob*>( job ); - fetchCol = fetchJob->collections().first(); } currentJob = new ItemMoveJob( item, fetchCol, q ); QObject::connect( currentJob, SIGNAL( result( KJob* ) ), q, SLOT( postJobResult( KJob* ) ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/defaultsetup/defaultcalendar-ce.desktop new/kdepim-runtime-4.7.3/defaultsetup/defaultcalendar-ce.desktop --- old/kdepim-runtime-4.7.2/defaultsetup/defaultcalendar-ce.desktop 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/defaultsetup/defaultcalendar-ce.desktop 2011-10-28 09:43:28.000000000 +0200 @@ -19,6 +19,7 @@ Name[pl]=Kalendarz osobisty Name[pt]=Calendário Pessoal Name[pt_BR]=Calendário pessoal +Name[ro]=Calendar personal Name[ru]=Личный календарь Name[sr]=Лични календар Name[sr@ijekavian]=Лични календар diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/defaultsetup/defaultcalendar.desktop new/kdepim-runtime-4.7.3/defaultsetup/defaultcalendar.desktop --- old/kdepim-runtime-4.7.2/defaultsetup/defaultcalendar.desktop 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/defaultsetup/defaultcalendar.desktop 2011-10-28 09:43:28.000000000 +0200 @@ -19,6 +19,7 @@ Name[pl]=Kalendarz osobisty Name[pt]=Calendário Pessoal Name[pt_BR]=Calendário pessoal +Name[ro]=Calendar personal Name[ru]=Личный календарь Name[sr]=Лични календар Name[sr@ijekavian]=Лични календар diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/migration/kmail/imapcachecollectionmigrator.cpp new/kdepim-runtime-4.7.3/migration/kmail/imapcachecollectionmigrator.cpp --- old/kdepim-runtime-4.7.2/migration/kmail/imapcachecollectionmigrator.cpp 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/migration/kmail/imapcachecollectionmigrator.cpp 2011-10-28 09:43:28.000000000 +0200 @@ -512,7 +512,7 @@ void ImapCacheCollectionMigrator::setUnsubscribedImapFolders( const QStringList &imapFolders ) { d->mUnsubscribedImapFolders.clear(); - Q_FOREACH( const QString imapFolder, imapFolders ) { + Q_FOREACH( const QString &imapFolder, imapFolders ) { if ( imapFolder.endsWith( QLatin1Char( '/' ) ) ) { d->mUnsubscribedImapFolders << imapFolder.left( imapFolder.size() - 1 ); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/migration/kmail/kmailmigrator.cpp new/kdepim-runtime-4.7.3/migration/kmail/kmailmigrator.cpp --- old/kdepim-runtime-4.7.2/migration/kmail/kmailmigrator.cpp 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/migration/kmail/kmailmigrator.cpp 2011-10-28 09:43:28.000000000 +0200 @@ -286,6 +286,11 @@ #endif } + //Cleanup migrated group + Q_FOREACH( const QString &groupName, newlyMigratedTags ) { + deleteOldGroup( groupName ); + } + if ( !newlyMigratedTags.isEmpty() ) { tagMigrationConfig.writeEntry( "MigratedTags", migratedTags + newlyMigratedTags ); tagMigrationConfig.sync(); @@ -437,6 +442,12 @@ } deleteOldGroup( "FavoriteFolderView" ); + + if ( mConfig->hasGroup( "Internal" ) ) + { + KConfigGroup cfgGroup( mConfig, "General" ); + cfgGroup.deleteEntry( "MsgDictSizeHint" ); + } } void KMailMigrator::migrateInstanceTrashFolder() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/migration/kmail/localfolderscollectionmigrator.cpp new/kdepim-runtime-4.7.3/migration/kmail/localfolderscollectionmigrator.cpp --- old/kdepim-runtime-4.7.2/migration/kmail/localfolderscollectionmigrator.cpp 2011-10-02 15:24:49.000000000 +0200 +++ new/kdepim-runtime-4.7.3/migration/kmail/localfolderscollectionmigrator.cpp 2011-10-28 09:43:28.000000000 +0200 @@ -64,23 +64,41 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/resources/imap/subscriptiondialog.cpp new/kdepim-runtime-4.7.3/resources/imap/subscriptiondialog.cpp --- old/kdepim-runtime-4.7.2/resources/imap/subscriptiondialog.cpp 2011-10-02 15:24:50.000000000 +0200 +++ new/kdepim-runtime-4.7.3/resources/imap/subscriptiondialog.cpp 2011-10-28 09:43:28.000000000 +0200 @@ -100,6 +100,7 @@ connect( m_lineEdit, SIGNAL(textChanged(QString)), m_filter, SLOT(setSearchPattern(QString)) ); filterBarLayout->addWidget( m_lineEdit ); + m_lineEdit->setFocus(); #ifndef KDEPIM_MOBILE_UI QCheckBox *checkBox = new QCheckBox( i18n("Subscribed only"), mainWidget ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.2/resources/maildir/retrieveitemsjob.cpp new/kdepim-runtime-4.7.3/resources/maildir/retrieveitemsjob.cpp --- old/kdepim-runtime-4.7.2/resources/maildir/retrieveitemsjob.cpp 2011-10-02 15:24:49.000000000 +0200 +++ new/kdepim-runtime-4.7.3/resources/maildir/retrieveitemsjob.cpp 2011-10-28 09:43:28.000000000 +0200 @@ -146,6 +146,8 @@ if ( !m_transaction ) // no jobs created here -> done emitResult(); + else + m_transaction->commit(); } @@ -154,6 +156,7 @@ { if ( !m_transaction ) { m_transaction = new Akonadi::TransactionSequence( this ); + m_transaction->setAutomaticCommittingEnabled( false ); connect( m_transaction, SIGNAL(result(KJob*)), SLOT(transactionDone(KJob*)) ); } return m_transaction; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
