FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-18 20:01:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

One more fix for #150.

Browse Source
This commit is contained in:
Martin Rotter 2016-03-18 09:42:02 +01:00
parent 5f4ec58454
commit 2b98065da0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network-web/networkfactory.cpp
View File

@ -44,7 +44,10 @@ QStringList NetworkFactory::extractFeedLinksFromHtmlPage(const QUrl &url, const
QString href_attribute = rx_href.capturedTexts().at(0); QString href_attribute = rx_href.capturedTexts().at(0);
QString feed_link = href_attribute.mid(6, href_attribute.size() - 7); QString feed_link = href_attribute.mid(6, href_attribute.size() - 7);
if (feed_link.startsWith(QL1C('/'))) { if (feed_link.startsWith(QL1S("//"))) {
feed_link = QString(URI_SCHEME_HTTP) + feed_link.mid(2);
}
else if (feed_link.startsWith(QL1C('/'))) {
feed_link = url.toString(QUrl::RemovePath | QUrl::RemoveQuery | QUrl::StripTrailingSlash) + feed_link; feed_link = url.toString(QUrl::RemovePath | QUrl::RemoveQuery | QUrl::StripTrailingSlash) + feed_link;
} }

1
src/network-web/webview.cpp
View File

@ -208,7 +208,6 @@ void WebView::initializeActions() {
m_actionSaveImageAs = pageAction(QWebPage::DownloadImageToDisk); m_actionSaveImageAs = pageAction(QWebPage::DownloadImageToDisk);
m_actionSaveImageAs->setParent(this); m_actionSaveImageAs->setParent(this);
m_actionSavePageAs = new QAction(qApp->icons()->fromTheme(QSL("document-download")), tr("Save page as..."), this); m_actionSavePageAs = new QAction(qApp->icons()->fromTheme(QSL("document-download")), tr("Save page as..."), this);
#if QT_VERSION >= 0x040800 #if QT_VERSION >= 0x040800