[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=18d1930

The following commit has been merged in the master branch:
commit 18d1930c9aed1cd4130adb963f21f9b03b1089ef
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Apr 12 17:31:44 2013 +0100

    Check account as well as target ID when searching for existing channels
    
    BUG: 317909
    REVIEW: 109979
    FIXED-IN: 0.6.1
---
 app/chat-window.cpp       | 7 ++++---
 app/chat-window.h         | 2 +-
 app/telepathy-chat-ui.cpp | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 17300d8..c047235 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -168,7 +168,7 @@ void ChatWindow::focusChat(ChatTab *tab)
     m_tabWidget->setCurrentWidget(tab);
 }
 
-ChatTab* ChatWindow::getTab(const Tp::TextChannelPtr& incomingTextChannel)
+ChatTab* ChatWindow::getTab(const Tp::AccountPtr &account, const Tp::TextChannelPtr &incomingTextChannel)
 {
     ChatTab *match = 0;
 
@@ -184,8 +184,9 @@ ChatTab* ChatWindow::getTab(const Tp::TextChannelPtr& incomingTextChannel)
             Q_ASSERT(auxChatTab);
 
             // check for duplicate chat
-            if (auxChatTab->textChannel()->targetId() == incomingTextChannel->targetId()
-            && auxChatTab->textChannel()->targetHandleType() == incomingTextChannel->targetHandleType()) {
+            if (auxChatTab->account() == account
+                && auxChatTab->textChannel()->targetId() == incomingTextChannel->targetId()
+                && auxChatTab->textChannel()->targetHandleType() == incomingTextChannel->targetHandleType()) {
                 match = auxChatTab;
             }
         }
diff --git a/app/chat-window.h b/app/chat-window.h
index f7c51b3..47316a4 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -56,7 +56,7 @@ public:
     /** retrieves tab with given textChannel if it exists
      * @param incomingTextChannel textChannel to search for
      */
-    ChatTab* getTab(const Tp::TextChannelPtr &incomingTextChannel);
+    ChatTab* getTab(const Tp::AccountPtr &account, const Tp::TextChannelPtr &incomingTextChannel);
     ChatTab* getCurrentTab();
 
     void focusChat(ChatTab *tab);
diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index b604f1c..c005296 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -119,7 +119,7 @@ void TelepathyChatUi::handleChannels(const Tp::MethodInvocationContextPtr<> & co
     //search for any tabs which are already handling this channel.
     for (int i = 0; i < m_chatWindows.count() && !tabFound; ++i) {
         ChatWindow *window = m_chatWindows.at(i);
-        ChatTab* tab = window->getTab(textChannel);
+        ChatTab* tab = window->getTab(account, textChannel);
 
         if (tab) {
             tabFound = true;

-- 
ktp-text-ui packaging