From 261d0031c56335be9af63e263c8b86bf610998cd Mon Sep 17 00:00:00 2001
From: Benjamin Reis <benjamin.reis@belledonne-communications.com>
Date: Mon, 25 Sep 2017 16:16:12 +0200
Subject: [PATCH] remove call to deprecated function

---
 Classes/CallView.m                 | 2 +-
 Classes/LinphoneUI/UICallButton.m  | 2 +-
 Classes/LinphoneUI/UIVideoButton.m | 4 ++--
 Classes/PhoneMainView.m            | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Classes/CallView.m b/Classes/CallView.m
index 0edbf1021..6a7914795 100644
--- a/Classes/CallView.m
+++ b/Classes/CallView.m
@@ -538,7 +538,7 @@ static void hideSpinner(LinphoneCall *call, void *user_data) {
 			if (!linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
 				const LinphoneCallParams *param = linphone_call_get_current_params(call);
 				const LinphoneCallAppData *callAppData =
-					(__bridge const LinphoneCallAppData *)(linphone_call_get_user_pointer(call));
+					(__bridge const LinphoneCallAppData *)(linphone_call_get_user_data(call));
 				if (state == LinphoneCallStreamsRunning && callAppData->videoRequested &&
 					linphone_call_params_low_bandwidth_enabled(param)) {
 					// too bad video was not enabled because low bandwidth
diff --git a/Classes/LinphoneUI/UICallButton.m b/Classes/LinphoneUI/UICallButton.m
index 4cf7991a7..434ab0863 100644
--- a/Classes/LinphoneUI/UICallButton.m
+++ b/Classes/LinphoneUI/UICallButton.m
@@ -63,7 +63,7 @@
 	if (address.length == 0) {
 		LinphoneCallLog *log = linphone_core_get_last_outgoing_call_log(LC);
 		if (log) {
-			LinphoneAddress *to = linphone_call_log_get_to(log);
+			const LinphoneAddress *to = linphone_call_log_get_to_address(log);
 			const char *domain = linphone_address_get_domain(to);
 			char *bis_address = NULL;
 			LinphoneProxyConfig *def_proxy = linphone_core_get_default_proxy_config(LC);
diff --git a/Classes/LinphoneUI/UIVideoButton.m b/Classes/LinphoneUI/UIVideoButton.m
index d644c0621..accf67675 100644
--- a/Classes/LinphoneUI/UIVideoButton.m
+++ b/Classes/LinphoneUI/UIVideoButton.m
@@ -19,7 +19,7 @@
 
 #import "UIVideoButton.h"
 #include "LinphoneManager.h"
-#import "Utils.h"
+#import "Log.h"
 
 @implementation UIVideoButton {
 	BOOL last_update_state;
@@ -42,7 +42,7 @@ INIT_WITH_COMMON_CF {
 
 	LinphoneCall *call = linphone_core_get_current_call(LC);
 	if (call) {
-		LinphoneCallAppData *callAppData = (__bridge LinphoneCallAppData *)linphone_call_get_user_pointer(call);
+		LinphoneCallAppData *callAppData = (__bridge LinphoneCallAppData *)linphone_call_get_user_data(call);
 		callAppData->videoRequested =
 			TRUE; /* will be used later to notify user if video was not activated because of the linphone core*/
 		LinphoneCallParams *call_params = linphone_core_create_call_params(LC,call);
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index ea648a66c..8f2f694f2 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -20,6 +20,7 @@
 #import <QuartzCore/QuartzCore.h>
 #import <AudioToolbox/AudioServices.h>
 #import "LinphoneAppDelegate.h"
+#import "Log.h"
 #import "PhoneMainView.h"
 
 static RootViewManager *rootViewManagerInstance = nil;
@@ -779,7 +780,7 @@ static RootViewManager *rootViewManagerInstance = nil;
 
 	LinphoneCall *call = linphone_core_get_current_call(LC);
 	if (call && linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
-		LinphoneCallAppData *callData = (__bridge LinphoneCallAppData *)linphone_call_get_user_pointer(call);
+		LinphoneCallAppData *callData = (__bridge LinphoneCallAppData *)linphone_call_get_user_data(call);
 		if (callData != nil) {
 			if (state == UIDeviceBatteryStateUnplugged) {
 				if (level <= 0.2f && !callData->batteryWarningShown) {