[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-runtime/akregator_port] krsslocal: build against newest krss
From: Frank Osterfeld <frank.osterfeld () kdab ! com>
Date: 2012-03-31 15:16:46
Message-ID: 20120331151646.BF7B7A6139 () git ! kde ! org
[Download RAW message or body]
Git commit 73c984c91d7c9c20162757e3f39ce5f97e97c6b8 by Frank Osterfeld.
Committed on 21/09/2011 at 07:45.
Pushed by osterfeld into branch 'akregator_port'.
build against newest krss
M +1 -1 krsslocal/CMakeLists.txt
M +7 -6 krsslocal/krsslocalresource.cpp
M +0 -1 krsslocal/opmlparser.cpp
http://commits.kde.org/kdepim-runtime/73c984c91d7c9c20162757e3f39ce5f97e97c=
6b8
diff --git a/krsslocal/CMakeLists.txt b/krsslocal/CMakeLists.txt
index 03d3218..1e1db95 100644
--- a/krsslocal/CMakeLists.txt
+++ b/krsslocal/CMakeLists.txt
@@ -61,6 +61,6 @@ qt4_add_dbus_adaptor(krsslocalresource_SRCS
=
kde4_add_executable(akonadi_krsslocal_resource RUN_UNINSTALLED ${krsslocal=
resource_SRCS})
=
-target_link_libraries(akonadi_krsslocal_resource ${KDE4_AKONADI_LIBS} ${QT=
_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} krssresource krs=
s)
+target_link_libraries(akonadi_krsslocal_resource ${KDE4_AKONADI_LIBS} ${QT=
_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${KDE4_KDECORE_LIBS} krss)
=
install(TARGETS akonadi_krsslocal_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/krsslocal/krsslocalresource.cpp b/krsslocal/krsslocalresource.=
cpp
index 861f7a1..2ce1c80 100644
--- a/krsslocal/krsslocalresource.cpp
+++ b/krsslocal/krsslocalresource.cpp
@@ -36,11 +36,12 @@
#include <Akonadi/CollectionModifyJob>
#include <Akonadi/CollectionFetchJob>
#include <Akonadi/CollectionFetchScope>
+#include <Akonadi/AttributeFactory>
+
#include <krss/rssitem.h>
#include <krssresource/krssresource_export.h>
-#include <krss/resourcemanager.h>
#include <krss/feedcollection.h>
-
+#include <krss/feedpropertiescollectionattribute.h>
=
using namespace Akonadi;
using namespace KRssResource;
@@ -56,8 +57,8 @@ KRssLocalResource::KRssLocalResource( const QString &id )
//policy.setCacheTimeout( CACHE_TIMEOUT );
//policy.setIntervalCheckTime( INTERVAL_CHECK_TIME );
=
- KRss::ResourceManager::registerAttributes();
- =
+ AttributeFactory::registerAttribute<KRss::FeedPropertiesCollectionAttrib=
ute>();
+
policy.setInheritFromParent( false );
policy.setSyncOnDemand( false );
policy.setLocalParts( QStringList() << KRss::Item::HeadersPart << KRss::=
Item::ContentPart << Akonadi::Item::FullPayload );
@@ -208,8 +209,8 @@ void KRssLocalResource::slotLoadingComplete(Syndication=
::Loader* loader, Syndica
return;
}
KRss::FeedCollection fc( c );
- if ( fc.title().isEmpty() ) {
- fc.setTitle( feed->title() );
+
+ if ( fc.htmlUrl().isEmpty() ) {
fc.setName( feed->title() );
fc.setDescription( feed->description() );
fc.setHtmlUrl( feed->link() );
diff --git a/krsslocal/opmlparser.cpp b/krsslocal/opmlparser.cpp
index 13975a9..475b9a3 100644
--- a/krsslocal/opmlparser.cpp
+++ b/krsslocal/opmlparser.cpp
@@ -169,7 +169,6 @@ Akonadi::Collection ParsedFeed::toAkonadiCollection() c=
onst
{
KRss::FeedCollection feed;
feed.setRemoteId( d->xmlUrl );
- feed.setTitle( title() );
feed.setXmlUrl( d->xmlUrl );
feed.setHtmlUrl( d->htmlUrl );
feed.setDescription( d->description );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic