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

List:       kde-commits
Subject:    [kdepim/akregator_port] akregator2/src: Find the parent folder of the currently selected collection
From:       Frank Osterfeld <osterfeld () kde ! org>
Date:       2013-03-02 16:42:01
Message-ID: 20130302164201.C87B3A60C6 () git ! kde ! org
[Download RAW message or body]

Git commit 3ffb45a76f7ad944e7f1c54161f879d58c58af9e by Frank Osterfeld.
Committed on 02/03/2013 at 17:31.
Pushed by osterfeld into branch 'akregator_port'.

Find the parent folder of the currently selected collection to add a new feed to it

M  +9    -1    akregator2/src/mainwidget.cpp

http://commits.kde.org/kdepim/3ffb45a76f7ad944e7f1c54161f879d58c58af9e

diff --git a/akregator2/src/mainwidget.cpp b/akregator2/src/mainwidget.cpp
index b0d57e6..574f3f9 100644
--- a/akregator2/src/mainwidget.cpp
+++ b/akregator2/src/mainwidget.cpp
@@ -564,12 +564,20 @@ void Akregator2::MainWidget::slotFeedAdd()
     addFeed(QString(), false);
 }
 
+static Akonadi::Collection findParentFolder( const Akonadi::Collection& c ) {
+    if ( !c.isValid() || KRss::FeedCollection( c ).isFolder() )
+        return c;
+    else
+        return c.parentCollection();
+}
+
 void Akregator2::MainWidget::addFeed(const QString& url, bool autoExec)
 {
     std::auto_ptr<CreateFeedCommand> cmd( new CreateFeedCommand( m_session, this ) \
);  cmd->setAutoExecute( autoExec );
     cmd->setUrl( url );
-    cmd->setParentCollection( m_selectionController->selectedCollection() );
+    const Akonadi::Collection parentCollection = findParentFolder( \
m_selectionController->selectedCollection() ); +    cmd->setParentCollection( \
parentCollection );  // FIXME: keep a shared pointer to the default resource in \
MainWidget  d->setUpAndStart( cmd.release() );
 }


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