MT#18839 import 5ec9bf2 - b/f:dsm:mod_conference:set callgroup to conference channel

Change-Id: Ic7911598f7df720635b841bc2782b1d556378cd1
(cherry picked from commit 437932f29f)
(cherry picked from commit 6c32fc4ba7)

debian/patches/series

@@ -18,3 +18,4 @@ sipwise/0016-core-made-sems-aware-of-rfc5764-media-types-UDP-TLS-.patch
 sipwise/0017-MT-13599-don-t-create-CF-map-if-CF-is-denied-by-prof.patch
 no_config.patch
 py_sems_path.patch
+sipwise/0002-b-f-dsm-mod_conference-set-callgroup-to-conference-c.patch

debian/patches/sipwise/0002-b-f-dsm-mod_conference-set-callgroup-to-conference-c.patch

@@ -0,0 +1,27 @@
+From 5ec9bf2d042f90f0f29b7de2bb215a8cf6ba7169 Mon Sep 17 00:00:00 2001
+From: Stefan Sayer <stefan.sayer@googlemail.com>
+Date: Fri, 12 Aug 2016 12:35:45 +0200
+Subject: [PATCH 2/6] b/f:dsm:mod_conference:set callgroup to conference
+ channel
+
+---
+ apps/dsm/mods/mod_conference/ModConference.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/apps/dsm/mods/mod_conference/ModConference.cpp b/apps/dsm/mods/mod_conference/ModConference.cpp
+index 0028a14..8b2e2ce 100644
+--- a/apps/dsm/mods/mod_conference/ModConference.cpp
++++ b/apps/dsm/mods/mod_conference/ModConference.cpp
+@@ -117,6 +117,9 @@ static bool ConferenceJoinChannel(DSMConfChannel** dsm_chan,
+ 				  DSMSession* sc_sess,
+ 				  const string& channel_id, 
+ 				  const string& mode) {
++  DBG("changing callgroup for session to %s\n", channel_id.c_str());
++  sess->changeCallgroup(channel_id);
++
+   bool connect_play = false;
+   bool connect_record = false;
+   if (mode.empty()) {
+-- 
+2.6.4 (Apple Git-63)
+