From 6b59aef7ce1779668f5e007819f6cc4dcbc67d85 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 27 Dec 2017 11:21:05 +0100 Subject: [PATCH] Add config parameter to enable basic to client group chat room migration. --- src/core/core-chat-room.cpp | 4 +++- tester/rcfiles/marie_rc | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/core-chat-room.cpp b/src/core/core-chat-room.cpp index 8c50269e2..b3512a73b 100644 --- a/src/core/core-chat-room.cpp +++ b/src/core/core-chat-room.cpp @@ -76,7 +76,9 @@ shared_ptr CorePrivate::createBasicChatRoom ( BasicChatRoom *basicChatRoom = new BasicChatRoom(q->getSharedFromThis(), chatRoomId); if ( capabilities & ChatRoom::Capabilities::Migratable && - linphone_core_get_conference_factory_uri(q->getCCore()) + linphone_core_get_conference_factory_uri(q->getCCore()) && + linphone_config_get_bool(linphone_core_get_config(q->getCCore()), + "misc", "enable_basic_to_client_group_chat_room_migration", FALSE) ) chatRoom.reset(new BasicToClientGroupChatRoom(shared_ptr(basicChatRoom))); else diff --git a/tester/rcfiles/marie_rc b/tester/rcfiles/marie_rc index ac2b3e419..8c9b19e3e 100644 --- a/tester/rcfiles/marie_rc +++ b/tester/rcfiles/marie_rc @@ -29,6 +29,7 @@ subscribe=0 [misc] conference_factory_uri=sip:conference-factory@conf.example.org +enable_basic_to_client_group_chat_room_migration=1 [rtp] audio_rtp_port=18070-28000