From f3b8c3c7870cbd456fe98b91c7d25ac05c472398 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Fri, 11 Oct 2013 17:19:33 +0200
Subject: [PATCH] Remove apple-store specific changes for non-inclusion of
 FFMPEG and X264 - update the default configuration to use TLS as default -
 remove the HAVE_SSL flag (not needed anymore)

This makes the apple_store branch closer to master.
---
 Classes/LinphoneManager.m          | 17 +----------------
 Resources/linphonerc-factory~ipad  |  4 ++--
 linphone-Info.plist                |  2 +-
 linphone.xcodeproj/project.pbxproj |  4 ++++
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 7e004a1a0..1390b4240 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -918,23 +918,8 @@ static LinphoneCoreVTable linphonec_vtable = {
 		linphone_core_enable_video(theLinphoneCore, FALSE, FALSE);
 	}
     
-    // Disable H264
-    {
-        PayloadType *pt=linphone_core_find_payload_type(theLinphoneCore,"h264",90000,-1);
-		if (pt) {
-			linphone_core_enable_payload_type(theLinphoneCore,pt,FALSE);
-			[LinphoneLogger logc:LinphoneLoggerWarning format:"h264/90000 disabled for Apple store"];
-		}
-    }
     
-    // Disable MPEG4
-    {
-        PayloadType *pt=linphone_core_find_payload_type(theLinphoneCore,"mp4v-es",90000,-1);
-		if (pt) {
-			linphone_core_enable_payload_type(theLinphoneCore,pt,FALSE);
-			[LinphoneLogger logc:LinphoneLoggerWarning format:"mp4v-es/90000 disabled for Apple store"];
-		}
-    }
+
     
     [LinphoneLogger logc:LinphoneLoggerWarning format:"Linphone [%s]  started on [%s]"
                ,linphone_core_get_version()
diff --git a/Resources/linphonerc-factory~ipad b/Resources/linphonerc-factory~ipad
index 2db493416..aa00ecfe4 100644
--- a/Resources/linphonerc-factory~ipad
+++ b/Resources/linphonerc-factory~ipad
@@ -33,12 +33,12 @@ max_calls=3
 [wizard]
 service_url=https://www.linphone.org/wizard.php
 domain=sip.linphone.org
-proxy=sip.linphone.org:5228
+proxy=sip.linphone.org:5223
 password_length=6
 username_length=4
 expires=604800
 push_notification=1
-transport=tcp
+transport=tls
 sharing_server=https://www.linphone.org:444/upload.php
 ice=1
 stun=stun.linphone.org
diff --git a/linphone-Info.plist b/linphone-Info.plist
index 81a8b8814..29675f7ec 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -59,7 +59,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.5.102</string>
+	<string>3.5.101</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 9fd487a9b..c17931c1c 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -5772,6 +5772,7 @@
 					VIDEO_ENABLED,
 					HAVE_X264,
 					HAVE_SILK,
+					HAVE_SSL,
 					DEBUG,
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
@@ -5837,6 +5838,7 @@
 					VIDEO_ENABLED,
 					HAVE_X264,
 					HAVE_SILK,
+					HAVE_SSL,
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
@@ -6042,6 +6044,7 @@
 					IN_LINPHONE,
 					VIDEO_ENABLED,
 					HAVE_SILK,
+					HAVE_SSL,
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
@@ -6105,6 +6108,7 @@
 					IN_LINPHONE,
 					VIDEO_ENABLED,
 					HAVE_SILK,
+					HAVE_SSL,
 				);
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (