diff -Nru ktp-call-ui-0.8.0/CMakeLists.txt ktp-call-ui-0.8.1/CMakeLists.txt --- ktp-call-ui-0.8.0/CMakeLists.txt 2014-03-11 21:44:32.000000000 +0000 +++ ktp-call-ui-0.8.1/CMakeLists.txt 2014-04-25 16:36:04.000000000 +0000 @@ -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 -Nru ktp-call-ui-0.8.0/debian/changelog ktp-call-ui-0.8.1/debian/changelog --- ktp-call-ui-0.8.0/debian/changelog 2014-04-01 12:58:11.000000000 +0000 +++ ktp-call-ui-0.8.1/debian/changelog 2014-04-28 17:32:51.000000000 +0000 @@ -1,3 +1,15 @@ +ktp-call-ui (0.8.1-0ubuntu0.1) trusty; urgency=medium + + * No change backport to trusty (LP: #1313611) + + -- Rohan Garg Mon, 28 Apr 2014 19:32:51 +0200 + +ktp-call-ui (0.8.1-0ubuntu1) utopic; urgency=medium + + * New upstream release + + -- Rohan Garg Mon, 28 Apr 2014 17:08:35 +0200 + ktp-call-ui (0.8.0-0ubuntu1) trusty; urgency=medium * New upstream release (LP: #1297351) diff -Nru ktp-call-ui-0.8.0/debian/control ktp-call-ui-0.8.1/debian/control --- ktp-call-ui-0.8.0/debian/control 2014-04-01 12:57:56.000000000 +0000 +++ ktp-call-ui-0.8.1/debian/control 2014-04-28 15:06:46.000000000 +0000 @@ -11,7 +11,7 @@ libtelepathy-qt4-dev (>= 0.9.3), libqtgstreamer-dev (>= 0.10.2), pkg-config, - libktpcommoninternalsprivate-dev (>= 0.8.0), + libktpcommoninternalsprivate-dev (>= 0.8.1), libtelepathy-farstream-0.4-dev (>= 0.4.0), libfarstream-0.1-dev (>= 0.1.2) Standards-Version: 3.9.4 diff -Nru ktp-call-ui-0.8.0/po/cs/ktp-call-ui.po ktp-call-ui-0.8.1/po/cs/ktp-call-ui.po --- ktp-call-ui-0.8.0/po/cs/ktp-call-ui.po 2014-03-11 21:43:49.000000000 +0000 +++ ktp-call-ui-0.8.1/po/cs/ktp-call-ui.po 2014-04-25 16:35:21.000000000 +0000 @@ -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 , 2011, 2012, 2013. +# Vít Pelčák , 2011, 2012, 2013, 2014. # Tomáš Chvátal , 2012, 2013. # msgid "" @@ -8,8 +8,8 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2013-03-27 10:06+0100\n" -"PO-Revision-Date: 2013-04-09 17:00+0200\n" -"Last-Translator: Vit Pelcak \n" +"PO-Revision-Date: 2014-04-10 13:45+0200\n" +"Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -242,11 +242,11 @@ #: 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 -Nru ktp-call-ui-0.8.0/src/call-handler.cpp ktp-call-ui-0.8.1/src/call-handler.cpp --- ktp-call-ui-0.8.0/src/call-handler.cpp 2014-03-11 21:43:41.000000000 +0000 +++ ktp-call-ui-0.8.1/src/call-handler.cpp 2014-04-25 16:35:14.000000000 +0000 @@ -82,9 +82,11 @@ 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 -Nru ktp-call-ui-0.8.0/src/call-handler.h ktp-call-ui-0.8.1/src/call-handler.h --- ktp-call-ui-0.8.0/src/call-handler.h 2014-03-11 21:43:41.000000000 +0000 +++ ktp-call-ui-0.8.1/src/call-handler.h 2014-04-25 16:35:14.000000000 +0000 @@ -34,6 +34,8 @@ const QList & requestsSatisfied, const QDateTime & userActionTime, const Tp::AbstractClientHandler::HandlerInfo & handlerInfo); +private: + QList handledCallChannels; }; #endif