From 96bd4b35e0bd3897b554a5f03fe93701eec624e0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 29 Sep 2017 15:42:27 +0200 Subject: [PATCH] Use the correct name for the conference event package. --- coreapi/event.c | 2 +- coreapi/linphonecore.c | 2 +- src/conference/local-conference-event-handler.cpp | 2 +- src/conference/remote-conference-event-handler.cpp | 2 +- tester/conference-event-tester.cpp | 10 +++++----- tester/eventapi_tester.c | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coreapi/event.c b/coreapi/event.c index 00adff5ec..100fa2e5c 100644 --- a/coreapi/event.c +++ b/coreapi/event.c @@ -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; diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 01e1f72e1..f80b56b43 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -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) { } } diff --git a/src/conference/local-conference-event-handler.cpp b/src/conference/local-conference-event-handler.cpp index d7176f80c..dd7734a47 100644 --- a/src/conference/local-conference-event-handler.cpp +++ b/src/conference/local-conference-event-handler.cpp @@ -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); } diff --git a/src/conference/remote-conference-event-handler.cpp b/src/conference/remote-conference-event-handler.cpp index 94aa0abd4..2acc7bbee 100644 --- a/src/conference/remote-conference-event-handler.cpp +++ b/src/conference/remote-conference-event-handler.cpp @@ -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); diff --git a/tester/conference-event-tester.cpp b/tester/conference-event-tester.cpp index 19e392046..8dabe55a8 100644 --- a/tester/conference-event-tester.cpp +++ b/tester/conference-event-tester.cpp @@ -742,7 +742,7 @@ void send_first_notify() { localConf.addParticipant(bobAddr, ¶ms, false); shared_ptr alice = localConf.addParticipant(aliceAddr, ¶ms, 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, ¶ms, false); @@ -834,7 +834,7 @@ void send_removed_notify() { localConf.addParticipant(bobAddr, ¶ms, false); shared_ptr alice = localConf.addParticipant(aliceAddr, ¶ms, 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, ¶ms, false); shared_ptr alice = localConf.addParticipant(aliceAddr, ¶ms, 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, ¶ms, false); shared_ptr alice = localConf.addParticipant(aliceAddr, ¶ms, 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); diff --git a/tester/eventapi_tester.c b/tester/eventapi_tester.c index 24614827f..205aa3935 100644 --- a/tester/eventapi_tester.c +++ b/tester/eventapi_tester.c @@ -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);