[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=d356ea3

The following commit has been merged in the master branch:
commit d356ea32932c982f691d3cfcade7b7e9421dde1b
Author: Diane Trout <diane at ghic.org>
Date:   Fri May 16 20:54:01 2014 -0700

    Add call_contains.patch which should allow creating calls.
---
 debian/changelog                   |  1 +
 debian/patches/call_contains.patch | 15 +++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1c8c262..cadfd6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ktp-call-ui (0.8.1-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.5. No changes needed.
   * Update ktp-common-internals and kde-telepathy-data to 0.8.1
   * Update debian/copyright
+  * Add call_contains.patch which should allow creating calls.
 
  -- Diane Trout <diane at ghic.org>  Sun, 27 Apr 2014 12:32:38 -0700
 
diff --git a/debian/patches/call_contains.patch b/debian/patches/call_contains.patch
new file mode 100644
index 0000000..43f37f9
--- /dev/null
+++ b/debian/patches/call_contains.patch
@@ -0,0 +1,15 @@
+Author: mva
+Description: Backport fix to call deduplication code by Vadim A. Misbakh-Soloviov.
+ Upstream commit 70c319c79aee4c4829587cfa7a53a3e1518378f6
+ 
+--- a/src/call-handler.cpp
++++ b/src/call-handler.cpp
+@@ -83,7 +83,7 @@
+             continue;
+         }
+         //check if any call manager is already handling this channel
+-	if (handledCallChannels.contains(callChannel)) {
++	if (!handledCallChannels.contains(callChannel)) {
+ 	    handledCallChannels.append(callChannel);
+ 	    CallManager *manager = new CallManager(callChannel, this);
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index 83b55df..fbff838 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+call_contains.patch
 dbus_include.patch

-- 
ktp-call-ui packaging