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

The following commit has been merged in the master branch:
commit e8e3a0b19c70256d12bc996698592f7f80507fc8
Author: Ilya Katsnelson <k0009000 at gmail.com>
Date:   Fri Nov 1 02:06:07 2013 +0400

    Fix "query" button being permanently disabled
---
 KTp/Widgets/join-chat-room-dialog.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/KTp/Widgets/join-chat-room-dialog.cpp b/KTp/Widgets/join-chat-room-dialog.cpp
index 3f86005..7b74104 100644
--- a/KTp/Widgets/join-chat-room-dialog.cpp
+++ b/KTp/Widgets/join-chat-room-dialog.cpp
@@ -98,11 +98,6 @@ KTp::JoinChatRoomDialog::JoinChatRoomDialog(Tp::AccountManagerPtr accountManager
     ui->lineEdit->setCompletionObject(m_recentComp);
     ui->lineEdit->setAutoDeleteCompletionObject(true);
 
-    // queryTab
-    if (ui->comboBox->count() > 0) {
-        ui->queryPushButton->setEnabled(true);
-    }
-
     QSortFilterProxyModel *proxyModel = new QSortFilterProxyModel(this);
     proxyModel->setSourceModel(m_model);
     proxyModel->setSortLocaleAware(true);
@@ -150,6 +145,11 @@ void KTp::JoinChatRoomDialog::onAccountManagerReady(Tp::PendingOperation* operat
 
     ui->comboBox->setAccountSet(accountManager->filterAccounts(filter));
 
+    // queryTab
+    if (ui->comboBox->count() > 0) {
+        ui->queryPushButton->setEnabled(true);
+    }
+
     // apply the filter after populating
     onAccountSelectionChanged(ui->comboBox->currentIndex());
 }

-- 
ktp-common-internals packaging