From bf1d1d4e75223b46246460363389857042909950 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 16 Oct 2017 15:18:22 +0200
Subject: [PATCH] Fixes for wrapper and Android compil

---
 coreapi/factory.c                  | 4 ++++
 include/linphone/api/c-dial-plan.h | 2 +-
 include/linphone/factory.h         | 7 +++++++
 src/dial-plan/dial-plan.cpp        | 2 +-
 wrappers/java/migration.sh         | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/coreapi/factory.c b/coreapi/factory.c
index fadb6234f..5dab6b014 100644
--- a/coreapi/factory.c
+++ b/coreapi/factory.c
@@ -330,3 +330,7 @@ void *linphone_factory_get_user_data(const LinphoneFactory *factory) {
 void linphone_factory_set_user_data(LinphoneFactory *factory, void *data) {
 	factory->user_data = data;
 }
+
+const bctbx_list_t * linphone_factory_get_dial_plans(LinphoneFactory *factory) {
+	return linphone_dial_plan_get_all_list();
+}
diff --git a/include/linphone/api/c-dial-plan.h b/include/linphone/api/c-dial-plan.h
index 6a2f85110..6cfd4fa78 100644
--- a/include/linphone/api/c-dial-plan.h
+++ b/include/linphone/api/c-dial-plan.h
@@ -85,7 +85,7 @@ LINPHONE_PUBLIC	int linphone_dial_plan_lookup_ccc_from_e164(const char* e164);
 LINPHONE_PUBLIC const LinphoneDialPlan* linphone_dial_plan_get_all(void);
 
 /**
- * @return {\bctbx_list const LinphoneDialPlan*} of all known dial plans
+ * @return \bctbx_list{LinphoneDialPlan} of all known dial plans
 **/
 LINPHONE_PUBLIC const bctbx_list_t * linphone_dial_plan_get_all_list(void);
 
diff --git a/include/linphone/factory.h b/include/linphone/factory.h
index a3e49fc7b..6020db46a 100644
--- a/include/linphone/factory.h
+++ b/include/linphone/factory.h
@@ -276,6 +276,13 @@ LINPHONE_PUBLIC void *linphone_factory_get_user_data(const LinphoneFactory *fact
 */
 LINPHONE_PUBLIC void linphone_factory_set_user_data(LinphoneFactory *factory, void *data);
 
+/***
+ * Returns a bctbx_list_t of all DialPlans
+ * @param[in] factory the LinphoneFactory object
+ * @return \bctbx_list{DialPlan} a list of DialPlan
+ */
+LINPHONE_PUBLIC const bctbx_list_t * linphone_factory_get_dial_plans(LinphoneFactory *factory);
+
 /**
  * @}
  */
diff --git a/src/dial-plan/dial-plan.cpp b/src/dial-plan/dial-plan.cpp
index d72d48086..4f9fb94f5 100644
--- a/src/dial-plan/dial-plan.cpp
+++ b/src/dial-plan/dial-plan.cpp
@@ -373,7 +373,7 @@ int DialPlan::lookupCccFromIso(string iso) {
 }
 
 const DialPlan& DialPlan::findByCccAsInt(int ccc) {
-    string cccString = to_string(ccc);
+    string cccString = Utils::toString(ccc);
     return DialPlan::findByCcc(cccString);
 }
 
diff --git a/wrappers/java/migration.sh b/wrappers/java/migration.sh
index afd282371..c2e889a81 100644
--- a/wrappers/java/migration.sh
+++ b/wrappers/java/migration.sh
@@ -238,7 +238,7 @@ eval "$SED_START 's/mLc.destroy()/mLc = null/g' $SED_END"
 #Core.needsEchoCalibration()
 #Core.hasCrappyOpenGL()
 #Core.getMSFactory()
-#COre.startEchoCalibration
+#Core.startEchoCalibration
 #Core.startEchoTester
 #Core.stopEchoTester