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

Use the correct name for the conference event package.

Browse source
This commit is contained in:
Ghislain MARY 2017-09-29 15:42:27 +02:00
parent 127d5aa728
commit 96bd4b35e0
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/event.c
View file

@ -84,7 +84,7 @@ static LinphoneEvent * linphone_event_new_base(LinphoneCore *lc, LinphoneSubscri
lev->dir=dir;
lev->op=op;
lev->name=ms_strdup(name);
if (strcmp(lev->name, "Conference") == 0)
if (strcmp(lev->name, "conference") == 0)
lev->internal = TRUE;
sal_op_set_user_pointer(lev->op,lev);
return lev;

2
coreapi/linphonecore.c
View file

@ -2123,7 +2123,7 @@ static void linphone_core_internal_notify_received(LinphoneCore *lc, LinphoneEve
static void linphone_core_internal_subscription_state_changed(LinphoneCore *lc, LinphoneEvent *lev, LinphoneSubscriptionState state) {
if (strcasecmp(linphone_event_get_name(lev), "Presence") == 0) {
linphone_friend_list_subscription_state_changed(lc, lev, state);
} else if (strcmp(linphone_event_get_name(lev), "Conference") == 0) {
} else if (strcmp(linphone_event_get_name(lev), "conference") == 0) {
}
}

2
src/conference/local-conference-event-handler.cpp
View file

@ -157,7 +157,7 @@ string LocalConferenceEventHandlerPrivate::createNotifyParticipantAdmined(const
void LocalConferenceEventHandlerPrivate::sendNotify(string notify, const Address &addr) {
LinphoneAddress *cAddr = linphone_address_new(addr.asString().c_str());
LinphoneEvent *lev = linphone_core_create_notify(core, cAddr, "Conference");
LinphoneEvent *lev = linphone_core_create_notify(core, cAddr, "conference");
linphone_address_unref(cAddr);
doNotify(notify, lev);
}

2
src/conference/remote-conference-event-handler.cpp
View file

@ -60,7 +60,7 @@ void RemoteConferenceEventHandler::subscribe(const Address &addr) {
L_D();
d->confAddress = addr;
LinphoneAddress *lAddr = linphone_address_new(d->confAddress.asString().c_str());
d->lev = linphone_core_create_subscribe(d->core, lAddr, "Conference", 600);
d->lev = linphone_core_create_subscribe(d->core, lAddr, "conference", 600);
linphone_address_unref(lAddr);
linphone_event_set_internal(d->lev, TRUE);
linphone_event_set_user_data(d->lev, this);

10
tester/conference-event-tester.cpp
View file

@ -742,7 +742,7 @@ void send_first_notify() {
localConf.addParticipant(bobAddr, &params, false);
shared_ptr<Participant> alice = localConf.addParticipant(aliceAddr, &params, false);
alice->setAdmin(true);
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "Conference");
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "conference");
string notify = localConf.getEventHandler()->subscribeReceived(lev);
tester.handler->notifyReceived(notify);
linphone_event_unref(lev);
@ -780,7 +780,7 @@ void send_added_notify() {
Address frankAddr(frankAddrStr);
bctbx_free(frankAddrStr);
linphone_address_unref(cFrankAddr);
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "Conference");
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "conference");
CallSessionParams params;
localConf.addParticipant(bobAddr, &params, false);
@ -834,7 +834,7 @@ void send_removed_notify() {
localConf.addParticipant(bobAddr, &params, false);
shared_ptr<Participant> alice = localConf.addParticipant(aliceAddr, &params, false);
alice->setAdmin(true);
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "Conference");
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "conference");
string notify = localConf.getEventHandler()->subscribeReceived(lev);
tester.handler->notifyReceived(notify);
linphone_event_unref(lev);
@ -880,7 +880,7 @@ void send_admined_notify() {
localConf.addParticipant(bobAddr, &params, false);
shared_ptr<Participant> alice = localConf.addParticipant(aliceAddr, &params, false);
alice->setAdmin(true);
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "Conference");
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "conference");
string notify = localConf.getEventHandler()->subscribeReceived(lev);
tester.handler->notifyReceived(notify);
linphone_event_unref(lev);
@ -927,7 +927,7 @@ void send_unadmined_notify() {
localConf.addParticipant(bobAddr, &params, false);
shared_ptr<Participant> alice = localConf.addParticipant(aliceAddr, &params, false);
alice->setAdmin(true);
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "Conference");
LinphoneEvent *lev = linphone_core_create_notify(pauline->lc, marie->identity, "conference");
string notify = localConf.getEventHandler()->subscribeReceived(lev);
tester.handler->notifyReceived(notify);
linphone_event_unref(lev);

2
tester/eventapi_tester.c
View file

@ -82,7 +82,7 @@ void linphone_subscription_state_change(LinphoneCore *lc, LinphoneEvent *lev, Li
counters->number_of_LinphoneSubscriptionActive++;
if (linphone_event_get_subscription_dir(lev)==LinphoneSubscriptionIncoming){
mgr->lev=lev;
if(strcmp(linphone_event_get_name(lev), "Conference") == 0) {
if(strcmp(linphone_event_get_name(lev), "conference") == 0) {
// TODO : Get LocalConfEventHandler and call handler->subscribeReceived(lev)
} else {
linphone_event_notify(lev,content);