[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=2f2acee

The following commit has been merged in the master branch:
commit 2f2acee2b2b9a6281654042a3c75325c41ede44e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Mar 10 22:58:37 2013 +0000

    Fix crashing in join chat room dialog
    
    REVIEW: 109400
    BUG: 316492
---
 KTp/Widgets/join-chat-room-dialog.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/KTp/Widgets/join-chat-room-dialog.cpp b/KTp/Widgets/join-chat-room-dialog.cpp
index 5932b75..42b94eb 100644
--- a/KTp/Widgets/join-chat-room-dialog.cpp
+++ b/KTp/Widgets/join-chat-room-dialog.cpp
@@ -240,7 +240,12 @@ void KTp::JoinChatRoomDialog::removeFavorite()
 
 void KTp::JoinChatRoomDialog::addRecentRoom()
 {
-    QString accountIdentifier = ui->comboBox->currentAccount()->uniqueIdentifier();
+    Tp::AccountPtr account = ui->comboBox->currentAccount();
+    if (!account) {
+        return;
+    }
+
+    QString accountIdentifier = account->uniqueIdentifier();
     QString handle = ui->lineEdit->text();
 
     if (!handle.isEmpty()) {
@@ -311,6 +316,9 @@ void KTp::JoinChatRoomDialog::clearRecentRooms()
 void KTp::JoinChatRoomDialog::getRoomList()
 {
     Tp::AccountPtr account = ui->comboBox->currentAccount();
+    if (!account) {
+        return;
+    }
 
     // Clear the list from previous items
     m_model->clearRoomInfoList();

-- 
ktp-common-internals packaging