From d4103ba4ea525b9a9d9e846bcd391ecd991ced3a Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 19 Jan 2016 12:17:47 +0100
Subject: [PATCH] LinphoneManager: fix ringtone asset

---
 Classes/LinphoneManager.m | 13 ++++++-------
 linphone-Info.plist       |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 6c8053f2d..288d2b11b 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1458,14 +1458,13 @@ static BOOL libStarted = FALSE;
 
 	// Set audio assets
 	NSString *ring =
-		([LinphoneManager bundleFile:[NSString stringWithUTF8String:linphone_core_get_ringback(theLinphoneCore) ?: ""]
-										 .lastPathComponent]
+		([LinphoneManager
+			 bundleFile:[NSString stringWithUTF8String:linphone_core_get_ring(theLinphoneCore) ?: ""].lastPathComponent]
 			 ?: [LinphoneManager bundleFile:@"notes_of_the_optimistic.caf"])
 			.lastPathComponent;
 	NSString *ringback =
-		([LinphoneManager
-			 bundleFile:[NSString stringWithUTF8String:linphone_core_get_remote_ringback_tone(theLinphoneCore) ?: ""]
-							.lastPathComponent]
+		([LinphoneManager bundleFile:[NSString stringWithUTF8String:linphone_core_get_ringback(theLinphoneCore) ?: ""]
+										 .lastPathComponent]
 			 ?: [LinphoneManager bundleFile:@"ringback.wav"])
 			.lastPathComponent;
 	NSString *hold =
@@ -1474,8 +1473,8 @@ static BOOL libStarted = FALSE;
 			 ?: [LinphoneManager bundleFile:@"hold.caf"])
 			.lastPathComponent;
 
-	linphone_core_set_ringback(theLinphoneCore, [LinphoneManager bundleFile:ring].UTF8String);
-	linphone_core_set_remote_ringback_tone(theLinphoneCore, [LinphoneManager bundleFile:ringback].UTF8String);
+	linphone_core_set_ring(theLinphoneCore, [LinphoneManager bundleFile:ring].UTF8String);
+	linphone_core_set_ringback(theLinphoneCore, [LinphoneManager bundleFile:ringback].UTF8String);
 	linphone_core_set_play_file(theLinphoneCore, [LinphoneManager bundleFile:hold].UTF8String);
 
 	/* set the CA file no matter what, since the remote provisioning could be hitting an HTTPS server */
diff --git a/linphone-Info.plist b/linphone-Info.plist
index e046cb71e..7c7b869a2 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>