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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/wlm
From:       Roman Jarosz <kedgedev () gmail ! com>
Date:       2009-05-31 22:44:12
Message-ID: 1243809852.999342.15948.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 976116 by rjarosz:

Don't overwrite isBlocked function.


 M  +2 -2      wlmaccount.cpp  
 M  +1 -1      wlmaccount.h  
 M  +1 -1      wlmcontact.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/wlm/wlmaccount.cpp #976115:976116
@@ -1245,14 +1245,14 @@
     return m_server;
 }
 
-bool WlmAccount::isBlocked(const QString& passport) const
+bool WlmAccount::isContactBlocked(const QString& passport) const
 {
     return (isOnBlockList(passport) || (blockUnknownUsers() && !isOnAllowList(passport)));
 }
 
 void WlmAccount::blockContact(const QString& passport, bool block)
 {
-    if (!isConnected() || isBlocked(passport) == block)
+    if (!isConnected() || isContactBlocked(passport) == block)
         return;
 
     if (block)
--- trunk/KDE/kdenetwork/kopete/protocols/wlm/wlmaccount.h #976115:976116
@@ -109,7 +109,7 @@
     // TODO: Check BPL
     bool blockUnknownUsers() const { return true; }
 
-    bool isBlocked(const QString& passport) const;
+    bool isContactBlocked(const QString& passport) const;
 
     void blockContact(const QString& passport, bool block);
 
--- trunk/KDE/kdenetwork/kopete/protocols/wlm/wlmcontact.cpp #976115:976116
@@ -186,7 +186,7 @@
     QList<KAction*> *actions = new QList<KAction*>();
 
     m_actionBlockContact->setEnabled(m_account->isConnected());
-    m_actionBlockContact->setChecked(m_account->isBlocked(contactId()));
+    m_actionBlockContact->setChecked(m_account->isContactBlocked(contactId()));
     actions->append(m_actionBlockContact);
     actions->append(m_actionShowProfile);
 

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