[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=8190bee

The following commit has been merged in the master branch:
commit 8190bee2515c98660527b56e8dc7bf428f423cda
Author: Sven Brauch <svenbrauch at googlemail.com>
Date:   Mon Jul 15 16:08:57 2013 +0200

    Wait for the accountManager and accounts to be ready in the chatroom dialog
    
    REVIEW:111511
---
 KTp/Widgets/join-chat-room-dialog.cpp | 36 +++++++++++++++++++++--------------
 KTp/Widgets/join-chat-room-dialog.h   |  2 ++
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/KTp/Widgets/join-chat-room-dialog.cpp b/KTp/Widgets/join-chat-room-dialog.cpp
index 4c2e9bf..5fee7fa 100644
--- a/KTp/Widgets/join-chat-room-dialog.cpp
+++ b/KTp/Widgets/join-chat-room-dialog.cpp
@@ -80,20 +80,8 @@ KTp::JoinChatRoomDialog::JoinChatRoomDialog(Tp::AccountManagerPtr accountManager
     ui->removeRecentPushButton->setIcon(KIcon(QLatin1String("list-remove")));
     ui->clearRecentPushButton->setIcon(KIcon(QLatin1String("edit-clear-list")));
 
-    Tp::AccountPropertyFilterPtr isOnlineFilter = Tp::AccountPropertyFilter::create();
-    isOnlineFilter->addProperty(QLatin1String("online"), true);
-
-    Tp::AccountCapabilityFilterPtr capabilityFilter = Tp::AccountCapabilityFilter::create(
-                Tp::RequestableChannelClassSpecList() << Tp::RequestableChannelClassSpec::textChatroom());
-
-    Tp::AccountFilterPtr filter = Tp::AndFilter<Tp::Account>::create((QList<Tp::AccountFilterConstPtr>() <<
-                                             isOnlineFilter <<
-                                             capabilityFilter));
-
-    ui->comboBox->setAccountSet(accountManager->filterAccounts(filter));
-
-    // apply the filter after populating
-    onAccountSelectionChanged(ui->comboBox->currentIndex());
+    connect(accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)),
+            this, SLOT(onAccountManagerReady(Tp::PendingOperation*)));
 
     // favoritesTab
     m_favoritesProxyModel->setSourceModel(m_favoritesModel);
@@ -143,6 +131,26 @@ KTp::JoinChatRoomDialog::JoinChatRoomDialog(Tp::AccountManagerPtr accountManager
     connect(button(Ok), SIGNAL(clicked(bool)), this, SLOT(addRecentRoom()));
 }
 
+void KTp::JoinChatRoomDialog::onAccountManagerReady(Tp::PendingOperation* operation)
+{
+    Tp::AccountManagerPtr accountManager = Tp::AccountManagerPtr::qObjectCast(
+        qobject_cast<Tp::PendingReady*>(operation)->proxy()
+    );
+    Tp::AccountPropertyFilterPtr isOnlineFilter = Tp::AccountPropertyFilter::create();
+    isOnlineFilter->addProperty(QLatin1String("online"), true);
+
+    Tp::AccountCapabilityFilterPtr capabilityFilter = Tp::AccountCapabilityFilter::create(
+                Tp::RequestableChannelClassSpecList() << Tp::RequestableChannelClassSpec::textChatroom());
+    Tp::AccountFilterPtr filter = Tp::AndFilter<Tp::Account>::create((QList<Tp::AccountFilterConstPtr>() <<
+                                             isOnlineFilter <<
+                                             capabilityFilter));
+
+    ui->comboBox->setAccountSet(accountManager->filterAccounts(filter));
+
+    // apply the filter after populating
+    onAccountSelectionChanged(ui->comboBox->currentIndex());
+}
+
 KTp::JoinChatRoomDialog::~JoinChatRoomDialog()
 {
     delete ui;
diff --git a/KTp/Widgets/join-chat-room-dialog.h b/KTp/Widgets/join-chat-room-dialog.h
index 3c99e78..c996e76 100644
--- a/KTp/Widgets/join-chat-room-dialog.h
+++ b/KTp/Widgets/join-chat-room-dialog.h
@@ -67,6 +67,7 @@ private Q_SLOTS:
     void onFavoriteRoomClicked(const QModelIndex &index);
     void onRecentRoomClicked();
     void onRoomClicked(const QModelIndex &index);
+    void onAccountManagerReady(Tp::PendingOperation*);
 
 private:
     void sendNotificationToUser(const QString& errorMsg);
@@ -84,6 +85,7 @@ private:
     KConfigGroup m_recentRoomsGroup;
     QHash <QString, QStringList> m_recentRooms;
     KCompletion *m_recentComp;
+
 };
 
 } //namespace KTp

-- 
ktp-common-internals packaging