From 5b869f8d484bb173037fdd3e4e0d6c93940d65f7 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 9 Mar 2016 09:35:07 +0100 Subject: [PATCH] Fix friends load issue when not using database --- coreapi/linphonecore.c | 13 +++++++++++-- tester/presence_tester.c | 7 ------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 06f0fe311..fee6d8ea8 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1371,15 +1371,24 @@ static void video_config_read(LinphoneCore *lc){ #endif } -static void ui_config_read(LinphoneCore *lc) +static void read_friends_from_rc(LinphoneCore *lc) { -#ifndef FRIENDS_SQL_STORAGE_ENABLED LinphoneFriend *lf = NULL; int i; for (i = 0; (lf = linphone_friend_new_from_config_file(lc, i)) != NULL; i++) { linphone_core_add_friend(lc, lf); linphone_friend_unref(lf); } +} + +static void ui_config_read(LinphoneCore *lc) +{ +#ifndef FRIENDS_SQL_STORAGE_ENABLED + read_friends_from_rc(lc); +#else + if (!lc->friends_db) { + read_friends_from_rc(lc); + } #endif call_logs_read_from_config_file(lc); diff --git a/tester/presence_tester.c b/tester/presence_tester.c index 59be7accf..0b7e4a546 100644 --- a/tester/presence_tester.c +++ b/tester/presence_tester.c @@ -993,7 +993,6 @@ static void test_presence_list_subscribe_io_error(void) { static void simple_subscribe_with_friend_from_rc(void) { -#ifdef FIXME_SYLVAIN LinphoneCoreManager* pauline = presence_linphone_core_manager_new("pauline"); LinphoneCoreManager *marie = presence_linphone_core_manager_new_with_rc_name("marie", "pauline_as_friend_rc"); LinphoneFriend *pauline_as_friend; @@ -1015,12 +1014,6 @@ static void simple_subscribe_with_friend_from_rc(void) { BC_ASSERT_FALSE(wait_for(NULL,pauline->lc,&pauline->stat.number_of_NewSubscriptionRequest,2)); /*just to wait for unsubscription even if not notified*/ linphone_core_manager_destroy(pauline); -#else - LinphoneFriend * just_for_a_leak = linphone_friend_new(); - just_for_a_leak++; - ms_error("Test not activated yet because waiting for fix"); -#endif - }