[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim/work/akonadi-ports] akregator: remove active resource
From:       Frank Osterfeld <frank.osterfeld () kdab ! com>
Date:       2011-09-20 22:36:09
Message-ID: 20110920223609.DD4A1A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 027d284d96c984afbdfe7664943472662a6a6633 by Frank Osterfeld.
Committed on 20/09/2011 at 23:23.
Pushed by osterfeld into branch 'work/akonadi-ports'.

remove active resource config key. we support n resources, not just one.

M  +0    -4    akregator/interfaces/akregator.kcfg
M  +8    -2    akregator/src/setupakonadicommand.cpp

http://commits.kde.org/kdepim/027d284d96c984afbdfe7664943472662a6a6633

diff --git a/akregator/interfaces/akregator.kcfg b/akregator/interfaces/akregator.kcfg
index ecd02f6..49a38bf 100644
--- a/akregator/interfaces/akregator.kcfg
+++ b/akregator/interfaces/akregator.kcfg
@@ -205,10 +205,6 @@
   </entry>
 </group>
 <group name="Advanced" >
-  <entry key="Active Akonadi Resource" type="String" >
-   <label>Active Akonadi Resource</label>
-   <whatsthis>The Akonadi resource currently used by the application</whatsthis>
-  </entry>
   <entry key="Delay Mark Read" name="UseMarkReadDelay" type="Bool" >
    <whatsthis>Whether to delay before marking an article as read upon selecting it.</whatsthis>
    <default>true</default>
diff --git a/akregator/src/setupakonadicommand.cpp b/akregator/src/setupakonadicommand.cpp
index 3585f71..c589138 100644
--- a/akregator/src/setupakonadicommand.cpp
+++ b/akregator/src/setupakonadicommand.cpp
@@ -92,7 +92,9 @@ void SetUpAkonadiCommand::setMainWidget( QWidget* widget ) {
 }
 
 void SetUpAkonadiCommand::Private::dialogAccepted() {
+#ifdef KRSS_PORT_DISABLED
     Settings::setActiveAkonadiResource( agentWidget->currentAgentInstance().identifier() );
+#endif
     q->emitResult();
 }
 
@@ -108,7 +110,9 @@ void SetUpAkonadiCommand::Private::resourceCreated( KJob* j ) {
         return;
     }
     assert( job->instance().isValid() );
+#ifdef KRSS_PORT_DISABLED
     Settings::setActiveAkonadiResource( job->instance().identifier() );
+#endif
     q->emitResult();
 }
 
@@ -127,13 +131,13 @@ void SetUpAkonadiCommand::Private::startSetup() {
     ResourceManager::self()->forceUpdate();
 
     const QStringList resources = KRss::ResourceManager::self()->identifiers();
-
+#ifdef KRSS_PORT_DISABLED
     const QString id = Settings::activeAkonadiResource();
     if ( resources.contains( id ) ) {
         guard.emitResult();
         return;
     }
-
+#endif
     if ( resources.isEmpty() ) {
        const QString typeId = QLatin1String( "akonadi_opml_rss_resource" );
        const AgentType type = AgentManager::self()->type( typeId );
@@ -151,7 +155,9 @@ void SetUpAkonadiCommand::Private::startSetup() {
     }
 
     if ( resources.size() == 1 ) {
+#ifdef KRSS_PORT_DISABLED
         Settings::setActiveAkonadiResource( resources.first() );
+#endif
         guard.emitResult();
         return;
     }


[prev in list] [next in list] [prev in thread] [next in thread]