From 4aef1e400bed03cbebe029160eb64343d0361caf Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Tue, 10 Jan 2012 11:23:32 +0100
Subject: [PATCH] Moved Advanced settings to a new child panel

Also added a note indicating to the user the necessity of restarting Linphone
for SIP account to take effect

Fixes issue: 107, 80
---
 Settings.bundle/Advanced.plist                | 89 ++++++++++++++++++
 Settings.bundle/Root.plist                    | 90 ++-----------------
 .../Settings.bundle/Advanced.plist            | 89 ++++++++++++++++++
 nogpl-thirdparties/Settings.bundle/Root.plist | 90 ++-----------------
 submodules/linphone                           |  2 +-
 5 files changed, 193 insertions(+), 167 deletions(-)
 create mode 100644 Settings.bundle/Advanced.plist
 create mode 100644 nogpl-thirdparties/Settings.bundle/Advanced.plist

diff --git a/Settings.bundle/Advanced.plist b/Settings.bundle/Advanced.plist
new file mode 100644
index 000000000..4aad4e2a9
--- /dev/null
+++ b/Settings.bundle/Advanced.plist
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>debugenable_preference</string>
+			<key>Title</key>
+			<string>Debug</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+			<key>DefaultValue</key>
+			<string></string>
+			<key>IsSecure</key>
+			<false/>
+			<key>Key</key>
+			<string>prefix_preference</string>
+			<key>KeyboardType</key>
+			<string>NumberPad</string>
+			<key>Title</key>
+			<string>Prefix</string>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>substitute_+_by_00_preference</string>
+			<key>Title</key>
+			<string>Substitue + by 00</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<string>udp</string>
+			<key>Key</key>
+			<string>transport_preference</string>
+			<key>Title</key>
+			<string>Transport</string>
+			<key>Titles</key>
+			<array>
+				<string>udp</string>
+				<string>tcp</string>
+				<string>tls</string>
+			</array>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Values</key>
+			<array>
+				<string>udp</string>
+				<string>tcp</string>
+				<string>tls</string>
+			</array>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>enable_srtp_preference</string>
+			<key>Title</key>
+			<string>Secure rtp</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>backgroundmode_preference</string>
+			<key>Title</key>
+			<string>Background mode</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Settings.bundle/Root.plist b/Settings.bundle/Root.plist
index 5bc0378b6..4b6332f8e 100644
--- a/Settings.bundle/Root.plist
+++ b/Settings.bundle/Root.plist
@@ -9,6 +9,8 @@
 			<string>SIP account</string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
+			<key>FooterText</key>
+			<string>Linphone must be restarted for changes to take effect</string>
 		</dict>
 		<dict>
 			<key>AutocapitalizationType</key>
@@ -94,7 +96,7 @@
 		</dict>
 		<dict>
 			<key>Title</key>
-			<string>Media</string>
+			<string></string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
@@ -102,7 +104,7 @@
 			<key>File</key>
 			<string>audio</string>
 			<key>Title</key>
-			<string>Audio</string>
+			<string>Audio Codecs</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -115,90 +117,12 @@
 			<string>PSChildPaneSpecifier</string>
 		</dict>
 		<dict>
+			<key>File</key>
+			<string>Advanced</string>
 			<key>Title</key>
 			<string>Advanced</string>
 			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<false/>
-			<key>Key</key>
-			<string>debugenable_preference</string>
-			<key>Title</key>
-			<string>Debug</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>AutocapitalizationType</key>
-			<string>None</string>
-			<key>AutocorrectionType</key>
-			<string>No</string>
-			<key>DefaultValue</key>
-			<string></string>
-			<key>IsSecure</key>
-			<false/>
-			<key>Key</key>
-			<string>prefix_preference</string>
-			<key>KeyboardType</key>
-			<string>NumberPad</string>
-			<key>Title</key>
-			<string>Prefix</string>
-			<key>Type</key>
-			<string>PSTextFieldSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<false/>
-			<key>Key</key>
-			<string>substitute_+_by_00_preference</string>
-			<key>Title</key>
-			<string>Substitue + by 00</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<string>udp</string>
-			<key>Key</key>
-			<string>transport_preference</string>
-			<key>Title</key>
-			<string>Transport</string>
-			<key>Titles</key>
-			<array>
-				<string>udp</string>
-				<string>tcp</string>
-				<string>tls</string>
-			</array>
-			<key>Type</key>
-			<string>PSMultiValueSpecifier</string>
-			<key>Values</key>
-			<array>
-				<string>udp</string>
-				<string>tcp</string>
-				<string>tls</string>
-			</array>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<false/>
-			<key>Key</key>
-			<string>enable_srtp_preference</string>
-			<key>Title</key>
-			<string>Secure rtp</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<true/>
-			<key>Key</key>
-			<string>backgroundmode_preference</string>
-			<key>Title</key>
-			<string>Background mode</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
+			<string>PSChildPaneSpecifier</string>
 		</dict>
 	</array>
 	<key>StringsTable</key>
