From kde-commits  Sat Dec 05 20:15:46 2009
From: Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date: Sat, 05 Dec 2009 20:15:46 +0000
To: kde-commits
Subject: KDE/kdepim/akregator/src
Message-Id: <1260044146.694978.14415.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=126004415808319

SVN commit 1059114 by osterfeld:

merge from 4.3 branch
------------------------------------------------------------------------
r1011091 | osterfeld | 2009-08-14 00:28:58 +0200 (Fri, 14 Aug 2009) | 5 lines

On the quest to more firefox compliance:
Fix adding feeds via feed:// urls

BUG:165160
CCBUG:127322
------------------------------------------------------------------------


 M  +7 -1      addfeeddialog.cpp  


--- trunk/KDE/kdepim/akregator/src/addfeeddialog.cpp #1059113:1059114
@@ -87,11 +87,17 @@
     m_feed = new Feed( Kernel::self()->storage() );
 
     // HACK: make weird wordpress links ("feed:http://foobar/rss") work
-    if (feedUrl.startsWith(QLatin1String("feed:")))
+    if (feedUrl.startsWith(QLatin1String("feed:http")))
         feedUrl = feedUrl.right( feedUrl.length() - 5 );
 
     if (feedUrl.indexOf(":/") == -1)
         feedUrl.prepend("http://");
+
+    KUrl asUrl( feedUrl );
+    if ( asUrl.scheme() == QLatin1String("feed") ) {
+        asUrl.setScheme( "http" );
+        feedUrl = asUrl.url();
+    }
     m_feed->setXmlUrl(feedUrl);
 
     widget->statusLabel->setText( i18n("Downloading %1", feedUrl) );