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

List:       kde-commits
Subject:    [kdepim/akregator_port] krsslocal: FIX to avoid empty names of collections
From:       Alessandro Cosentino <cosenal () gmail ! com>
Date:       2012-02-20 21:25:55
Message-ID: 20120220212556.000E9A610C () git ! kde ! org
[Download RAW message or body]

Git commit 47cf670de52774fce0d6059d18209291397bc1a3 by Alessandro Cosentino.
Committed on 27/09/2011 at 21:09.
Pushed by cgiboudeaux into branch 'akregator_port'.

FIX to avoid empty names of collections

M  +4    -4    krsslocal/krsslocalresource.cpp
M  +1    -1    krsslocal/opmlparser.cpp

http://commits.kde.org/kdepim/47cf670de52774fce0d6059d18209291397bc1a3

diff --git a/krsslocal/krsslocalresource.cpp b/krsslocal/krsslocalresource.cpp
index e973a6e..c6ff705 100644
--- a/krsslocal/krsslocalresource.cpp
+++ b/krsslocal/krsslocalresource.cpp
@@ -127,7 +127,7 @@ void KRssLocalResource::retrieveCollections()
     Collection top;
     top.setParent( Collection::root() );
     top.setRemoteId( path );
-    top.setName( titleOpml );
+    top.setName( i18n("Local Feeds") );
     top.setContentMimeTypes( QStringList( Collection::mimeType() ) );
 
     top.attribute<Akonadi::EntityDisplayAttribute>( Collection::AddIfMissing \
)->setDisplayName( titleOpml ); @@ -152,21 +152,21 @@ Collection::List \
KRssLocalResource::buildCollectionTree( QList<shared_ptr<const  foreach(const \
shared_ptr<const ParsedNode> parsedNode, listOfNodes) {  if (!parsedNode->isFolder()) \
                {
 	    Collection c = (static_pointer_cast<const \
ParsedFeed>(parsedNode))->toAkonadiCollection(); +	    \
c.attribute<Akonadi::EntityDisplayAttribute>( Collection::AddIfMissing \
)->setDisplayName( parsedNode->title() );  c.setContentMimeTypes( \
c.contentMimeTypes() );  c.setParent( parent );
-
 	    c.setCachePolicy( policy );
 	    
 	    //it customizes the collection with an rss icon
 	    c.attribute<Akonadi::EntityDisplayAttribute>( Collection::AddIfMissing \
                )->setIconName( QString("application-rss+xml") );
-	    
+	        
 	    list << c;
 	}
 	else {
 	    shared_ptr<const ParsedFolder> parsedFolder = static_pointer_cast<const \
ParsedFolder>(parsedNode);  Collection folder;
 	    folder.setParent( parent );
-	    folder.setName( parsedFolder->title() );
+	    folder.setName( i18n("T_%1", parsedFolder->title()) );
             folder.attribute<Akonadi::EntityDisplayAttribute>( \
                Collection::AddIfMissing )->setDisplayName( parsedFolder->title() );
 	    folder.setRemoteId( Settings::self()->path() + parsedFolder->title() );
 	    folder.setContentMimeTypes( QStringList( Collection::mimeType() ) );
diff --git a/krsslocal/opmlparser.cpp b/krsslocal/opmlparser.cpp
index d08d8c3..437808b 100644
--- a/krsslocal/opmlparser.cpp
+++ b/krsslocal/opmlparser.cpp
@@ -172,7 +172,7 @@ Akonadi::Collection ParsedFeed::toAkonadiCollection() const
     feed.setHtmlUrl( d->htmlUrl );
     feed.setDescription( d->description );
     feed.setFeedType( d->type );
-    feed.setName( title() );
+    feed.setName( i18n("T_%1", title()) );
     feed.setContentMimeTypes( QStringList( QLatin1String("application/rss+xml") ) );
     return feed;
 }


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