From c36e794c2e17a250bc22b1d9cd624036c81c620f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 20 Mar 2012 17:31:08 +0100
Subject: [PATCH] update linphone submodule, add stun setting, change icon

---
 Settings.bundle/Root.plist         | 14 ++++++++++++++
 linphone-Info.plist                |  3 +--
 linphone.xcodeproj/project.pbxproj |  4 ++++
 linphonerc                         |  2 +-
 submodules/linphone                |  2 +-
 submodules/mssilk                  |  2 +-
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist
index 8c1a439fe..eccf4c035 100644
--- a/Settings.bundle/Root.plist
+++ b/Settings.bundle/Root.plist
@@ -98,6 +98,20 @@
 			<key>KeyboardType</key>
 			<string>NumbersAndPunctuation</string>
 		</dict>
+        <dict>
+			<key>Key</key>
+			<string>stun_preference</string>
+			<key>Title</key>
+			<string>Stun server</string>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+			<key>DefaultValue</key>
+			<string></string>
+		</dict>
 	</array>
 	<key>StringsTable</key>
 	<string>Root</string>
diff --git a/linphone-Info.plist b/linphone-Info.plist
index 9f3e9b7a0..8183421a2 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -12,8 +12,7 @@
 	<string></string>
 	<key>CFBundleIconFiles</key>
 	<array>
-		<string>icone-linphone-57.png</string>
-		<string>icone-linphone-72.png</string>
+		<string>App_Apple_Icon_DES_57.png</string>
 	</array>
 	<key>CFBundleIdentifier</key>
 	<string>de.busch-jaeger.phone</string>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 74abfab4a..a47910ebe 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -275,6 +275,7 @@
 		34CA8539148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CA8538148F692A00503C01 /* MainScreenWithVideoPreview.m */; };
 		34CA853A148F692A00503C01 /* MainScreenWithVideoPreview.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CA8538148F692A00503C01 /* MainScreenWithVideoPreview.m */; };
 		34E28E7A14D98F6D00D84BDD /* 01.wav in Resources */ = {isa = PBXBuildFile; fileRef = 34E28E7914D98F6D00D84BDD /* 01.wav */; };
+		5749FCB21518D6C100F0712D /* App_Apple_Icon_DES_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 5749FCB11518D6C100F0712D /* App_Apple_Icon_DES_57.png */; };
 		70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; };
 		7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; };
 		70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70E542F213E147E3002BA2C0 /* OpenGLES.framework */; };
@@ -670,6 +671,7 @@
 		34CA8537148F692A00503C01 /* MainScreenWithVideoPreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainScreenWithVideoPreview.h; sourceTree = "<group>"; };
 		34CA8538148F692A00503C01 /* MainScreenWithVideoPreview.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainScreenWithVideoPreview.m; sourceTree = "<group>"; };
 		34E28E7914D98F6D00D84BDD /* 01.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = 01.wav; path = Resources/01.wav; sourceTree = "<group>"; };
+		5749FCB11518D6C100F0712D /* App_Apple_Icon_DES_57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = App_Apple_Icon_DES_57.png; path = Resources/App_Apple_Icon_DES_57.png; sourceTree = "<group>"; };
 		70571E1913FABCB000CDD3C2 /* rootca.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = rootca.pem; path = Resources/rootca.pem; sourceTree = "<group>"; };
 		7066FC0B13E830E400EFC6DC /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = "liblinphone-sdk/apple-darwin/lib/libvpx.a"; sourceTree = "<group>"; };
 		70E542F213E147E3002BA2C0 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
@@ -1222,6 +1224,7 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				5749FCB11518D6C100F0712D /* App_Apple_Icon_DES_57.png */,
 				34E28E7914D98F6D00D84BDD /* 01.wav */,
 				34ACD07414D2DBB300EE0B0A /* BuschJaeger */,
 				34A6ECEA14CF13CB00460C04 /* icone-linphone-72.png */,
@@ -1461,6 +1464,7 @@
 				348848E714D98859005B0B54 /* bj_mute_on.png in Resources */,
 				348848E814D98859005B0B54 /* bj_start_call.png in Resources */,
 				34E28E7A14D98F6D00D84BDD /* 01.wav in Resources */,
+				5749FCB21518D6C100F0712D /* App_Apple_Icon_DES_57.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/linphonerc b/linphonerc
index c97c551f2..a366945f6 100644
--- a/linphonerc
+++ b/linphonerc
@@ -20,7 +20,7 @@ default_proxy=-1
 register_only_when_network_is_up=1
 auto_net_state_mon=0
 keepalive_period=30000
-media_encryption=zrtp
+media_encryption=none
 incoming_calls_early_media=1
 
 [rtp]
diff --git a/submodules/linphone b/submodules/linphone
index 4006baf28..6068c49f4 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 4006baf2895166f78b8fe4c2721fa77656607988
+Subproject commit 6068c49f486f546bcb08102223fd79e49f2e0172
diff --git a/submodules/mssilk b/submodules/mssilk
index a0ad1cca9..391b6d6b0 160000
--- a/submodules/mssilk
+++ b/submodules/mssilk
@@ -1 +1 @@
-Subproject commit a0ad1cca900afc17204856fd7c2de7e8d511eaad
+Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40