diff options
author | Ken Moore <ken@ixsystems.com> | 2017-04-27 23:46:38 -0400 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2017-04-27 23:46:38 -0400 |
commit | a7c84ffef7e3cd653c179034551003cb150dc204 (patch) | |
tree | d3f0b768c25ad396e8e43b758cd56343cad9b8b5 /src-qt5/core/lumina-desktop/desktop-plugins | |
parent | Fix up the battery icons when charging. (diff) | |
parent | update qnotify for variable output (diff) | |
download | lumina-a7c84ffef7e3cd653c179034551003cb150dc204.tar.gz lumina-a7c84ffef7e3cd653c179034551003cb150dc204.tar.bz2 lumina-a7c84ffef7e3cd653c179034551003cb150dc204.zip |
Merge branch 'master' of github.com:trueos/lumina
Diffstat (limited to 'src-qt5/core/lumina-desktop/desktop-plugins')
-rw-r--r-- | src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.cpp index 0a805252..cd29d5f0 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/rssreader/RSSObjects.cpp @@ -79,6 +79,7 @@ void RSSReader::removeUrl(QString ID){ // PUBLIC SLOTS //================= void RSSReader::syncNow(){ + outstandingURLS.clear(); QStringList urls = hash.keys(); for(int i=0; i<urls.length(); i++){ requestRSS(hash[urls[i]].originalURL); @@ -245,11 +246,12 @@ void RSSReader::replyFinished(QNetworkReply *reply){ //RSS reply RSSchannel info = readRSS(data); //QNetworkReply can be used as QIODevice reply->deleteLater(); //clean up - //Validate the info and announce any changes - if(info.title.isEmpty() || info.link.isEmpty() || info.description.isEmpty()){ - qDebug() << "Missing XML Information:" << url << info.title << info.link << info.description; + //Validate the info and announce any changes (4/21/17 - make the description optional even if RSS format requires it - Ken Moore) + if(info.title.isEmpty() || info.link.isEmpty() ){ + qDebug() << "Missing XML Information:" << url << info.title << info.link; return; } //bad info/read + //Update the bookkeeping elements of the info if(info.timetolive<=0){ info.timetolive = LSession::handle()->DesktopPluginSettings()->value(setprefix+"default_interval_minutes", 60).toInt(); } if(info.timetolive <=0){ info.timetolive = 60; } //error in integer conversion from settings? |