mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 20:48:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge

Browse source
This commit is contained in:
Benjamin Reis 2018-03-23 14:51:56 +01:00
parent 5c3cc21c60
commit 70ea833a01
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/conference/handlers/local-conference-list-event-handler.cpp
View file

@ -73,7 +73,7 @@ void LocalConferenceListEventHandler::subscribeReceived (LinphoneEvent *lev, con
IdentityAddress deviceAddr(deviceAddrStr);
bctbx_free(deviceAddrStr);
list<Content> contents;
list<Content *> 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);

2
src/content/content-manager.cpp
View file

@ -70,7 +70,7 @@ Content ContentManager::contentListToMultipart (const list<Content *> &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;