From 1c99aeb13ff4304d45183e81c70c99d33e854d59 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 14 Jan 2010 11:37:45 +0100
Subject: Cleaning again (the morning after) the adblock thing.. :) Removed the
 "options" part. Will be rewritten in rekonq 0.5 together with the UI..

---
 src/adblock/adblockmanager.cpp | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

(limited to 'src/adblock/adblockmanager.cpp')

diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index 5290d561..c2a42f0b 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -83,24 +83,23 @@ void AdBlockManager::loadSettings()
 
             if (name.startsWith(QLatin1String("Filter")))
             {
-                if(url.startsWith("!"))
-                {
-                    continue;
-                }
-                
-                if(url.startsWith("@@"))
-                {
-                    AdBlockRule rule( url.mid(2) );
-                    _whiteList << rule;
-                    continue;
-                }
-                
-                if(url.startsWith("##"))
-                {
-                    _hideList << url.mid(2);
-                }
-                else
-                {
+                if(!url.startsWith("!"))
+                {           
+                    // white rules
+                    if(url.startsWith("@@"))
+                    {
+                        AdBlockRule rule( url.mid(2) );
+                        _whiteList << rule;
+                        continue;
+                    }
+                    
+                    // hide (CSS) rules
+                    if(url.startsWith("##"))
+                    {
+                        _hideList << url.mid(2);
+                        continue;
+                    }
+
                     AdBlockRule rule( url );
                     _blackList << rule;
                 }
-- 
cgit v1.2.1