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

List:       kde-commits
Subject:    [phoneblocker] frontends/blackberry/headless: Do not add the numbers back if we already remove the l
From:       Laszlo Papp <lpapp () kde ! org>
Date:       2015-01-20 9:52:46
Message-ID: E1YDVUM-0000AY-Ut () scm ! kde ! org
[Download RAW message or body]

Git commit 114f9d194656e50ed7ead2ba67442356af7f3590 by Laszlo Papp.
Committed on 20/01/2015 at 09:48.
Pushed by lpapp into branch 'master'.

Do not add the numbers back if we already remove the last block condition

M  +2    -3    frontends/blackberry/headless/blocker.cpp

http://commits.kde.org/phoneblocker/114f9d194656e50ed7ead2ba67442356af7f3590

diff --git a/frontends/blackberry/headless/blocker.cpp \
b/frontends/blackberry/headless/blocker.cpp index c3812f7..4422c0e 100644
--- a/frontends/blackberry/headless/blocker.cpp
+++ b/frontends/blackberry/headless/blocker.cpp
@@ -71,9 +71,8 @@ void Blocker::unblock(const QString &phoneNumber, bool call, bool \
sms)  m_blockedNumbers.remove(phoneNumber);
         else {
             QPair<bool, bool> callSmsPair = m_blockedNumbers.value(phoneNumber);
-            if ((callSmsPair.first and call) or (callSmsPair.second and sms))
-                m_blockedNumbers.remove(phoneNumber);
-            m_blockedNumbers[phoneNumber] = qMakePair(call ? !call : \
callSmsPair.first, sms ? !sms : callSmsPair.second); +            if \
((callSmsPair.first and call) or (callSmsPair.second and sms)) \
m_blockedNumbers.remove(phoneNumber); +            else m_blockedNumbers[phoneNumber] \
= qMakePair(call ? !call : callSmsPair.first, sms ? !sms : callSmsPair.second);  }
         QSettings settings(m_authorName, m_applicationName);
         settings.setValue(m_blockedNumbersKey, \
QVariant::fromValue<BlockedNumbers>(m_blockedNumbers));


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