From 70ea833a01c4a29e4d64f34d38e903c8f073ccbe Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 23 Mar 2018 14:51:56 +0100 Subject: [PATCH] fix merge --- .../handlers/local-conference-list-event-handler.cpp | 6 +++--- src/content/content-manager.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conference/handlers/local-conference-list-event-handler.cpp b/src/conference/handlers/local-conference-list-event-handler.cpp index 35dcead7a..1b1e68154 100644 --- a/src/conference/handlers/local-conference-list-event-handler.cpp +++ b/src/conference/handlers/local-conference-list-event-handler.cpp @@ -73,7 +73,7 @@ void LocalConferenceListEventHandler::subscribeReceived (LinphoneEvent *lev, con IdentityAddress deviceAddr(deviceAddrStr); bctbx_free(deviceAddrStr); - list contents; + list contents; Content rlmiContent; rlmiContent.setContentType(ContentType::Rlmi); @@ -134,7 +134,7 @@ void LocalConferenceListEventHandler::subscribeReceived (LinphoneEvent *lev, con char token[17]; belle_sip_random_token(token, sizeof(token)); content.addHeader("Content-Id", token); - contents.push_back(content); + contents.push_back(&content); // Add entry into the Rlmi content of the notify body Xsd::Rlmi::Resource resource(addr.asStringUriOnly()); @@ -159,7 +159,7 @@ void LocalConferenceListEventHandler::subscribeReceived (LinphoneEvent *lev, con Xsd::Rlmi::serializeList(rlmiBody, list, map); rlmiContent.setBody(rlmiBody.str()); - contents.push_front(rlmiContent); + contents.push_front(&rlmiContent); Content multipart = ContentManager::contentListToMultipart(contents, MultipartBoundaryListEventHandler); LinphoneContent *cContent = L_GET_C_BACK_PTR(&multipart); linphone_event_notify(lev, cContent); diff --git a/src/content/content-manager.cpp b/src/content/content-manager.cpp index d6a46f121..52de5a49e 100644 --- a/src/content/content-manager.cpp +++ b/src/content/content-manager.cpp @@ -70,7 +70,7 @@ Content ContentManager::contentListToMultipart (const list &contents, SalBodyHandler *sbh = (SalBodyHandler *)mpbh; sal_body_handler_set_type(sbh, ContentType::Multipart.getType().c_str()); sal_body_handler_set_subtype(sbh, ContentType::Multipart.getSubType().c_str()); - sal_body_handler_set_content_type_parameter(sbh, "boundary", boundary); + sal_body_handler_set_content_type_parameter(sbh, "boundary", boundary.c_str()); LinphoneContent *cContent = linphone_content_from_sal_body_handler(sbh); Content *content = L_GET_CPP_PTR_FROM_C_OBJECT(cContent); Content returnContent = *content;