From c0566bbad0b2079329c95cea81e973394fd1c514 Mon Sep 17 00:00:00 2001
From: Sandrine Avakian <sandrine.avakian@belledonne-communications.com>
Date: Wed, 3 Feb 2016 12:35:48 +0100
Subject: [PATCH] Updating sip_setup_register_all to use
 ms_factory_load_plugins.

---
 coreapi/linphonecore.c | 2 +-
 coreapi/sipsetup.c     | 5 +++--
 coreapi/sipsetup.h     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index b4523d41c..815b1f1f2 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1526,7 +1526,7 @@ static void misc_config_read(LinphoneCore *lc) {
 }
 
 static void linphone_core_start(LinphoneCore * lc) {
-	sip_setup_register_all();
+	sip_setup_register_all(lc->factory);
 	sound_config_read(lc);
 	net_config_read(lc);
 	rtp_config_read(lc);
diff --git a/coreapi/sipsetup.c b/coreapi/sipsetup.c
index 29ffd46fc..8a5aea58c 100644
--- a/coreapi/sipsetup.c
+++ b/coreapi/sipsetup.c
@@ -35,9 +35,10 @@ void sip_setup_register(SipSetup *ss){
 	registered_sip_setups=ms_list_append(registered_sip_setups,ss);
 }
 
-void sip_setup_register_all(void){
+void sip_setup_register_all(MSFactory *factory){
 	SipSetup **p=all_sip_setups;
-	ms_load_plugins(LINPHONE_PLUGINS_DIR);
+	ms_factory_load_plugins(factory, LINPHONE_PLUGINS_DIR);
+	//ms_load_plugins(LINPHONE_PLUGINS_DIR);
 	while(*p!=NULL){
 		sip_setup_register(*p);
 		p++;
diff --git a/coreapi/sipsetup.h b/coreapi/sipsetup.h
index 63d71d5f1..dd1c48dc7 100644
--- a/coreapi/sipsetup.h
+++ b/coreapi/sipsetup.h
@@ -132,7 +132,7 @@ void buddy_lookup_request_set_max_results(BuddyLookupRequest *req, int ncount);
 
 
 void sip_setup_register(SipSetup *ss);
-void sip_setup_register_all(void);
+void sip_setup_register_all(MSFactory* factory);
 SipSetup *sip_setup_lookup(const char *type_name);
 void sip_setup_unregister_all(void);
 LINPHONE_PUBLIC unsigned int sip_setup_get_capabilities(SipSetup *s);