From 6f072c5dfcac294a12283d4ba93e22d50df9c660 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 6 Mar 2012 11:16:04 +0100
Subject: Let user change his mind enabling block/unblock

---
 src/adblock/blockedelementswidget.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

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

diff --git a/src/adblock/blockedelementswidget.cpp b/src/adblock/blockedelementswidget.cpp
index 58b96299..8c02134f 100644
--- a/src/adblock/blockedelementswidget.cpp
+++ b/src/adblock/blockedelementswidget.cpp
@@ -92,18 +92,25 @@ void BlockedElementsWidget::unblockElement()
     if (!buttonClicked)
         return;
 
-    QString newText = i18n("Unblocked");
-    if (buttonClicked->text() == newText)
-        return;
-
-    QString urlString = buttonClicked->property("URLTOUNBLOCK").toString();
+    QString urlString = QL1S("@@") + buttonClicked->property("URLTOUNBLOCK").toString();
     kDebug() << "urlString: " << urlString;
 
-    buttonClicked->setText(newText);
-    buttonClicked->setIcon(KIcon("dialog-ok"));
+    QString newText = i18n("Unblocked");
+    QString buttonText = buttonClicked->text().remove('&');
+    if (buttonText == newText)
+    {
+        buttonClicked->setText(i18n("Unblock"));
+        buttonClicked->setIcon(KIcon("dialog-ok-apply"));
 
-    AdBlockManager *m = qobject_cast<AdBlockManager *>(_manager);
-    m->addCustomRule(QL1S("@@") + urlString, false);
+        _rulesToAdd.removeOne(urlString);
+    }
+    else
+    {
+        buttonClicked->setText(newText);
+        buttonClicked->setIcon(KIcon("dialog-ok"));
 
+        _rulesToAdd << urlString;
+    }
+    
     _reloadPage = true;
 }
-- 
cgit v1.2.1