CVS commit by rytilahti: 

*Don't take only the first found feed but all of them.
*Don't stop checking other link tags when unproper type found (break->continue)

BUG:95717


  M +3 -4      feeddetector.cpp   1.5


--- kdeaddons/konq-plugins/akregator/feeddetector.cpp  #1.4:1.5
@@ -55,10 +55,10 @@ FeedDetectorEntryList FeedDetector::extr
         int pos = reType.search(*it, 0);
         if (pos != -1)
-            type = reHref.cap(1).lower();
+            type = reHref.cap(pos).lower();
 
         // we accept only type attributes indicating a feed or omitted type attributes
         if ( !type.isEmpty() && type != "application/rss+xml" && type != "application/rdf+xml"
              && type != "application/atom+xml" )
-            break;
+            continue;
                 
         QString title;

CVS commit by rytilahti: 

Fix 95717 properly. Now id 50000 is used for "add all feeds", hopefully no site has this many of them...
Any ideas if there's a better way to do this?

CCBUG:95717


  M +1 -1      feeddetector.cpp   1.6
  M +3 -2      konqfeedicon.cpp   1.19


--- kdeaddons/konq-plugins/akregator/feeddetector.cpp  #1.5:1.6
@@ -55,5 +55,5 @@ FeedDetectorEntryList FeedDetector::extr
         int pos = reType.search(*it, 0);
         if (pos != -1)
-            type = reHref.cap(pos).lower();
+            type = reType.cap(1).lower();
 
         // we accept only type attributes indicating a feed or omitted type attributes

--- kdeaddons/konq-plugins/akregator/konqfeedicon.cpp  #1.18:1.19
@@ -85,7 +85,7 @@ void KonqFeedIcon::contextMenu()
             id++;
         }
-        disconnect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int)));
+        //disconnect(m_menu, SIGNAL(activated(int)), this, SLOT(addFeed(int)));
         m_menu->insertSeparator();
-        m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to aKregator"), this, SLOT(addFeeds()) );
+        m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to aKregator"), this, SLOT(addFeeds()), 0, 50000 );
     }
     m_menu->popup(QCursor::pos());
@@ -135,4 +135,5 @@ void KonqFeedIcon::removeFeedIcon()
 void KonqFeedIcon::addFeed(int id)
 {
+    if(id == 50000) return;
     if(akregatorRunning())
         addFeedViaDCOP(fixRelativeURL(m_feedList[id].url(), m_part->baseURL()));