Commit f1e355a5 authored by johan's avatar johan
Browse files

Fix after rebase

parent ae0f4195
......@@ -57,7 +57,7 @@ static void group_chat (bool_t encryption, bool_t external_sender) {
bctbx_list_t *coresList = init_core_for_conference(coresManagerList);
const char * sFactoryUri = "sip:conference-factory@conf.external-domain.org";
bctbx_list_t *externalCoresList = init_core_for_conference_with_factori_uri(externalCoresManagerList, sFactoryUri);
bctbx_list_t *externalCoresList = init_core_for_conference_with_factory_uri(externalCoresManagerList, sFactoryUri);
start_core_for_conference(coresManagerList);
start_core_for_conference(externalCoresManagerList);
......@@ -90,7 +90,7 @@ static void group_chat (bool_t encryption, bool_t external_sender) {
// Check that the chat room is correctly created on Pauline's side and that the participants are added
LinphoneChatRoom *paulineCr = check_creation_chat_room_client_side(coresList, pauline, &initialPaulineStats, confAddr, initialSubject, 2, FALSE);
BC_ASSERT_TRUE(wait_for_list(coresList, &claire->stat.number_of_LinphoneChatRoomStateCreationPending, initialClaireStats.number_of_LinphoneChatRoomStateCreationPending + 1, 5000));
BC_ASSERT_TRUE(wait_for_list(coresList, &claire->stat.number_of_LinphoneConferenceStateCreationPending, initialClaireStats.number_of_LinphoneConferenceStateCreationPending + 1, 5000));
// Check that the chat room is correctly created on Claire's side and that the participants are added
LinphoneChatRoom *claireCr = check_creation_chat_room_client_side(coresList, claire, &initialClaireStats, confAddr, initialSubject, 2, FALSE);
......
......@@ -379,7 +379,7 @@ void _receive_file(bctbx_list_t *coresList, LinphoneCoreManager *lcm, stats *rec
// Configure list of core manager for conference and add the listener
bctbx_list_t * init_core_for_conference_with_factory_uri(bctbx_list_t *coreManagerList, const char* factoryUri) {
LinphoneAddress *factoryAddr = linphone_address_new(sFactoryUri);
LinphoneAddress *factoryAddr = linphone_address_new(factoryUri);
bctbx_list_for_each2(coreManagerList, (void (*)(void *, void *))_configure_core_for_conference, (void *) factoryAddr);
linphone_address_unref(factoryAddr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment