[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=0480437

The following commit has been merged in the master branch:
commit 0480437b56185f296232de9e4305e78e3b0b19c0
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Sat May 7 14:50:24 2011 +0200

    Don't change the icon overlay before the presence is really set.
    
    Reviewed-by: Rohan Garg & Francesco Nwokeka
---
 account-button.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/account-button.cpp b/account-button.cpp
index 84ecca1..4b36df8 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -157,12 +157,6 @@ void AccountButton::setAccountStatus(QAction *action)
 
     connect(presenceRequest, SIGNAL(finished(Tp::PendingOperation*)),
             this, SLOT(updateToolTip()));
-
-    QPixmap pixmap = icon().pixmap(32, 32);
-    QPainter painter(&pixmap);
-    KIcon(action->icon()).paint(&painter, 15, 15, 16, 16);
-
-    setIcon(KIcon(pixmap));
 }
 
 void AccountButton::updateToolTip()

-- 
ktp-contact-list packaging