From 5adb1f04c33cb719bf929d5b386fed48948d0b1e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 2 Mar 2018 18:00:53 +0100 Subject: [PATCH] Removed useless use_cpim rc param --- src/chat/chat-message/chat-message.cpp | 7 ++----- tester/cpim-tester.cpp | 3 --- tester/group_chat_tester.c | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp index ff3fe50d4..7f76b9efe 100644 --- a/src/chat/chat-message/chat-message.cpp +++ b/src/chat/chat-message/chat-message.cpp @@ -663,11 +663,8 @@ void ChatMessagePrivate::send () { if ((currentSendStep &ChatMessagePrivate::Step::Cpim) == ChatMessagePrivate::Step::Cpim) { lInfo() << "Cpim step already done, skipping"; } else { - int defaultValue = !!lp_config_get_string(core->getCCore()->config, "misc", "conference_factory_uri", nullptr); - if (lp_config_get_int(core->getCCore()->config, "sip", "use_cpim", defaultValue) == 1) { - CpimChatMessageModifier ccmm; - ccmm.encode(q->getSharedFromThis(), errorCode); - } + CpimChatMessageModifier ccmm; + ccmm.encode(q->getSharedFromThis(), errorCode); currentSendStep |= ChatMessagePrivate::Step::Cpim; } } diff --git a/tester/cpim-tester.cpp b/tester/cpim-tester.cpp index a98ca133d..e803ae33a 100644 --- a/tester/cpim-tester.cpp +++ b/tester/cpim-tester.cpp @@ -402,7 +402,6 @@ static int fake_im_encryption_engine_process_outgoing_message_cb(LinphoneImEncry static void cpim_chat_message_modifier_base(bool_t use_multipart) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LpConfig *config = linphone_core_get_config(marie->lc); // We use a fake encryption engine just to check the internal content type during the sending/receiving process LinphoneImEncryptionEngine *marie_imee = linphone_im_encryption_engine_new(); @@ -414,8 +413,6 @@ static void cpim_chat_message_modifier_base(bool_t use_multipart) { linphone_core_set_im_encryption_engine(marie->lc, marie_imee); linphone_core_set_im_encryption_engine(pauline->lc, pauline_imee); - lp_config_set_int(config, "sip", "use_cpim", 1); - IdentityAddress paulineAddress(linphone_address_as_string_uri_only(pauline->identity)); shared_ptr marieRoom = marie->lc->cppPtr->getOrCreateBasicChatRoom(paulineAddress); marieRoom->allowCpim(true); diff --git a/tester/group_chat_tester.c b/tester/group_chat_tester.c index a4953f96b..20295fb6e 100644 --- a/tester/group_chat_tester.c +++ b/tester/group_chat_tester.c @@ -135,7 +135,6 @@ static void configure_core_for_conference (LinphoneCore *core, const char* usern char *factoryUri = linphone_address_as_string(factoryAddr); linphone_core_set_conference_factory_uri(core, factoryUri); bctbx_free(factoryUri); - linphone_config_set_int(linphone_core_get_config(core), "sip", "use_cpim", 1); linphone_core_set_linphone_specs(core, "groupchat"); }