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

List:       kde-commits
Subject:    extragear/base/konq-plugins/validators
From:       Pino Toscano <pino () kde ! org>
Date:       2009-01-01 1:20:02
Message-ID: 1230772802.654334.24543.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 903984 by pino:

skip frames that are potentially not interesting (eg google's adv frames/iframes)


 M  +16 -2     plugin_validators.cpp  


--- trunk/extragear/base/konq-plugins/validators/plugin_validators.cpp #903983:903984
@@ -478,6 +478,17 @@
   return QString();
 }
 
+bool acceptHTMLFrame(const QString &name)
+{
+  // skip Google's advertising (i)frames
+  if (name.startsWith(QLatin1String("google_ads_frame"))
+      || name.startsWith(QLatin1String("google_ads_iframe"))
+     )
+    return false;
+
+  return true;
+}
+
 void recursiveKHTMLFrames(KHTMLPart* part, SourcesList* sources)
 {
   const QStringList frameNames = part->frameNames();
@@ -486,8 +497,11 @@
   {
     if (KHTMLPart *khtmlpart = qobject_cast<KHTMLPart *>(frame))
     {
-      sources->append(qMakePair(frameNames.at(i), part->documentSource()));
-      recursiveKHTMLFrames(khtmlpart, sources);
+      if (acceptHTMLFrame(frameNames.at(i)))
+      {
+        sources->append(qMakePair(frameNames.at(i), part->documentSource()));
+        recursiveKHTMLFrames(khtmlpart, sources);
+      }
     }
     ++i;
   }
[prev in list] [next in list] [prev in thread] [next in thread]