[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=302536a

The following commit has been merged in the master branch:
commit 302536a239785c72fdb297f95b8f390756bf95fc
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Dec 17 08:38:43 2012 +0100

    Fix the 'Join Chat Room' dialog
    
    REVIEW: 107774
---
 KTp/Widgets/join-chat-room-dialog.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/KTp/Widgets/join-chat-room-dialog.cpp b/KTp/Widgets/join-chat-room-dialog.cpp
index c29c3e8..5932b75 100644
--- a/KTp/Widgets/join-chat-room-dialog.cpp
+++ b/KTp/Widgets/join-chat-room-dialog.cpp
@@ -222,7 +222,7 @@ void KTp::JoinChatRoomDialog::addFavorite()
 void KTp::JoinChatRoomDialog::removeFavorite()
 {
     QString favoriteHandle = ui->listView->currentIndex().data(FavoriteRoomsModel::HandleNameRole).toString();
-    QString favoriteAccount = ui->comboBox->itemData(ui->comboBox->currentIndex()).toString();
+    QString favoriteAccount = ui->comboBox->currentAccount()->uniqueIdentifier();
     QVariantMap room = ui->listView->currentIndex().data(FavoriteRoomsModel::FavoriteRoomRole).value<QVariantMap>();
 
     QString key = favoriteHandle + favoriteAccount;
@@ -240,7 +240,7 @@ void KTp::JoinChatRoomDialog::removeFavorite()
 
 void KTp::JoinChatRoomDialog::addRecentRoom()
 {
-    QString accountIdentifier = ui->comboBox->itemData(ui->comboBox->currentIndex()).toString();
+    QString accountIdentifier = ui->comboBox->currentAccount()->uniqueIdentifier();
     QString handle = ui->lineEdit->text();
 
     if (!handle.isEmpty()) {
@@ -274,7 +274,7 @@ void KTp::JoinChatRoomDialog::addRecentRoom()
 
 void KTp::JoinChatRoomDialog::removeRecentRoom()
 {
-    QString accountIdentifier = ui->comboBox->itemData(ui->comboBox->currentIndex()).toString();
+    QString accountIdentifier = ui->comboBox->currentAccount()->uniqueIdentifier();
     QString handle = ui->recentListWidget->currentItem()->text();
 
     // Remove the entry
@@ -295,7 +295,7 @@ void KTp::JoinChatRoomDialog::removeRecentRoom()
 
 void KTp::JoinChatRoomDialog::clearRecentRooms()
 {
-    QString accountIdentifier = ui->comboBox->itemData(ui->comboBox->currentIndex()).toString();
+    QString accountIdentifier = ui->comboBox->currentAccount()->uniqueIdentifier();
 
     // Remove all entries for the current account
     m_recentRooms.remove(accountIdentifier);

-- 
ktp-common-internals packaging