[SCM] ktp-call-ui packaging branch, master, updated. debian/0.7.0-1-17-gfb04596

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git;a=commitdiff;h=a361299

The following commit has been merged in the master branch:
commit a36129924acc1623ac6d355f5376cdfbdd370a5a
Author: Diane Trout <diane at ghic.org>
Date:   Sun Apr 27 12:32:32 2014 -0700

    Imported Upstream version 0.8.1
---
 CMakeLists.txt       |  2 +-
 po/cs/ktp-call-ui.po | 10 +++++-----
 src/call-handler.cpp |  8 +++++---
 src/call-handler.h   |  2 ++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a85e1ab..c360119 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(ktp-call-ui)
 
-set(KTP_CALL_UI_VERSION "0.8.0")
+set(KTP_CALL_UI_VERSION "0.8.1")
 set(IS_KTP_INTERNAL_MODULE TRUE)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
diff --git a/po/cs/ktp-call-ui.po b/po/cs/ktp-call-ui.po
index 970eef4..5ed39e4 100644
--- a/po/cs/ktp-call-ui.po
+++ b/po/cs/ktp-call-ui.po
@@ -1,6 +1,6 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák <vit at pelcak.org>, 2011, 2012, 2013.
+# Vít Pelčák <vit at pelcak.org>, 2011, 2012, 2013, 2014.
 # Tomáš Chvátal <tomas.chvatal at gmail.com>, 2012, 2013.
 #
 msgid ""
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: 
"
 "Report-Msgid-Bugs-To: http://bugs.kde.org
"
 "POT-Creation-Date: 2013-03-27 10:06+0100
"
-"PO-Revision-Date: 2013-04-09 17:00+0200
"
-"Last-Translator: Vit Pelcak <vit at pelcak.org>
"
+"PO-Revision-Date: 2014-04-10 13:45+0200
"
+"Last-Translator: Vít Pelčák <vit at pelcak.org>
"
 "Language-Team: Czech <kde-i18n-doc at kde.org>
"
 "Language: cs
"
 "MIME-Version: 1.0
"
@@ -242,11 +242,11 @@ msgstr "Hlavní nástrojová lišta"
 
 #: src/dialout/dialout-widget.cpp:78
 msgid "Loading accounts..."
-msgstr "Nahrávám účty..."
+msgstr "Načítám účty..."
 
 #: src/dialout/dialout-widget.cpp:98
 msgid "Error: Failed to load accounts"
-msgstr "Chyba: nelze nahrát účty"
+msgstr "Chyba: nelze načíst účty"
 
 #: src/dialout/dialout-widget.cpp:125
 msgid ""
diff --git a/src/call-handler.cpp b/src/call-handler.cpp
index f4ced53..2581bb3 100644
--- a/src/call-handler.cpp
+++ b/src/call-handler.cpp
@@ -82,9 +82,11 @@ void CallHandler::handleChannels(const Tp::MethodInvocationContextPtr<> & contex
             kDebug() << "Channel is not a Call channel. Ignoring";
             continue;
         }
-
-        //TODO handle multiple calls - queue them if there is an active one
-        CallManager *manager = new CallManager(callChannel, this);
+        //check if any call manager is already handling this channel
+	if (handledCallChannels.contains(callChannel)) {
+	    handledCallChannels.append(callChannel);
+	    CallManager *manager = new CallManager(callChannel, this);
+	}
     }
 
     context->setFinished();
diff --git a/src/call-handler.h b/src/call-handler.h
index 5fea003..9767d79 100644
--- a/src/call-handler.h
+++ b/src/call-handler.h
@@ -34,6 +34,8 @@ public:
                                 const QList<Tp::ChannelRequestPtr> & requestsSatisfied,
                                 const QDateTime & userActionTime,
                                 const Tp::AbstractClientHandler::HandlerInfo & handlerInfo);
+private:
+    QList<Tp::CallChannelPtr> handledCallChannels;
 };
 
 #endif

-- 
ktp-call-ui packaging