diff --git a/nogpl-thirdparties/Settings.bundle/Advanced.plist b/nogpl-thirdparties/Settings.bundle/Advanced.plist
new file mode 100644
index 000000000..4aad4e2a9
--- /dev/null
+++ b/nogpl-thirdparties/Settings.bundle/Advanced.plist
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>debugenable_preference</string>
+			<key>Title</key>
+			<string>Debug</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>AutocapitalizationType</key>
+			<string>None</string>
+			<key>AutocorrectionType</key>
+			<string>No</string>
+			<key>DefaultValue</key>
+			<string></string>
+			<key>IsSecure</key>
+			<false/>
+			<key>Key</key>
+			<string>prefix_preference</string>
+			<key>KeyboardType</key>
+			<string>NumberPad</string>
+			<key>Title</key>
+			<string>Prefix</string>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>substitute_+_by_00_preference</string>
+			<key>Title</key>
+			<string>Substitue + by 00</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<string>udp</string>
+			<key>Key</key>
+			<string>transport_preference</string>
+			<key>Title</key>
+			<string>Transport</string>
+			<key>Titles</key>
+			<array>
+				<string>udp</string>
+				<string>tcp</string>
+				<string>tls</string>
+			</array>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Values</key>
+			<array>
+				<string>udp</string>
+				<string>tcp</string>
+				<string>tls</string>
+			</array>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>enable_srtp_preference</string>
+			<key>Title</key>
+			<string>Secure rtp</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<true/>
+			<key>Key</key>
+			<string>backgroundmode_preference</string>
+			<key>Title</key>
+			<string>Background mode</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/nogpl-thirdparties/Settings.bundle/Root.plist b/nogpl-thirdparties/Settings.bundle/Root.plist
index 5bc0378b6..4b6332f8e 100644
--- a/nogpl-thirdparties/Settings.bundle/Root.plist
+++ b/nogpl-thirdparties/Settings.bundle/Root.plist
@@ -9,6 +9,8 @@
 			<string>SIP account</string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
+			<key>FooterText</key>
+			<string>Linphone must be restarted for changes to take effect</string>
 		</dict>
 		<dict>
 			<key>AutocapitalizationType</key>
@@ -94,7 +96,7 @@
 		</dict>
 		<dict>
 			<key>Title</key>
-			<string>Media</string>
+			<string></string>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
@@ -102,7 +104,7 @@
 			<key>File</key>
 			<string>audio</string>
 			<key>Title</key>
-			<string>Audio</string>
+			<string>Audio Codecs</string>
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
@@ -115,90 +117,12 @@
 			<string>PSChildPaneSpecifier</string>
 		</dict>
 		<dict>
+			<key>File</key>
+			<string>Advanced</string>
 			<key>Title</key>
 			<string>Advanced</string>
 			<key>Type</key>
-			<string>PSGroupSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<false/>
-			<key>Key</key>
-			<string>debugenable_preference</string>
-			<key>Title</key>
-			<string>Debug</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>AutocapitalizationType</key>
-			<string>None</string>
-			<key>AutocorrectionType</key>
-			<string>No</string>
-			<key>DefaultValue</key>
-			<string></string>
-			<key>IsSecure</key>
-			<false/>
-			<key>Key</key>
-			<string>prefix_preference</string>
-			<key>KeyboardType</key>
-			<string>NumberPad</string>
-			<key>Title</key>
-			<string>Prefix</string>
-			<key>Type</key>
-			<string>PSTextFieldSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<false/>
-			<key>Key</key>
-			<string>substitute_+_by_00_preference</string>
-			<key>Title</key>
-			<string>Substitue + by 00</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<string>udp</string>
-			<key>Key</key>
-			<string>transport_preference</string>
-			<key>Title</key>
-			<string>Transport</string>
-			<key>Titles</key>
-			<array>
-				<string>udp</string>
-				<string>tcp</string>
-				<string>tls</string>
-			</array>
-			<key>Type</key>
-			<string>PSMultiValueSpecifier</string>
-			<key>Values</key>
-			<array>
-				<string>udp</string>
-				<string>tcp</string>
-				<string>tls</string>
-			</array>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<false/>
-			<key>Key</key>
-			<string>enable_srtp_preference</string>
-			<key>Title</key>
-			<string>Secure rtp</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<true/>
-			<key>Key</key>
-			<string>backgroundmode_preference</string>
-			<key>Title</key>
-			<string>Background mode</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
+			<string>PSChildPaneSpecifier</string>
 		</dict>
 	</array>
 	<key>StringsTable</key>
diff --git a/submodules/linphone b/submodules/linphone
index 9c9588ffe..5bf95231b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9c9588ffe6cf8b163f797305b7d9c4e358788b9e
+Subproject commit 5bf95231b51641ce095af49a864cf00fa6837750