From 654e224b39798eb2cddc17714335721b6a8ef73c Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 29 Apr 2011 15:38:39 +0200
Subject: [PATCH 1/2] version 1.0.5 with AMR disabled

---
 linphone-Info.plist                |  4 ++--
 linphone.xcodeproj/project.pbxproj | 15 +++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/linphone-Info.plist b/linphone-Info.plist
index 0a94d86e1..a5e170a9f 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.2</string>
+	<string>3.4.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.4</string>
+	<string>1.0.5</string>
 	<key>NSMainNibFile</key>
 	<string>PhoneMainView</string>
 	<key>UIApplicationExitsOnSuspend</key>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index a514d84aa..27789a338 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -1006,10 +1006,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					IN_LINPHONE,
-					HAVE_AMR,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@@ -1076,10 +1073,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					IN_LINPHONE,
-					HAVE_AMR,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@@ -1146,10 +1140,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = linphone_Prefix.pch;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					IN_LINPHONE,
-					HAVE_AMR,
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = IN_LINPHONE;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,

From 24eaed12119bd5b60a58b087fa771c942ae95d26 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 17 May 2011 12:51:02 +0200
Subject: [PATCH 2/2] fix flashing status bar at startup

---
 Classes/LinphoneUI/LinphoneManager.m | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m
index 4b1abd8aa..a3da09b35 100644
--- a/Classes/LinphoneUI/LinphoneManager.m
+++ b/Classes/LinphoneUI/LinphoneManager.m
@@ -624,19 +624,17 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 											  otherButtonTitles:nil ,nil];
 		[error show];
 	}
-	/*IOS specific*/
-	linphone_core_start_dtmf_stream(theLinphoneCore);
-	
+
 	
 }
 -(void) becomeActive {
-	if (theLinphoneCore == nil) {
+    /*IOS specific*/
+	linphone_core_start_dtmf_stream(theLinphoneCore);
+    if (theLinphoneCore == nil) {
 		//back from standby and background mode is disabled
 		[self	startLibLinphone];
-		
 	} else {
-		ms_message("becomming active, make sure we are registered");
-		linphone_core_start_dtmf_stream(theLinphoneCore);
+        ms_message("becomming active, make sure we are registered");
 		linphone_core_refresh_registers(theLinphoneCore);//just to make sure REGISTRATION is up to date
 		
 	}