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

The following commit has been merged in the master branch:
commit d254bb9779ddf186de33e9482c8668d223339bb5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue May 13 12:32:25 2014 +0200

    Do not load dialogs if account manager is not ready
---
 main-widget.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index a976e43..a07b534 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -207,16 +207,20 @@ void MainWidget::showMessageToUser(const QString& text, const MainWidget::System
 
 void MainWidget::onAddContactRequest()
 {
-    KTp::AddContactDialog *dialog = new KTp::AddContactDialog(m_accountManager, this);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
+    if (m_accountManager->isReady()) {
+        KTp::AddContactDialog *dialog = new KTp::AddContactDialog(m_accountManager, this);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+    }
 }
 
 void MainWidget::onStartChatRequest()
 {
-    KTp::StartChatDialog *dialog = new KTp::StartChatDialog(m_accountManager, this);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
+    if (m_accountManager->isReady()) {
+        KTp::StartChatDialog *dialog = new KTp::StartChatDialog(m_accountManager, this);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+    }
 }
 
 
@@ -254,10 +258,12 @@ void MainWidget::onGenericOperationFinished(Tp::PendingOperation* operation)
 
 void MainWidget::onJoinChatRoomRequested()
 {
-    KTp::JoinChatRoomDialog *dialog = new KTp::JoinChatRoomDialog(m_accountManager);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
+    if (m_accountManager->isReady()) {
+        KTp::JoinChatRoomDialog *dialog = new KTp::JoinChatRoomDialog(m_accountManager);
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
 
-    dialog->show();
+        dialog->show();
+    }
 }
 
 void MainWidget::onMakeCallRequested()

-- 
ktp-contact-list packaging