[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=29c9036

The following commit has been merged in the master branch:
commit 29c9036756284f706d4d354209fefafc125d183c
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Mon Nov 14 22:18:52 2011 +0530

    Update icon as per choosen profile when a new account is added
    BUG: 286303
    Reviewed By : David Edmundson and Martin Klapetek
---
 account-button.cpp | 8 ++++++++
 account-button.h   | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/account-button.cpp b/account-button.cpp
index cca21f8..f924bb7 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -138,6 +138,9 @@ AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
 
     connect(m_account.data(), SIGNAL(currentPresenceChanged(Tp::Presence)),
             this, SLOT(presenceChanged(Tp::Presence)));
+    
+    connect(m_account.data(), SIGNAL(iconNameChanged(QString)), 
+            this, SLOT(updateIcon(QString)));
 
     updateToolTip();
 }
@@ -289,4 +292,9 @@ void AccountButton::resetMenuFormatting()
     }
 }
 
+void AccountButton::updateIcon(const QString &iconPath)
+{
+    setIcon(KIcon(iconPath));
+}
+
 #include "account-button.moc"
diff --git a/account-button.h b/account-button.h
index e142112..4e5e0c8 100644
--- a/account-button.h
+++ b/account-button.h
@@ -64,6 +64,9 @@ public Q_SLOTS:
 
     ///Sets the custom presence message
     void setCustomPresenceMessage(const QString &message);
+    
+    ///Update account item icon when profile type changes
+    void updateIcon(const QString &iconPath);
 
 private:
 

-- 
ktp-contact-list packaging