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

The following commit has been merged in the master branch:
commit d9d6c7cfa54bffc0996844244d712ea0d82c74b1
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Jun 2 01:00:12 2011 +0200

    Remove useless Tp::Account::becomeReady() call.
    
    Reviewed-by:
    REVIEW: 101488
---
 main-widget.cpp | 17 ++++-------------
 main-widget.h   |  1 -
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 4b6c248..7c65760 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -372,11 +372,11 @@ void MainWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)
 
 void MainWidget::onNewAccountAdded(const Tp::AccountPtr& account)
 {
-    Tp::PendingReady *ready = account->becomeReady();
+    Q_ASSERT(account->isReady(Tp::Account::FeatureCore));
 
-    connect(ready,
-            SIGNAL(finished(Tp::PendingOperation*)),
-            this, SLOT(onAccountReady(Tp::PendingOperation*)));
+    if (account->connection()) {
+        monitorPresence(account->connection());
+    }
 
     connect(account.data(),
             SIGNAL(connectionChanged(Tp::ConnectionPtr)),
@@ -412,15 +412,6 @@ void MainWidget::onNewAccountAdded(const Tp::AccountPtr& account)
     }
 }
 
-void MainWidget::onAccountReady(Tp::PendingOperation *operation)
-{
-    Tp::AccountPtr account = Tp::AccountPtr::dynamicCast(operation->object());
-
-    if (account->connection()) {
-        monitorPresence(account->connection());
-    }
-}
-
 void MainWidget::monitorPresence(const Tp::ConnectionPtr &connection)
 {
     kDebug();
diff --git a/main-widget.h b/main-widget.h
index 96f228e..a44641d 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -105,7 +105,6 @@ private Q_SLOTS:
     void slotStartFileTransfer();
     void slotUnblockContactTriggered();
     void onAvatarFetched(KJob*);
-    void onAccountReady(Tp::PendingOperation *operation);
     void onAccountsPresenceStatusFiltered();
     void onPresencePublicationRequested(const Tp::Contacts &contacts);
     void monitorPresence(const Tp::ConnectionPtr &connection);

-- 
ktp-contact-list packaging