[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=f08f725

The following commit has been merged in the master branch:
commit f08f725b46745e6b7f1e3927f2297e28b623fb70
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Sep 12 20:49:34 2011 +0200

    Fix connections
    
    Reviewed-by: Francesco Nwokeka
---
 avatar-button.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/avatar-button.cpp b/avatar-button.cpp
index 0c9421f..a85fc09 100644
--- a/avatar-button.cpp
+++ b/avatar-button.cpp
@@ -53,9 +53,6 @@ AvatarButton::AvatarButton(QWidget *parent)
     connect(loadFromFileButton, SIGNAL(clicked(bool)),
             this, SLOT(loadAvatarFromFile()));
 
-    connect(loadFromFileAction, SIGNAL(triggered(bool)),
-            this, SLOT(loadAvatarFromFile()));
-
     m_avatarButtonMenu->addAction(loadFromFileAction);
 
     setMenu(m_avatarButtonMenu);
@@ -90,8 +87,10 @@ void AvatarButton::loadAvatar(const Tp::AccountPtr &account)
         avatarAction->setDefaultWidget(avatarMenuItem);
         avatarAction->setData(account->uniqueIdentifier());
 
-        connect(this, SIGNAL(clicked(bool)),
-                this, SLOT(selectAvatarFromAccount()));
+        //this connect is chained to the avatarAction, because avatarAction holds the account id
+        //which is then extracted and used
+        connect(avatarMenuItem, SIGNAL(clicked(bool)),
+                avatarAction, SIGNAL(triggered(bool)));
 
         connect(avatarAction, SIGNAL(triggered(bool)),
                 this, SLOT(selectAvatarFromAccount()));

-- 
ktp-contact-list packaging