Branch 'kolab/integration/4.13.0' - 4 commits - kmail/kmkernel.cpp kmail/kmmainwidget.cpp
Christian Mollekopf
mollekopf at kolabsys.com
Sat Jan 24 23:08:47 CET 2015
kmail/kmkernel.cpp | 7 ++++---
kmail/kmmainwidget.cpp | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 6d05d5b90552262c97fca15d8dbb9a5449ce7229
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Sat Jan 24 23:07:27 2015 +0100
Fixed trash folder settings check for resource.
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index c8da600..87a565d 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -1939,7 +1939,7 @@ void KMKernel::checkFolderFromResources( const Akonadi::Collection::List &collec
foreach( const Akonadi::AgentInstance& type, lst ) {
if ( type.status() == Akonadi::AgentInstance::Broken )
continue;
- if ( type.identifier().contains( IMAP_RESOURCE_IDENTIFIER ) ) {
+ if ( type.identifier().contains( IMAP_RESOURCE_IDENTIFIER ) || type.identifier().contains( KOLAB_RESOURCE_IDENTIFIER ) ) {
OrgKdeAkonadiImapSettingsInterface *iface = PimCommon::Util::createImapSettingsInterface( type.identifier() );
if ( iface->isValid() ) {
foreach( const Akonadi::Collection& collection, collectionList ) {
commit 74ccf1c49cc3a9decf762687fc5c8af4a3d3179a
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Sat Jan 24 23:06:59 2015 +0100
Fixed serverside-subscription for resource.
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 6270a60..c8da600 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -1851,7 +1851,7 @@ bool KMKernel::isImapFolder( const Akonadi::Collection &col, bool &isOnline ) co
const Akonadi::AgentInstance agentInstance = Akonadi::AgentManager::self()->instance( col.resource() );
isOnline = agentInstance.isOnline();
- return (agentInstance.type().identifier() == IMAP_RESOURCE_IDENTIFIER);
+ return ((agentInstance.type().identifier() == IMAP_RESOURCE_IDENTIFIER) || (agentInstance.type().identifier() == KOLAB_RESOURCE_IDENTIFIER));
}
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index db3137d..c943887 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -4753,7 +4753,7 @@ void KMMainWidget::slotServerSideSubscription()
if ( kmkernel->isImapFolder( mCurrentFolder->collection(), isImapOnline ) ) {
QDBusInterface iface(
QLatin1String( "org.freedesktop.Akonadi.Resource.")+mCurrentFolder->collection().resource(),
- QLatin1String( "/" ), QLatin1String( "org.kde.Akonadi.Imap.Resource" ),
+ QLatin1String( "/" ), QLatin1String( "org.kde.Akonadi.ImapResourceBase" ),
DBusConnectionPool::threadConnection(), this );
if ( !iface.isValid() ) {
kDebug()<<"Cannot create imap dbus interface";
commit a498546afa9e1f3de7d0de29029d0a124f79319d
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Sat Jan 24 23:05:59 2015 +0100
Fixed crypto status for kolab resource.
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 5ee5ce9..6270a60 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -1773,7 +1773,7 @@ void KMKernel::instanceStatusChanged( const Akonadi::AgentInstance &instance )
if(mResourceCryptoSettingCache.contains(identifier)) {
cryptoStatus = mResourceCryptoSettingCache.value(identifier);
} else {
- if ( identifier.contains( IMAP_RESOURCE_IDENTIFIER ) ) {
+ if ( identifier.contains( IMAP_RESOURCE_IDENTIFIER ) || identifier.contains( KOLAB_RESOURCE_IDENTIFIER )) {
OrgKdeAkonadiImapSettingsInterface *iface = PimCommon::Util::createImapSettingsInterface( identifier );
if ( iface->isValid() ) {
const QString imapSafety = iface->safety();
commit 13fae65bccd67217a6afcfd263347de9b962e292
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Sat Jan 24 23:05:45 2015 +0100
Fixed online/offline setting for kolab resource.
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 8eafc34..5ee5ce9 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -986,6 +986,7 @@ void KMKernel::setAccountStatus(bool goOnline)
const QString identifier( type.identifier() );
if ( identifier.contains( IMAP_RESOURCE_IDENTIFIER ) ||
identifier.contains( POP3_RESOURCE_IDENTIFIER ) ||
+ identifier.contains( KOLAB_RESOURCE_IDENTIFIER ) ||
identifier.contains( QLatin1String("akonadi_maildispatcher_agent") ) ) {
type.setIsOnline( goOnline );
}
More information about the commits
mailing list