From 93c8a62dbd014fa588cc53c1516a1d67508e04bf Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 8 Nov 2012 23:37:36 +0100
Subject: [PATCH 01/14] fix x264 bug on iphone5

---
 linphone.xcodeproj/project.pbxproj  |  2 +-
 submodules/build/builders.d/x264.mk | 13 ++++++++-----
 submodules/externals/x264           |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index af55dde2f..57e51dc3a 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -5680,7 +5680,7 @@
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = "";
-				PROVISIONING_PROFILE = "79E53132-649F-48B3-A931-24792E466A11";
+				PROVISIONING_PROFILE = "D0073029-09E3-435D-B758-DA3E8EFDA2A3";
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
diff --git a/submodules/build/builders.d/x264.mk b/submodules/build/builders.d/x264.mk
index fbe943686..203ffe351 100644
--- a/submodules/build/builders.d/x264.mk
+++ b/submodules/build/builders.d/x264.mk
@@ -43,12 +43,12 @@ ifneq (,$(findstring armv7,$(host)))
 endif
 
 x264_dir?=externals/x264
-$(BUILDER_SRC_DIR)/$(x264_dir)/patched :
-	cd $(BUILDER_SRC_DIR)/$(x264_dir) \
-	&& git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \
-	&& touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched
+#$(BUILDER_SRC_DIR)/$(x264_dir)/patched :
+#	cd $(BUILDER_SRC_DIR)/$(x264_dir) \
+#	&& git apply $(BUILDER_SRC_DIR)/build/builders.d/x264.patch \
+#	&& touch $(BUILDER_SRC_DIR)/$(x264_dir)/patched
 
-$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: $(BUILDER_SRC_DIR)/$(x264_dir)/patched
+$(BUILDER_BUILD_DIR)/$(x264_dir)/configure: 
 	mkdir -p $(BUILDER_BUILD_DIR)/$(x264_dir)
 	cd $(BUILDER_BUILD_DIR)/$(x264_dir)/ \
 	&& rsync -av --exclude ".git"  $(BUILDER_SRC_DIR)/$(x264_dir)/* . 
@@ -66,6 +66,9 @@ clean-x264:
 
 veryclean-x264:
 	-cd $(BUILDER_BUILD_DIR)/$(x264_dir) && make distclean
+	cd $(BUILDER_SRC_DIR)/$(x264_dir)/ \
+	&& git checkout common/arm/asm.S \
+	&& rm -f patched
 	rm -rf $(BUILDER_BUILD_DIR)/$(x264_dir)
 
 clean-makefile-x264:
diff --git a/submodules/externals/x264 b/submodules/externals/x264
index 926a03a9c..f6a8615ab 160000
--- a/submodules/externals/x264
+++ b/submodules/externals/x264
@@ -1 +1 @@
-Subproject commit 926a03a9c1f48d0fbd54b0e802d740774c100a78
+Subproject commit f6a8615ab0c922ac2cb5c82c9824f6f4742b1725

From d5c4cc36037748c0def1d5529b4e4bd9a73ab2a0 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 9 Nov 2012 02:32:43 +0100
Subject: [PATCH 02/14] update linphone submodule for important chat fix.

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index 42b4cb544..b35e47746 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 42b4cb544661f129d2959ca9faf492b9b90cf197
+Subproject commit b35e4774658ab2fe666c4b7ec2f93d8ebe59d91a

From 89a57270a8175ced1daac5db0ba5cff5470529d6 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Fri, 9 Nov 2012 11:09:52 +0100
Subject: [PATCH 03/14] Fix call bar for iPhone 5

---
 .../LinphoneUI/UICompositeViewController.m    |   2 +-
 Classes/LinphoneUI/en.lproj/UICallBar.xib     | 470 +++++++++++++++++-
 Classes/LinphoneUI/fr.lproj/UICallBar.xib     | 422 ++++++++++++++--
 Resources/callbar_left_padding.png            | Bin 0 -> 3729 bytes
 Resources/callbar_right_padding.png           | Bin 0 -> 3368 bytes
 linphone.ldb/Contents.plist                   |  12 +-
 .../UICallBar/{10 => 11}/UICallBar.xib        | 470 +++++++++++++++++-
 linphone.xcodeproj/project.pbxproj            |  12 +
 8 files changed, 1313 insertions(+), 75 deletions(-)
 create mode 100644 Resources/callbar_left_padding.png
 create mode 100644 Resources/callbar_right_padding.png
 rename linphone.ldb/Resources/LinphoneUI/UICallBar/{10 => 11}/UICallBar.xib (87%)

diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m
index 775e8c1eb..433987ad1 100644
--- a/Classes/LinphoneUI/UICompositeViewController.m
+++ b/Classes/LinphoneUI/UICompositeViewController.m
@@ -527,7 +527,7 @@
         tabFrame.origin.y = viewFrame.size.height;
         tabFrame.origin.x = viewFrame.size.width;
         tabFrame.size.height = self.tabBarViewController.view.frame.size.height;
-        tabFrame.size.width = self.tabBarViewController.view.frame.size.width;
+        //tabFrame.size.width = self.tabBarViewController.view.frame.size.width;
         tabFrame.origin.y -= tabFrame.size.height;
         tabFrame.origin.x -= tabFrame.size.width;
         contentFrame.size.height = tabFrame.origin.y - contentFrame.origin.y;
diff --git a/Classes/LinphoneUI/en.lproj/UICallBar.xib b/Classes/LinphoneUI/en.lproj/UICallBar.xib
index 26e33847b..3398db0d7 100644
--- a/Classes/LinphoneUI/en.lproj/UICallBar.xib
+++ b/Classes/LinphoneUI/en.lproj/UICallBar.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.SystemVersion">11G63</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.AppKitVersion">1138.51</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -35,13 +35,14 @@
 			</object>
 			<object class="IBUIView" id="931774220">
 				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">301</int>
+				<int key="NSvFlags">266</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="464536687">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">-2147483356</int>
+						<int key="NSvFlags">-2147483355</int>
 						<string key="NSFrame">{{0, 335}, {320, 125}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@@ -56,13 +57,14 @@
 					</object>
 					<object class="IBUIView" id="556199520">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">288</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIImageView" id="1062143568">
 								<reference key="NSNextResponder" ref="556199520"/>
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{281, 260}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="612787992"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -78,6 +80,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1062143568"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -121,6 +124,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 10}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="843780954"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -148,6 +152,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070521404"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -175,6 +180,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="736263510"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -202,6 +208,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 72}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="977745568"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -229,6 +236,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="308872469"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -256,6 +264,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="809465959"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -283,6 +292,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 134}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="193555513"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -310,6 +320,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="357389737"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -337,6 +348,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="525082175"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -364,6 +376,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 196}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="951243834"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -391,6 +404,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="143533231"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -416,6 +430,7 @@
 						</array>
 						<string key="NSFrame">{{20, 57}, {281, 260}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="291142801"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="67221425">
@@ -427,13 +442,14 @@
 					</object>
 					<object class="IBUIView" id="1070539677">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIButton" id="322088049">
 								<reference key="NSNextResponder" ref="1070539677"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{3, 0}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="471717543"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -491,6 +507,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{3, 58}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="464536687"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -530,6 +547,7 @@
 						</array>
 						<string key="NSFrame">{{240, 208}, {80, 126}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="322088049"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@@ -538,13 +556,46 @@
 					</object>
 					<object class="IBUIView" id="143533231">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="688068563">
+								<reference key="NSNextResponder" ref="143533231"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="262544423"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">100</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage" id="867449752">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">callbar_left_padding.png</string>
+								</object>
+							</object>
+							<object class="IBUIImageView" id="804009355">
+								<reference key="NSNextResponder" ref="143533231"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{320, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="259467918"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">101</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage" id="148675087">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">callbar_right_padding.png</string>
+								</object>
+							</object>
 							<object class="IBUIView" id="259467918">
 								<reference key="NSNextResponder" ref="143533231"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 135}, {320, 2000}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070539677"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -559,6 +610,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{80, 67}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1016105438"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -605,6 +657,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{20, 20}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="693636558"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -617,6 +670,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{80, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="264394465"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -663,6 +717,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{160, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="62185125"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -709,6 +764,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{240, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="542459126"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -755,6 +811,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{0, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="351323248"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -791,6 +848,7 @@
 								<int key="NSvFlags">-2147483384</int>
 								<string key="NSFrame">{{0, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="99607181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -820,6 +878,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{105, 67}, {111, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="976589610"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -849,7 +908,8 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{215, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
-								<reference key="NSNextKeyView" ref="259467918"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="804009355"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -884,7 +944,8 @@
 						</array>
 						<string key="NSFrame">{{0, 325}, {320, 135}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
-						<reference key="NSNextKeyView" ref="262544423"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="688068563"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -893,21 +954,22 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="556199520"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="837874415">
 				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">301</int>
+				<int key="NSvFlags">266</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="974396983">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">-2147483356</int>
+						<int key="NSvFlags">-2147483355</int>
 						<string key="NSFrame">{{0, 248}, {480, 72}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="408941248"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -923,13 +985,14 @@
 					</object>
 					<object class="IBUIView" id="408941248">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">288</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIImageView" id="526609754">
 								<reference key="NSNextResponder" ref="408941248"/>
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{281, 260}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="519560860"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -942,6 +1005,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="526609754"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -964,6 +1028,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 10}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="881223252"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -982,6 +1047,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="923486394"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1000,6 +1066,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="121694741"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1018,6 +1085,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 72}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="30269278"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1036,6 +1104,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="625010060"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1054,6 +1123,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="963396110"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1072,6 +1142,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 134}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="761686959"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1090,6 +1161,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="629341434"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1108,6 +1180,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="809495409"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1126,6 +1199,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 196}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="94322278"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1144,6 +1218,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<int key="IBUITag">14</int>
@@ -1159,6 +1234,7 @@
 						</array>
 						<string key="NSFrame">{{91, 0}, {281, 260}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="996491821"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@@ -1167,13 +1243,14 @@
 					</object>
 					<object class="IBUIView" id="557887372">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIButton" id="294395401">
 								<reference key="NSNextResponder" ref="557887372"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{65, 55}</string>
 								<reference key="NSSuperview" ref="557887372"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="173491714"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1215,6 +1292,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 51}, {65, 55}}</string>
 								<reference key="NSSuperview" ref="557887372"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="974396983"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1254,6 +1332,7 @@
 						</array>
 						<string key="NSFrame">{{415, 140}, {65, 105}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="294395401"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@@ -1262,13 +1341,40 @@
 					</object>
 					<object class="IBUIView" id="950460796">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="836740652">
+								<reference key="NSNextResponder" ref="950460796"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="511619008"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">100</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUIImage" ref="867449752"/>
+							</object>
+							<object class="IBUIImageView" id="482311558">
+								<reference key="NSNextResponder" ref="950460796"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{480, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="298889112"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">101</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUIImage" ref="148675087"/>
+							</object>
 							<object class="IBUIView" id="298889112">
 								<reference key="NSNextResponder" ref="950460796"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 82}, {480, 2000}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="557887372"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -1283,6 +1389,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{65, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="814604354"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1329,6 +1436,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{79, 20}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="528058217"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1341,6 +1449,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{130, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="839169662"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1387,6 +1496,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{285, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="893150238"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1433,6 +1543,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{350, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="889778982"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1479,6 +1590,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrameSize">{65, 82}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="104218181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1512,6 +1624,7 @@
 								<int key="NSvFlags">-2147483384</int>
 								<string key="NSFrameSize">{65, 82}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="102684796"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1541,6 +1654,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{195, 0}, {90, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="594075760"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1570,7 +1684,8 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{415, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
-								<reference key="NSNextKeyView" ref="298889112"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="482311558"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -1602,7 +1717,8 @@
 						</array>
 						<string key="NSFrame">{{0, 238}, {480, 82}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
-						<reference key="NSNextKeyView" ref="511619008"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="836740652"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -1611,10 +1727,10 @@
 				</array>
 				<string key="NSFrameSize">{480, 320}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="950460796"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 					<int key="IBUIInterfaceOrientation">3</int>
 					<int key="interfaceOrientation">3</int>
@@ -2035,6 +2151,8 @@
 							<reference ref="976589610"/>
 							<reference ref="1016105438"/>
 							<reference ref="259467918"/>
+							<reference ref="688068563"/>
+							<reference ref="804009355"/>
 						</array>
 						<reference key="parent" ref="931774220"/>
 						<string key="objectName">buttons</string>
@@ -2361,6 +2479,8 @@
 							<reference ref="893150238"/>
 							<reference ref="889778982"/>
 							<reference ref="298889112"/>
+							<reference ref="836740652"/>
+							<reference ref="482311558"/>
 						</array>
 						<reference key="parent" ref="837874415"/>
 						<string key="objectName">buttons</string>
@@ -2437,6 +2557,30 @@
 						<reference key="parent" ref="143533231"/>
 						<string key="objectName">background</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="836740652"/>
+						<reference key="parent" ref="950460796"/>
+						<string key="objectName">leftPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="482311558"/>
+						<reference key="parent" ref="950460796"/>
+						<string key="objectName">rightPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="804009355"/>
+						<reference key="parent" ref="143533231"/>
+						<string key="objectName">rightPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">146</int>
+						<reference key="object" ref="688068563"/>
+						<reference key="parent" ref="143533231"/>
+						<string key="objectName">leftPadding</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2535,6 +2679,10 @@
 				<real value="3" key="128.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="141.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="142.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="146.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="21.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -2605,14 +2753,296 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">142</int>
+			<int key="maxID">163</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">TPMultiLayoutViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="landscapeView">UIView</string>
+						<string key="portraitView">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="landscapeView">
+							<string key="name">landscapeView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="portraitView">
+							<string key="name">portraitView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallBar</string>
+					<string key="superclassName">TPMultiLayoutViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="onConferenceClick:">id</string>
+						<string key="onOptionsAddClick:">id</string>
+						<string key="onOptionsClick:">id</string>
+						<string key="onOptionsTransferClick:">id</string>
+						<string key="onPadClick:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="onConferenceClick:">
+							<string key="name">onConferenceClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsAddClick:">
+							<string key="name">onOptionsAddClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsClick:">
+							<string key="name">onOptionsClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsTransferClick:">
+							<string key="name">onOptionsTransferClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onPadClick:">
+							<string key="name">onPadClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="conferenceButton">UIButton</string>
+						<string key="dialerButton">UIToggleButton</string>
+						<string key="eightButton">UIDigitButton</string>
+						<string key="fiveButton">UIDigitButton</string>
+						<string key="fourButton">UIDigitButton</string>
+						<string key="hangupButton">UIHangUpButton</string>
+						<string key="microButton">UIMicroButton</string>
+						<string key="nineButton">UIDigitButton</string>
+						<string key="oneButton">UIDigitButton</string>
+						<string key="optionsAddButton">UIButton</string>
+						<string key="optionsButton">UIToggleButton</string>
+						<string key="optionsTransferButton">UIButton</string>
+						<string key="optionsView">UIView</string>
+						<string key="padView">UIView</string>
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="sevenButton">UIDigitButton</string>
+						<string key="sharpButton">UIDigitButton</string>
+						<string key="sixButton">UIDigitButton</string>
+						<string key="speakerButton">UISpeakerButton</string>
+						<string key="starButton">UIDigitButton</string>
+						<string key="threeButton">UIDigitButton</string>
+						<string key="twoButton">UIDigitButton</string>
+						<string key="videoButton">UIVideoButton</string>
+						<string key="zeroButton">UIDigitButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="conferenceButton">
+							<string key="name">conferenceButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dialerButton">
+							<string key="name">dialerButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="eightButton">
+							<string key="name">eightButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fiveButton">
+							<string key="name">fiveButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fourButton">
+							<string key="name">fourButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hangupButton">
+							<string key="name">hangupButton</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="microButton">
+							<string key="name">microButton</string>
+							<string key="candidateClassName">UIMicroButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="nineButton">
+							<string key="name">nineButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="oneButton">
+							<string key="name">oneButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsAddButton">
+							<string key="name">optionsAddButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsButton">
+							<string key="name">optionsButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsTransferButton">
+							<string key="name">optionsTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsView">
+							<string key="name">optionsView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="padView">
+							<string key="name">padView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sevenButton">
+							<string key="name">sevenButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sharpButton">
+							<string key="name">sharpButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sixButton">
+							<string key="name">sixButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="speakerButton">
+							<string key="name">speakerButton</string>
+							<string key="candidateClassName">UISpeakerButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="starButton">
+							<string key="name">starButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="threeButton">
+							<string key="name">threeButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="twoButton">
+							<string key="name">twoButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoButton">
+							<string key="name">videoButton</string>
+							<string key="candidateClassName">UIVideoButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="zeroButton">
+							<string key="name">zeroButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallBar.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIDigitButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIHangUpButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIHangUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIMicroButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIMicroButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UISpeakerButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UISpeakerButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransparentView</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransparentView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIVideoButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">waitView</string>
+						<string key="NS.object.0">UIActivityIndicatorView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">waitView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">waitView</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIVideoButton.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="callbar_left_padding.png">{88, 180}</string>
+			<string key="callbar_right_padding.png">{88, 180}</string>
 			<string key="conference_default.png">{209, 136}</string>
 			<string key="conference_default_landscape.png">{130, 163}</string>
 			<string key="conference_over.png">{209, 136}</string>
diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar.xib b/Classes/LinphoneUI/fr.lproj/UICallBar.xib
index 6fa108778..04797317e 100644
--- a/Classes/LinphoneUI/fr.lproj/UICallBar.xib
+++ b/Classes/LinphoneUI/fr.lproj/UICallBar.xib
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<int key="IBDocument.SystemTarget">1536</int>
+		<string key="IBDocument.SystemVersion">11G63</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
+		<string key="IBDocument.AppKitVersion">1138.51</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">933</string>
+			<string key="NS.object.0">1926</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBUIButton</string>
-			<string>IBUIActivityIndicatorView</string>
-			<string>IBUIView</string>
-			<string>IBUIImageView</string>
 			<string>IBProxyObject</string>
+			<string>IBUIActivityIndicatorView</string>
+			<string>IBUIButton</string>
+			<string>IBUIImageView</string>
+			<string>IBUIView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -35,11 +35,11 @@
 			</object>
 			<object class="IBUIView" id="931774220">
 				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">301</int>
+				<int key="NSvFlags">266</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="464536687">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">-2147483356</int>
+						<int key="NSvFlags">-2147483355</int>
 						<string key="NSFrame">{{0, 335}, {320, 125}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -56,7 +56,7 @@
 					</object>
 					<object class="IBUIView" id="556199520">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">288</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIImageView" id="1062143568">
 								<reference key="NSNextResponder" ref="556199520"/>
@@ -427,7 +427,7 @@
 					</object>
 					<object class="IBUIView" id="1070539677">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIButton" id="322088049">
 								<reference key="NSNextResponder" ref="1070539677"/>
@@ -538,8 +538,38 @@
 					</object>
 					<object class="IBUIView" id="143533231">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="196968749">
+								<reference key="NSNextResponder" ref="143533231"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSNextKeyView" ref="262544423"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">100</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage" id="704895585">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">callbar_left_padding.png</string>
+								</object>
+							</object>
+							<object class="IBUIImageView" id="36875225">
+								<reference key="NSNextResponder" ref="143533231"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{320, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSNextKeyView" ref="259467918"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">101</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage" id="971005086">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">callbar_right_padding.png</string>
+								</object>
+							</object>
 							<object class="IBUIView" id="259467918">
 								<reference key="NSNextResponder" ref="143533231"/>
 								<int key="NSvFlags">290</int>
@@ -849,7 +879,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{215, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
-								<reference key="NSNextKeyView" ref="259467918"/>
+								<reference key="NSNextKeyView" ref="36875225"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -884,7 +914,7 @@
 						</array>
 						<string key="NSFrame">{{0, 325}, {320, 135}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
-						<reference key="NSNextKeyView" ref="262544423"/>
+						<reference key="NSNextKeyView" ref="196968749"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -895,16 +925,15 @@
 				<reference key="NSNextKeyView" ref="556199520"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="837874415">
 				<nil key="NSNextResponder"/>
-				<int key="NSvFlags">301</int>
+				<int key="NSvFlags">266</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="974396983">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">-2147483356</int>
+						<int key="NSvFlags">-2147483355</int>
 						<string key="NSFrame">{{0, 248}, {480, 72}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
 						<reference key="NSNextKeyView" ref="408941248"/>
@@ -922,7 +951,7 @@
 					</object>
 					<object class="IBUIView" id="408941248">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">288</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIImageView" id="526609754">
 								<reference key="NSNextResponder" ref="408941248"/>
@@ -1166,7 +1195,7 @@
 					</object>
 					<object class="IBUIView" id="557887372">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIButton" id="294395401">
 								<reference key="NSNextResponder" ref="557887372"/>
@@ -1261,8 +1290,32 @@
 					</object>
 					<object class="IBUIView" id="950460796">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="94230012">
+								<reference key="NSNextResponder" ref="950460796"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSNextKeyView" ref="511619008"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">100</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUIImage" ref="704895585"/>
+							</object>
+							<object class="IBUIImageView" id="789250601">
+								<reference key="NSNextResponder" ref="950460796"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{480, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSNextKeyView" ref="298889112"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">101</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUIImage" ref="971005086"/>
+							</object>
 							<object class="IBUIView" id="298889112">
 								<reference key="NSNextResponder" ref="950460796"/>
 								<int key="NSvFlags">290</int>
@@ -1569,7 +1622,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{415, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
-								<reference key="NSNextKeyView" ref="298889112"/>
+								<reference key="NSNextKeyView" ref="789250601"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -1601,7 +1654,7 @@
 						</array>
 						<string key="NSFrame">{{0, 238}, {480, 82}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
-						<reference key="NSNextKeyView" ref="511619008"/>
+						<reference key="NSNextKeyView" ref="94230012"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -1612,7 +1665,6 @@
 				<reference key="NSNextKeyView" ref="950460796"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 					<int key="IBUIInterfaceOrientation">3</int>
 					<int key="interfaceOrientation">3</int>
@@ -2033,6 +2085,8 @@
 							<reference ref="976589610"/>
 							<reference ref="1016105438"/>
 							<reference ref="259467918"/>
+							<reference ref="196968749"/>
+							<reference ref="36875225"/>
 						</array>
 						<reference key="parent" ref="931774220"/>
 						<string key="objectName">buttons</string>
@@ -2359,6 +2413,8 @@
 							<reference ref="893150238"/>
 							<reference ref="889778982"/>
 							<reference ref="298889112"/>
+							<reference ref="94230012"/>
+							<reference ref="789250601"/>
 						</array>
 						<reference key="parent" ref="837874415"/>
 						<string key="objectName">buttons</string>
@@ -2435,6 +2491,30 @@
 						<reference key="parent" ref="143533231"/>
 						<string key="objectName">background</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="94230012"/>
+						<reference key="parent" ref="950460796"/>
+						<string key="objectName">leftPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="789250601"/>
+						<reference key="parent" ref="950460796"/>
+						<string key="objectName">rightPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="36875225"/>
+						<reference key="parent" ref="143533231"/>
+						<string key="objectName">rightPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">146</int>
+						<reference key="object" ref="196968749"/>
+						<reference key="parent" ref="143533231"/>
+						<string key="objectName">leftPadding</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2533,6 +2613,10 @@
 				<real value="3" key="128.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="141.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="142.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="146.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="21.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -2603,14 +2687,296 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">142</int>
+			<int key="maxID">163</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">TPMultiLayoutViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="landscapeView">UIView</string>
+						<string key="portraitView">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="landscapeView">
+							<string key="name">landscapeView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="portraitView">
+							<string key="name">portraitView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallBar</string>
+					<string key="superclassName">TPMultiLayoutViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="onConferenceClick:">id</string>
+						<string key="onOptionsAddClick:">id</string>
+						<string key="onOptionsClick:">id</string>
+						<string key="onOptionsTransferClick:">id</string>
+						<string key="onPadClick:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="onConferenceClick:">
+							<string key="name">onConferenceClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsAddClick:">
+							<string key="name">onOptionsAddClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsClick:">
+							<string key="name">onOptionsClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsTransferClick:">
+							<string key="name">onOptionsTransferClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onPadClick:">
+							<string key="name">onPadClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="conferenceButton">UIButton</string>
+						<string key="dialerButton">UIToggleButton</string>
+						<string key="eightButton">UIDigitButton</string>
+						<string key="fiveButton">UIDigitButton</string>
+						<string key="fourButton">UIDigitButton</string>
+						<string key="hangupButton">UIHangUpButton</string>
+						<string key="microButton">UIMicroButton</string>
+						<string key="nineButton">UIDigitButton</string>
+						<string key="oneButton">UIDigitButton</string>
+						<string key="optionsAddButton">UIButton</string>
+						<string key="optionsButton">UIToggleButton</string>
+						<string key="optionsTransferButton">UIButton</string>
+						<string key="optionsView">UIView</string>
+						<string key="padView">UIView</string>
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="sevenButton">UIDigitButton</string>
+						<string key="sharpButton">UIDigitButton</string>
+						<string key="sixButton">UIDigitButton</string>
+						<string key="speakerButton">UISpeakerButton</string>
+						<string key="starButton">UIDigitButton</string>
+						<string key="threeButton">UIDigitButton</string>
+						<string key="twoButton">UIDigitButton</string>
+						<string key="videoButton">UIVideoButton</string>
+						<string key="zeroButton">UIDigitButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="conferenceButton">
+							<string key="name">conferenceButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dialerButton">
+							<string key="name">dialerButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="eightButton">
+							<string key="name">eightButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fiveButton">
+							<string key="name">fiveButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fourButton">
+							<string key="name">fourButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hangupButton">
+							<string key="name">hangupButton</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="microButton">
+							<string key="name">microButton</string>
+							<string key="candidateClassName">UIMicroButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="nineButton">
+							<string key="name">nineButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="oneButton">
+							<string key="name">oneButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsAddButton">
+							<string key="name">optionsAddButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsButton">
+							<string key="name">optionsButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsTransferButton">
+							<string key="name">optionsTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsView">
+							<string key="name">optionsView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="padView">
+							<string key="name">padView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sevenButton">
+							<string key="name">sevenButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sharpButton">
+							<string key="name">sharpButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sixButton">
+							<string key="name">sixButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="speakerButton">
+							<string key="name">speakerButton</string>
+							<string key="candidateClassName">UISpeakerButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="starButton">
+							<string key="name">starButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="threeButton">
+							<string key="name">threeButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="twoButton">
+							<string key="name">twoButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoButton">
+							<string key="name">videoButton</string>
+							<string key="candidateClassName">UIVideoButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="zeroButton">
+							<string key="name">zeroButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallBar.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIDigitButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIHangUpButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIHangUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIMicroButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIMicroButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UISpeakerButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UISpeakerButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransparentView</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransparentView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIVideoButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">waitView</string>
+						<string key="NS.object.0">UIActivityIndicatorView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">waitView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">waitView</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIVideoButton.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="callbar_left_padding.png">{88, 180}</string>
+			<string key="callbar_right_padding.png">{88, 180}</string>
 			<string key="conference_default.png">{209, 136}</string>
 			<string key="conference_default_landscape.png">{130, 163}</string>
 			<string key="conference_over.png">{209, 136}</string>
@@ -2702,6 +3068,6 @@
 			<string key="video_on_default.png">{160, 134}</string>
 			<string key="video_on_default_landscape.png">{130, 163}</string>
 		</dictionary>
-		<string key="IBCocoaTouchPluginVersion">933</string>
+		<string key="IBCocoaTouchPluginVersion">1926</string>
 	</data>
 </archive>
diff --git a/Resources/callbar_left_padding.png b/Resources/callbar_left_padding.png
new file mode 100644
index 0000000000000000000000000000000000000000..c54a13b3cfc7f72090fc42553705f232bb35cc11
GIT binary patch
literal 3729
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
Wk$z4<+E&$-pF}&NBcaBM68|rQ3OnKe

literal 0
HcmV?d00001

diff --git a/Resources/callbar_right_padding.png b/Resources/callbar_right_padding.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc859f667865470e66fd6d58d0cb7ca6d1efcf5b
GIT binary patch
literal 3368
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
DZhxVb

literal 0
HcmV?d00001

diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index 6307ec04b..f3a73709f 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -7504,17 +7504,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>10</key>
+							<key>11</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>LinphoneUI/UICallBar/10/UICallBar.xib</string>
+								<string>LinphoneUI/UICallBar/11/UICallBar.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-27T09:31:07Z</date>
+					<date>2012-11-09T09:15:46Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -7524,7 +7524,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>c5958759098558a4f8f5d1c18abc0e21
+					<string>18fba1eaf5f411c2e245f79b882aa7b1
 </string>
 					<key>name</key>
 					<string>UICallBar.xib</string>
@@ -8626,9 +8626,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>10</string>
+						<string>11</string>
 						<key>fr</key>
-						<string>10</string>
+						<string>11</string>
 					</dict>
 				</dict>
 				<dict>
diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib
similarity index 87%
rename from linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib
rename to linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib
index 26e33847b..343b085af 100644
--- a/linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.SystemVersion">11G63</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
-		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.AppKitVersion">1138.51</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -35,13 +35,14 @@
 			</object>
 			<object class="IBUIView" id="931774220">
 				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">301</int>
+				<int key="NSvFlags">266</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="464536687">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">-2147483356</int>
+						<int key="NSvFlags">-2147483355</int>
 						<string key="NSFrame">{{0, 335}, {320, 125}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">1</int>
@@ -56,13 +57,14 @@
 					</object>
 					<object class="IBUIView" id="556199520">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">288</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIImageView" id="1062143568">
 								<reference key="NSNextResponder" ref="556199520"/>
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{281, 260}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="612787992"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -78,6 +80,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1062143568"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -121,6 +124,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 10}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="843780954"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -148,6 +152,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070521404"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -175,6 +180,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="736263510"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -202,6 +208,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 72}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="977745568"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -229,6 +236,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="308872469"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -256,6 +264,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="809465959"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -283,6 +292,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 134}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="193555513"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -310,6 +320,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="357389737"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -337,6 +348,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="525082175"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -364,6 +376,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 196}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="951243834"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -391,6 +404,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="556199520"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="143533231"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -416,6 +430,7 @@
 						</array>
 						<string key="NSFrame">{{20, 57}, {281, 260}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="291142801"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor" id="67221425">
@@ -427,13 +442,14 @@
 					</object>
 					<object class="IBUIView" id="1070539677">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIButton" id="322088049">
 								<reference key="NSNextResponder" ref="1070539677"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{3, 0}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="471717543"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -491,6 +507,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{3, 58}, {77, 68}}</string>
 								<reference key="NSSuperview" ref="1070539677"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="464536687"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -530,6 +547,7 @@
 						</array>
 						<string key="NSFrame">{{240, 208}, {80, 126}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="322088049"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@@ -538,13 +556,46 @@
 					</object>
 					<object class="IBUIView" id="143533231">
 						<reference key="NSNextResponder" ref="931774220"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="196968749">
+								<reference key="NSNextResponder" ref="143533231"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="262544423"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">100</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage" id="704895585">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">callbar_left_padding.png</string>
+								</object>
+							</object>
+							<object class="IBUIImageView" id="36875225">
+								<reference key="NSNextResponder" ref="143533231"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{320, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="259467918"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">101</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage" id="971005086">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">callbar_right_padding.png</string>
+								</object>
+							</object>
 							<object class="IBUIView" id="259467918">
 								<reference key="NSNextResponder" ref="143533231"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 135}, {320, 2000}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1070539677"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -559,6 +610,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{80, 67}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1016105438"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -605,6 +657,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{20, 20}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="693636558"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -617,6 +670,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{80, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="264394465"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -663,6 +717,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{160, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="62185125"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -709,6 +764,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{240, 0}, {80, 67}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="542459126"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -755,6 +811,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{0, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="351323248"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -791,6 +848,7 @@
 								<int key="NSvFlags">-2147483384</int>
 								<string key="NSFrame">{{0, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="99607181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -820,6 +878,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{105, 67}, {111, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="976589610"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -849,7 +908,8 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{215, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
-								<reference key="NSNextKeyView" ref="259467918"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="36875225"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -884,7 +944,8 @@
 						</array>
 						<string key="NSFrame">{{0, 325}, {320, 135}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
-						<reference key="NSNextKeyView" ref="262544423"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="196968749"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -893,21 +954,22 @@
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="556199520"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="837874415">
 				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">301</int>
+				<int key="NSvFlags">266</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="974396983">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">-2147483356</int>
+						<int key="NSvFlags">-2147483355</int>
 						<string key="NSFrame">{{0, 248}, {480, 72}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="408941248"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -923,13 +985,14 @@
 					</object>
 					<object class="IBUIView" id="408941248">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">288</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIImageView" id="526609754">
 								<reference key="NSNextResponder" ref="408941248"/>
 								<int key="NSvFlags">274</int>
 								<string key="NSFrameSize">{281, 260}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="519560860"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<int key="IBUITag">2</int>
@@ -942,6 +1005,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="526609754"/>
 								<object class="NSColor" key="IBUIBackgroundColor">
 									<int key="NSColorSpace">1</int>
@@ -964,6 +1028,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 10}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="881223252"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -982,6 +1047,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 10}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="923486394"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1000,6 +1066,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="121694741"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1018,6 +1085,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 72}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="30269278"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1036,6 +1104,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 72}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="625010060"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1054,6 +1123,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="963396110"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1072,6 +1142,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 134}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="761686959"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1090,6 +1161,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 134}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="629341434"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1108,6 +1180,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-20, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="809495409"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1126,6 +1199,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{87, 196}, {106, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="94322278"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
@@ -1144,6 +1218,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{193, 196}, {107, 54}}</string>
 								<reference key="NSSuperview" ref="408941248"/>
+								<reference key="NSWindow"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 								<int key="IBUITag">14</int>
@@ -1159,6 +1234,7 @@
 						</array>
 						<string key="NSFrame">{{91, 0}, {281, 260}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="996491821"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@@ -1167,13 +1243,14 @@
 					</object>
 					<object class="IBUIView" id="557887372">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUIButton" id="294395401">
 								<reference key="NSNextResponder" ref="557887372"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{65, 55}</string>
 								<reference key="NSSuperview" ref="557887372"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="173491714"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1215,6 +1292,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{0, 51}, {65, 55}}</string>
 								<reference key="NSSuperview" ref="557887372"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="974396983"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1254,6 +1332,7 @@
 						</array>
 						<string key="NSFrame">{{415, 140}, {65, 105}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="294395401"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
@@ -1262,13 +1341,40 @@
 					</object>
 					<object class="IBUIView" id="950460796">
 						<reference key="NSNextResponder" ref="837874415"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="94230012">
+								<reference key="NSNextResponder" ref="950460796"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="511619008"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">100</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUIImage" ref="704895585"/>
+							</object>
+							<object class="IBUIImageView" id="789250601">
+								<reference key="NSNextResponder" ref="950460796"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{480, -8}, {44, 90}}</string>
+								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="298889112"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">101</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<reference key="IBUIImage" ref="971005086"/>
+							</object>
 							<object class="IBUIView" id="298889112">
 								<reference key="NSNextResponder" ref="950460796"/>
 								<int key="NSvFlags">290</int>
 								<string key="NSFrame">{{0, 82}, {480, 2000}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="557887372"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<object class="NSColor" key="IBUIBackgroundColor">
@@ -1283,6 +1389,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{65, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="814604354"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1329,6 +1436,7 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrame">{{79, 20}, {37, 37}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="528058217"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1341,6 +1449,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{130, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="839169662"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1387,6 +1496,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{285, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="893150238"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1433,6 +1543,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{350, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="889778982"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1479,6 +1590,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrameSize">{65, 82}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="104218181"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1512,6 +1624,7 @@
 								<int key="NSvFlags">-2147483384</int>
 								<string key="NSFrameSize">{65, 82}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="102684796"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1541,6 +1654,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{195, 0}, {90, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="594075760"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -1570,7 +1684,8 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{415, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
-								<reference key="NSNextKeyView" ref="298889112"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="789250601"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -1602,7 +1717,8 @@
 						</array>
 						<string key="NSFrame">{{0, 238}, {480, 82}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
-						<reference key="NSNextKeyView" ref="511619008"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="94230012"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -1611,10 +1727,10 @@
 				</array>
 				<string key="NSFrameSize">{480, 320}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="950460796"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="67221425"/>
-				<bool key="IBUIAutoresizesSubviews">NO</bool>
 				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 					<int key="IBUIInterfaceOrientation">3</int>
 					<int key="interfaceOrientation">3</int>
@@ -2035,6 +2151,8 @@
 							<reference ref="976589610"/>
 							<reference ref="1016105438"/>
 							<reference ref="259467918"/>
+							<reference ref="196968749"/>
+							<reference ref="36875225"/>
 						</array>
 						<reference key="parent" ref="931774220"/>
 						<string key="objectName">buttons</string>
@@ -2361,6 +2479,8 @@
 							<reference ref="893150238"/>
 							<reference ref="889778982"/>
 							<reference ref="298889112"/>
+							<reference ref="94230012"/>
+							<reference ref="789250601"/>
 						</array>
 						<reference key="parent" ref="837874415"/>
 						<string key="objectName">buttons</string>
@@ -2437,6 +2557,30 @@
 						<reference key="parent" ref="143533231"/>
 						<string key="objectName">background</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="94230012"/>
+						<reference key="parent" ref="950460796"/>
+						<string key="objectName">leftPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="789250601"/>
+						<reference key="parent" ref="950460796"/>
+						<string key="objectName">rightPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="36875225"/>
+						<reference key="parent" ref="143533231"/>
+						<string key="objectName">rightPadding</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">146</int>
+						<reference key="object" ref="196968749"/>
+						<reference key="parent" ref="143533231"/>
+						<string key="objectName">leftPadding</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2535,6 +2679,10 @@
 				<real value="3" key="128.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="141.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="142.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="143.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="144.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="145.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="146.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="21.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
 				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -2605,14 +2753,296 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">142</int>
+			<int key="maxID">163</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">TPMultiLayoutViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="landscapeView">UIView</string>
+						<string key="portraitView">UIView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="landscapeView">
+							<string key="name">landscapeView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="portraitView">
+							<string key="name">portraitView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TPMultiLayoutViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICallBar</string>
+					<string key="superclassName">TPMultiLayoutViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="onConferenceClick:">id</string>
+						<string key="onOptionsAddClick:">id</string>
+						<string key="onOptionsClick:">id</string>
+						<string key="onOptionsTransferClick:">id</string>
+						<string key="onPadClick:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="onConferenceClick:">
+							<string key="name">onConferenceClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsAddClick:">
+							<string key="name">onOptionsAddClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsClick:">
+							<string key="name">onOptionsClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onOptionsTransferClick:">
+							<string key="name">onOptionsTransferClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="onPadClick:">
+							<string key="name">onPadClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="conferenceButton">UIButton</string>
+						<string key="dialerButton">UIToggleButton</string>
+						<string key="eightButton">UIDigitButton</string>
+						<string key="fiveButton">UIDigitButton</string>
+						<string key="fourButton">UIDigitButton</string>
+						<string key="hangupButton">UIHangUpButton</string>
+						<string key="microButton">UIMicroButton</string>
+						<string key="nineButton">UIDigitButton</string>
+						<string key="oneButton">UIDigitButton</string>
+						<string key="optionsAddButton">UIButton</string>
+						<string key="optionsButton">UIToggleButton</string>
+						<string key="optionsTransferButton">UIButton</string>
+						<string key="optionsView">UIView</string>
+						<string key="padView">UIView</string>
+						<string key="pauseButton">UIPauseButton</string>
+						<string key="sevenButton">UIDigitButton</string>
+						<string key="sharpButton">UIDigitButton</string>
+						<string key="sixButton">UIDigitButton</string>
+						<string key="speakerButton">UISpeakerButton</string>
+						<string key="starButton">UIDigitButton</string>
+						<string key="threeButton">UIDigitButton</string>
+						<string key="twoButton">UIDigitButton</string>
+						<string key="videoButton">UIVideoButton</string>
+						<string key="zeroButton">UIDigitButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="conferenceButton">
+							<string key="name">conferenceButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dialerButton">
+							<string key="name">dialerButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="eightButton">
+							<string key="name">eightButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fiveButton">
+							<string key="name">fiveButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fourButton">
+							<string key="name">fourButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="hangupButton">
+							<string key="name">hangupButton</string>
+							<string key="candidateClassName">UIHangUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="microButton">
+							<string key="name">microButton</string>
+							<string key="candidateClassName">UIMicroButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="nineButton">
+							<string key="name">nineButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="oneButton">
+							<string key="name">oneButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsAddButton">
+							<string key="name">optionsAddButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsButton">
+							<string key="name">optionsButton</string>
+							<string key="candidateClassName">UIToggleButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsTransferButton">
+							<string key="name">optionsTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="optionsView">
+							<string key="name">optionsView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="padView">
+							<string key="name">padView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="pauseButton">
+							<string key="name">pauseButton</string>
+							<string key="candidateClassName">UIPauseButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sevenButton">
+							<string key="name">sevenButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sharpButton">
+							<string key="name">sharpButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="sixButton">
+							<string key="name">sixButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="speakerButton">
+							<string key="name">speakerButton</string>
+							<string key="candidateClassName">UISpeakerButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="starButton">
+							<string key="name">starButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="threeButton">
+							<string key="name">threeButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="twoButton">
+							<string key="name">twoButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoButton">
+							<string key="name">videoButton</string>
+							<string key="candidateClassName">UIVideoButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="zeroButton">
+							<string key="name">zeroButton</string>
+							<string key="candidateClassName">UIDigitButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICallBar.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIDigitButton</string>
+					<string key="superclassName">UILongTouchButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">addressField</string>
+						<string key="NS.object.0">UITextField</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">addressField</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">UITextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIDigitButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIHangUpButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIHangUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UILongTouchButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UILongTouchButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIMicroButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIMicroButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIPauseButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIPauseButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UISpeakerButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UISpeakerButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIToggleButton</string>
+					<string key="superclassName">UIButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIToggleButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITransparentView</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UITransparentView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UIVideoButton</string>
+					<string key="superclassName">UIToggleButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">waitView</string>
+						<string key="NS.object.0">UIActivityIndicatorView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">waitView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">waitView</string>
+							<string key="candidateClassName">UIActivityIndicatorView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UIVideoButton.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="callbar_left_padding.png">{88, 180}</string>
+			<string key="callbar_right_padding.png">{88, 180}</string>
 			<string key="conference_default.png">{209, 136}</string>
 			<string key="conference_default_landscape.png">{130, 163}</string>
 			<string key="conference_over.png">{209, 136}</string>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 57e51dc3a..1007a8f6b 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -326,6 +326,10 @@
 		D33CF34B15D3A03400CD4B85 /* linphone_icon_57@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */; };
 		D33CF34C15D3A03400CD4B85 /* linphone_icon_72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */; };
 		D33CF34D15D3A03400CD4B85 /* linphone_icon_72@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */; };
+		D33E1F08164CF35100CFA363 /* callbar_left_padding.png in Resources */ = {isa = PBXBuildFile; fileRef = D33E1F06164CF35100CFA363 /* callbar_left_padding.png */; };
+		D33E1F09164CF35100CFA363 /* callbar_left_padding.png in Resources */ = {isa = PBXBuildFile; fileRef = D33E1F06164CF35100CFA363 /* callbar_left_padding.png */; };
+		D33E1F0A164CF35100CFA363 /* callbar_right_padding.png in Resources */ = {isa = PBXBuildFile; fileRef = D33E1F07164CF35100CFA363 /* callbar_right_padding.png */; };
+		D33E1F0B164CF35100CFA363 /* callbar_right_padding.png in Resources */ = {isa = PBXBuildFile; fileRef = D33E1F07164CF35100CFA363 /* callbar_right_padding.png */; };
 		D3432A62158A4446001C6B0B /* led_connected.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5C158A4446001C6B0B /* led_connected.png */; };
 		D3432A64158A4446001C6B0B /* led_error.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5D158A4446001C6B0B /* led_error.png */; };
 		D3432A66158A4446001C6B0B /* call_quality_indicator_0.png in Resources */ = {isa = PBXBuildFile; fileRef = D3432A5E158A4446001C6B0B /* call_quality_indicator_0.png */; };
@@ -1757,6 +1761,8 @@
 		D339890515C6E16F00CAF1E4 /* dialer_alt_back_over_landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "dialer_alt_back_over_landscape~ipad.png"; path = "Resources/dialer_alt_back_over_landscape~ipad.png"; sourceTree = "<group>"; };
 		D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_icon_57@2x.png"; path = "Resources/linphone_icon_57@2x.png"; sourceTree = "<group>"; };
 		D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_icon_72@2x.png"; path = "Resources/linphone_icon_72@2x.png"; sourceTree = "<group>"; };
+		D33E1F06164CF35100CFA363 /* callbar_left_padding.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = callbar_left_padding.png; path = Resources/callbar_left_padding.png; sourceTree = "<group>"; };
+		D33E1F07164CF35100CFA363 /* callbar_right_padding.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = callbar_right_padding.png; path = Resources/callbar_right_padding.png; sourceTree = "<group>"; };
 		D3432A5C158A4446001C6B0B /* led_connected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = led_connected.png; path = Resources/led_connected.png; sourceTree = "<group>"; };
 		D3432A5D158A4446001C6B0B /* led_error.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = led_error.png; path = Resources/led_error.png; sourceTree = "<group>"; };
 		D3432A5E158A4446001C6B0B /* call_quality_indicator_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = call_quality_indicator_0.png; path = Resources/call_quality_indicator_0.png; sourceTree = "<group>"; };
@@ -2998,6 +3004,8 @@
 				D31C9C8D158A1C1000756B45 /* call_status_incoming.png */,
 				D31C9C8E158A1C1000756B45 /* call_status_missed.png */,
 				D31C9C8F158A1C1000756B45 /* call_status_outgoing.png */,
+				D33E1F06164CF35100CFA363 /* callbar_left_padding.png */,
+				D33E1F07164CF35100CFA363 /* callbar_right_padding.png */,
 				D3E84F1715B00F4100420DAC /* cancel_default.png */,
 				D3E84F1815B00F4100420DAC /* cancel_over.png */,
 				D36C43CC158F2F370048BA40 /* cell_call.png */,
@@ -4201,6 +4209,8 @@
 				D3103926162C3C5200C00C18 /* linphone_splashscreen-Landscape@2x.png in Resources */,
 				D3103928162C3C5200C00C18 /* linphone_splashscreen-Portrait.png in Resources */,
 				D310392A162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */,
+				D33E1F08164CF35100CFA363 /* callbar_left_padding.png in Resources */,
+				D33E1F0A164CF35100CFA363 /* callbar_right_padding.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4707,6 +4717,8 @@
 				D3103927162C3C5200C00C18 /* linphone_splashscreen-Landscape@2x.png in Resources */,
 				D3103929162C3C5200C00C18 /* linphone_splashscreen-Portrait.png in Resources */,
 				D310392B162C3C5200C00C18 /* linphone_splashscreen-Portrait@2x.png in Resources */,
+				D33E1F09164CF35100CFA363 /* callbar_left_padding.png in Resources */,
+				D33E1F0B164CF35100CFA363 /* callbar_right_padding.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

From d15b9846bba8e875a49e22138369f1e503774700 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Tue, 13 Nov 2012 10:30:57 +0100
Subject: [PATCH 04/14] Now use ranged ports for audio/video

---
 Classes/LinphoneCoreSettingsStore.m           | 75 +++++++++++++++--
 Classes/LinphoneUI/fr.lproj/UICallBar.xib     | 40 ++++-----
 Settings/InAppSettings.bundle/Network.plist   |  8 +-
 .../en.lproj/Network.strings                  |  8 +-
 .../fr.lproj/Network.strings                  |  8 +-
 linphone.ldb/Contents.plist                   | 82 +++++++++++++++----
 .../Network/1/Network.strings                 |  8 +-
 .../UICallBar/{11 => 12}/UICallBar.xib        | 40 ++++-----
 8 files changed, 191 insertions(+), 78 deletions(-)
 rename linphone.ldb/Resources/LinphoneUI/UICallBar/{11 => 12}/UICallBar.xib (99%)

diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 6ec1bfe74..ba467f7fe 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -122,8 +122,22 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
         linphone_address_destroy(parsed);
     }
     {
-        [self setInteger: linphone_core_get_audio_port(lc) forKey:@"audio_port_preference"];
-        [self setInteger: linphone_core_get_video_port(lc) forKey:@"video_port_preference"];
+        {
+            int minPort, maxPort;
+            linphone_core_get_audio_port_range(lc, &minPort, &maxPort);
+            if(minPort != maxPort)
+                [self setObject:[NSString stringWithFormat:@"%d-%d", minPort, maxPort] forKey:@"audio_port_preference"];
+            else
+                [self setObject:[NSString stringWithFormat:@"%d", minPort] forKey:@"audio_port_preference"];
+        }
+        {
+            int minPort, maxPort;
+            linphone_core_get_video_port_range(lc, &minPort, &maxPort);
+            if(minPort != maxPort)
+                [self setObject:[NSString stringWithFormat:@"%d-%d", minPort, maxPort] forKey:@"video_port_preference"];
+            else
+                [self setObject:[NSString stringWithFormat:@"%d", minPort] forKey:@"video_port_preference"];
+        }
     }
     {
         [self setInteger: linphone_core_get_upload_bandwidth(lc) forKey:@"upload_bandwidth_preference"];
@@ -396,6 +410,47 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
     [[[LinphoneManager instance] fastAddressBook] reload];
 }
 
++ (int)validPort:(int)port {
+    if(port < 0) {
+        return 0;
+    }
+    if(port > 65535) {
+        return 65535;
+    }
+    return port;
+}
+
++ (BOOL)parsePortRange:(NSString*)text minPort:(int*)minPort maxPort:(int*)maxPort {
+    NSError* error = nil;
+    *minPort = -1;
+    *maxPort = -1;
+    NSRegularExpression* regex = [NSRegularExpression regularExpressionWithPattern:@"([0-9]+)(([^0-9]+)([0-9]+))?" options:0 error:&error];
+    if(error != NULL)
+        return FALSE;
+    NSArray* matches = [regex matchesInString:text options:0 range:NSMakeRange(0, [text length])];
+    if([matches count] == 1) {
+        NSTextCheckingResult *match = [matches objectAtIndex:0];
+        NSLog(@"%d", [match numberOfRanges]);
+        bool range = [match rangeAtIndex:2].length > 0;
+        if(!range) {
+            NSRange rangeMinPort = [match rangeAtIndex:1];
+            *minPort = [LinphoneCoreSettingsStore validPort:[[text substringWithRange:rangeMinPort] integerValue]];
+            *maxPort = *minPort;
+            return TRUE;
+        } else {
+            NSRange rangeMinPort = [match rangeAtIndex:1];
+            *minPort = [LinphoneCoreSettingsStore validPort:[[text substringWithRange:rangeMinPort] integerValue]];
+            NSRange rangeMaxPort = [match rangeAtIndex:4];
+            *maxPort = [LinphoneCoreSettingsStore validPort:[[text substringWithRange:rangeMaxPort] integerValue]];
+            if(*minPort > *maxPort) {
+                *minPort = *maxPort;
+            }
+           return TRUE;
+        }
+    }
+    return FALSE;
+}
+
 - (BOOL)synchronize {
 	if (![LinphoneManager isLcReady]) return YES;
 	LinphoneCore *lc=[LinphoneManager getLc];
@@ -485,10 +540,18 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
     
 
     // Audio & Video Port
-    int audio_port_preference = [self integerForKey:@"audio_port_preference"];
-    linphone_core_set_audio_port(lc, audio_port_preference);
-    int video_port_preference = [self integerForKey:@"video_port_preference"];
-    linphone_core_set_video_port(lc, video_port_preference);
+    {
+        NSString *audio_port_preference = [self stringForKey:@"audio_port_preference"];
+        int minPort, maxPort;
+        [LinphoneCoreSettingsStore parsePortRange:audio_port_preference minPort:&minPort maxPort:&maxPort];
+        linphone_core_set_audio_port_range(lc, minPort, maxPort);
+    }
+    {
+        NSString *video_port_preference = [self stringForKey:@"video_port_preference"];
+        int minPort, maxPort;
+        [LinphoneCoreSettingsStore parsePortRange:video_port_preference minPort:&minPort maxPort:&maxPort];
+        linphone_core_set_video_port_range(lc, minPort, maxPort);
+    }
     
     int upload_bandwidth = [self integerForKey:@"upload_bandwidth_preference"];
     linphone_core_set_upload_bandwidth(lc, upload_bandwidth);
diff --git a/Classes/LinphoneUI/fr.lproj/UICallBar.xib b/Classes/LinphoneUI/fr.lproj/UICallBar.xib
index 04797317e..166865260 100644
--- a/Classes/LinphoneUI/fr.lproj/UICallBar.xib
+++ b/Classes/LinphoneUI/fr.lproj/UICallBar.xib
@@ -540,7 +540,7 @@
 						<reference key="NSNextResponder" ref="931774220"/>
 						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="196968749">
+							<object class="IBUIImageView" id="688068563">
 								<reference key="NSNextResponder" ref="143533231"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
@@ -550,12 +550,12 @@
 								<int key="IBUITag">100</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<object class="NSCustomResource" key="IBUIImage" id="704895585">
+								<object class="NSCustomResource" key="IBUIImage" id="867449752">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">callbar_left_padding.png</string>
 								</object>
 							</object>
-							<object class="IBUIImageView" id="36875225">
+							<object class="IBUIImageView" id="804009355">
 								<reference key="NSNextResponder" ref="143533231"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{320, -8}, {44, 90}}</string>
@@ -565,7 +565,7 @@
 								<int key="IBUITag">101</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<object class="NSCustomResource" key="IBUIImage" id="971005086">
+								<object class="NSCustomResource" key="IBUIImage" id="148675087">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">callbar_right_padding.png</string>
 								</object>
@@ -879,7 +879,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{215, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
-								<reference key="NSNextKeyView" ref="36875225"/>
+								<reference key="NSNextKeyView" ref="804009355"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -914,7 +914,7 @@
 						</array>
 						<string key="NSFrame">{{0, 325}, {320, 135}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
-						<reference key="NSNextKeyView" ref="196968749"/>
+						<reference key="NSNextKeyView" ref="688068563"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -1292,7 +1292,7 @@
 						<reference key="NSNextResponder" ref="837874415"/>
 						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="94230012">
+							<object class="IBUIImageView" id="836740652">
 								<reference key="NSNextResponder" ref="950460796"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
@@ -1302,9 +1302,9 @@
 								<int key="IBUITag">100</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIImage" ref="704895585"/>
+								<reference key="IBUIImage" ref="867449752"/>
 							</object>
-							<object class="IBUIImageView" id="789250601">
+							<object class="IBUIImageView" id="482311558">
 								<reference key="NSNextResponder" ref="950460796"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{480, -8}, {44, 90}}</string>
@@ -1314,7 +1314,7 @@
 								<int key="IBUITag">101</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIImage" ref="971005086"/>
+								<reference key="IBUIImage" ref="148675087"/>
 							</object>
 							<object class="IBUIView" id="298889112">
 								<reference key="NSNextResponder" ref="950460796"/>
@@ -1622,7 +1622,7 @@
 								<int key="NSvFlags">264</int>
 								<string key="NSFrame">{{415, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
-								<reference key="NSNextKeyView" ref="789250601"/>
+								<reference key="NSNextKeyView" ref="482311558"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -1654,7 +1654,7 @@
 						</array>
 						<string key="NSFrame">{{0, 238}, {480, 82}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
-						<reference key="NSNextKeyView" ref="94230012"/>
+						<reference key="NSNextKeyView" ref="836740652"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -2085,8 +2085,8 @@
 							<reference ref="976589610"/>
 							<reference ref="1016105438"/>
 							<reference ref="259467918"/>
-							<reference ref="196968749"/>
-							<reference ref="36875225"/>
+							<reference ref="688068563"/>
+							<reference ref="804009355"/>
 						</array>
 						<reference key="parent" ref="931774220"/>
 						<string key="objectName">buttons</string>
@@ -2413,8 +2413,8 @@
 							<reference ref="893150238"/>
 							<reference ref="889778982"/>
 							<reference ref="298889112"/>
-							<reference ref="94230012"/>
-							<reference ref="789250601"/>
+							<reference ref="836740652"/>
+							<reference ref="482311558"/>
 						</array>
 						<reference key="parent" ref="837874415"/>
 						<string key="objectName">buttons</string>
@@ -2493,25 +2493,25 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">143</int>
-						<reference key="object" ref="94230012"/>
+						<reference key="object" ref="836740652"/>
 						<reference key="parent" ref="950460796"/>
 						<string key="objectName">leftPadding</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">144</int>
-						<reference key="object" ref="789250601"/>
+						<reference key="object" ref="482311558"/>
 						<reference key="parent" ref="950460796"/>
 						<string key="objectName">rightPadding</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">145</int>
-						<reference key="object" ref="36875225"/>
+						<reference key="object" ref="804009355"/>
 						<reference key="parent" ref="143533231"/>
 						<string key="objectName">rightPadding</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">146</int>
-						<reference key="object" ref="196968749"/>
+						<reference key="object" ref="688068563"/>
 						<reference key="parent" ref="143533231"/>
 						<string key="objectName">leftPadding</string>
 					</object>
diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist
index 410c308e7..864b5acc3 100644
--- a/Settings/InAppSettings.bundle/Network.plist
+++ b/Settings/InAppSettings.bundle/Network.plist
@@ -68,11 +68,11 @@
 			<key>Key</key>
 			<string>audio_port_preference</string>
 			<key>Title</key>
-			<string>Audio Port</string>
+			<string>Audio Port(s)</string>
 			<key>Type</key>
 			<string>PSTextFieldSpecifier</string>
 			<key>KeyboardType</key>
-			<string>NumberPad</string>
+			<string>NumbersAndPunctuation</string>
 			<key>DefaultValue</key>
 			<integer>7076</integer>
 			<key>IASKTextAlignment</key>
@@ -82,11 +82,11 @@
 			<key>Key</key>
 			<string>video_port_preference</string>
 			<key>Title</key>
-			<string>Video Port</string>
+			<string>Video Port(s)</string>
 			<key>Type</key>
 			<string>PSTextFieldSpecifier</string>
 			<key>KeyboardType</key>
-			<string>NumberPad</string>
+			<string>NumbersAndPunctuation</string>
 			<key>DefaultValue</key>
 			<integer>9078</integer>
 			<key>IASKTextAlignment</key>
diff --git a/Settings/InAppSettings.bundle/en.lproj/Network.strings b/Settings/InAppSettings.bundle/en.lproj/Network.strings
index 0af66238b..a2aa822d3 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Network.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Network.strings
@@ -13,11 +13,11 @@
 /* Port */
 "Port" = "Port";
 
-/* Audio Port */
-"Audio Port" = "Audio Port";
+/* Audio Port(s) */
+"Audio Port(s)" = "Audio Port(s)";
 
-/* Video Port */
-"Video Port" = "Video Port";
+/* Video Port(s) */
+"Video Port(s)" = "Video Port(s)";
 
 /* Transport */
 "Transport" = "Transport";
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Network.strings b/Settings/InAppSettings.bundle/fr.lproj/Network.strings
index 8235ab319..105b01f75 100644
--- a/Settings/InAppSettings.bundle/fr.lproj/Network.strings
+++ b/Settings/InAppSettings.bundle/fr.lproj/Network.strings
@@ -13,11 +13,11 @@
 /* Port */
 "Port" = "Port";
 
-/* Audio Port */
-"Audio Port" = "Port Audio";
+/* Audio Port(s) */
+"Audio Port(s)" = "Port(s) Audio";
 
-/* Video Port */
-"Video Port" = "Port Vidéo";
+/* Video Port(s) */
+"Video Port(s)" = "Port(s) Vidéo";
 
 /* Transport */
 "Transport" = "Transport";
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index f3a73709f..72d19e91f 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -7504,17 +7504,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>11</key>
+							<key>12</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>LinphoneUI/UICallBar/11/UICallBar.xib</string>
+								<string>LinphoneUI/UICallBar/12/UICallBar.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-11-09T09:15:46Z</date>
+					<date>2012-11-13T08:39:33Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -7524,7 +7524,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>18fba1eaf5f411c2e245f79b882aa7b1
+					<string>6ce20b228103dd1de3d5c07ecc8cc68a
 </string>
 					<key>name</key>
 					<string>UICallBar.xib</string>
@@ -8626,9 +8626,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>11</string>
+						<string>12</string>
 						<key>fr</key>
-						<string>11</string>
+						<string>12</string>
 					</dict>
 				</dict>
 				<dict>
@@ -17452,7 +17452,7 @@ Raison: %2$s</string>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-11-06T09:36:36Z</date>
+					<date>2012-11-13T09:28:24Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -17462,7 +17462,7 @@ Raison: %2$s</string>
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>bb988b6e05b6fdd4c767f75b9d73b087
+					<string>7220a3af4b5567ce1842c8a01759b1c9
 </string>
 					<key>name</key>
 					<string>Network.strings</string>
@@ -17601,19 +17601,19 @@ Raison: %2$s</string>
 							<key>class</key>
 							<string>BLStringKeyObject</string>
 							<key>comment</key>
-							<string>Audio Port</string>
+							<string>Audio Port(s)</string>
 							<key>errors</key>
 							<array/>
 							<key>flags</key>
 							<integer>0</integer>
 							<key>key</key>
-							<string>Audio Port</string>
+							<string>Audio Port(s)</string>
 							<key>localizations</key>
 							<dict>
 								<key>en</key>
-								<string>Audio Port</string>
+								<string>Audio Port(s)</string>
 								<key>fr</key>
-								<string>Port Audio</string>
+								<string>Port(s) Audio</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -17626,19 +17626,19 @@ Raison: %2$s</string>
 							<key>class</key>
 							<string>BLStringKeyObject</string>
 							<key>comment</key>
-							<string>Video Port</string>
+							<string>Video Port(s)</string>
 							<key>errors</key>
 							<array/>
 							<key>flags</key>
 							<integer>0</integer>
 							<key>key</key>
-							<string>Video Port</string>
+							<string>Video Port(s)</string>
 							<key>localizations</key>
 							<dict>
 								<key>en</key>
-								<string>Video Port</string>
+								<string>Video Port(s)</string>
 								<key>fr</key>
-								<string>Port Vidéo</string>
+								<string>Port(s) Vidéo</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
@@ -18030,6 +18030,56 @@ Raison: %2$s</string>
 							<key>snapshots</key>
 							<dict/>
 						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Audio Port</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Audio Port</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Audio Port</string>
+								<key>fr</key>
+								<string>Port Audio</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>Video Port</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Video Port</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Video Port</string>
+								<key>fr</key>
+								<string>Port Vidéo</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
 					</array>
 					<key>plist file</key>
 					<false/>
diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings b/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
index 0af66238b..a2aa822d3 100644
--- a/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
+++ b/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
@@ -13,11 +13,11 @@
 /* Port */
 "Port" = "Port";
 
-/* Audio Port */
-"Audio Port" = "Audio Port";
+/* Audio Port(s) */
+"Audio Port(s)" = "Audio Port(s)";
 
-/* Video Port */
-"Video Port" = "Video Port";
+/* Video Port(s) */
+"Video Port(s)" = "Video Port(s)";
 
 /* Transport */
 "Transport" = "Transport";
diff --git a/linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib b/linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib
similarity index 99%
rename from linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib
rename to linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib
index 343b085af..3398db0d7 100644
--- a/linphone.ldb/Resources/LinphoneUI/UICallBar/11/UICallBar.xib
+++ b/linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib
@@ -558,7 +558,7 @@
 						<reference key="NSNextResponder" ref="931774220"/>
 						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="196968749">
+							<object class="IBUIImageView" id="688068563">
 								<reference key="NSNextResponder" ref="143533231"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
@@ -569,12 +569,12 @@
 								<int key="IBUITag">100</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<object class="NSCustomResource" key="IBUIImage" id="704895585">
+								<object class="NSCustomResource" key="IBUIImage" id="867449752">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">callbar_left_padding.png</string>
 								</object>
 							</object>
-							<object class="IBUIImageView" id="36875225">
+							<object class="IBUIImageView" id="804009355">
 								<reference key="NSNextResponder" ref="143533231"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{320, -8}, {44, 90}}</string>
@@ -585,7 +585,7 @@
 								<int key="IBUITag">101</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<object class="NSCustomResource" key="IBUIImage" id="971005086">
+								<object class="NSCustomResource" key="IBUIImage" id="148675087">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">callbar_right_padding.png</string>
 								</object>
@@ -909,7 +909,7 @@
 								<string key="NSFrame">{{215, 67}, {105, 68}}</string>
 								<reference key="NSSuperview" ref="143533231"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="36875225"/>
+								<reference key="NSNextKeyView" ref="804009355"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -945,7 +945,7 @@
 						<string key="NSFrame">{{0, 325}, {320, 135}}</string>
 						<reference key="NSSuperview" ref="931774220"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="196968749"/>
+						<reference key="NSNextKeyView" ref="688068563"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -1343,7 +1343,7 @@
 						<reference key="NSNextResponder" ref="837874415"/>
 						<int key="NSvFlags">293</int>
 						<array class="NSMutableArray" key="NSSubviews">
-							<object class="IBUIImageView" id="94230012">
+							<object class="IBUIImageView" id="836740652">
 								<reference key="NSNextResponder" ref="950460796"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{-44, -8}, {44, 90}}</string>
@@ -1354,9 +1354,9 @@
 								<int key="IBUITag">100</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIImage" ref="704895585"/>
+								<reference key="IBUIImage" ref="867449752"/>
 							</object>
-							<object class="IBUIImageView" id="789250601">
+							<object class="IBUIImageView" id="482311558">
 								<reference key="NSNextResponder" ref="950460796"/>
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{480, -8}, {44, 90}}</string>
@@ -1367,7 +1367,7 @@
 								<int key="IBUITag">101</int>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIImage" ref="971005086"/>
+								<reference key="IBUIImage" ref="148675087"/>
 							</object>
 							<object class="IBUIView" id="298889112">
 								<reference key="NSNextResponder" ref="950460796"/>
@@ -1685,7 +1685,7 @@
 								<string key="NSFrame">{{415, 0}, {65, 82}}</string>
 								<reference key="NSSuperview" ref="950460796"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="789250601"/>
+								<reference key="NSNextKeyView" ref="482311558"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<int key="IBUITag">27</int>
@@ -1718,7 +1718,7 @@
 						<string key="NSFrame">{{0, 238}, {480, 82}}</string>
 						<reference key="NSSuperview" ref="837874415"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="94230012"/>
+						<reference key="NSNextKeyView" ref="836740652"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<reference key="IBUIBackgroundColor" ref="67221425"/>
 						<int key="IBUITag">18</int>
@@ -2151,8 +2151,8 @@
 							<reference ref="976589610"/>
 							<reference ref="1016105438"/>
 							<reference ref="259467918"/>
-							<reference ref="196968749"/>
-							<reference ref="36875225"/>
+							<reference ref="688068563"/>
+							<reference ref="804009355"/>
 						</array>
 						<reference key="parent" ref="931774220"/>
 						<string key="objectName">buttons</string>
@@ -2479,8 +2479,8 @@
 							<reference ref="893150238"/>
 							<reference ref="889778982"/>
 							<reference ref="298889112"/>
-							<reference ref="94230012"/>
-							<reference ref="789250601"/>
+							<reference ref="836740652"/>
+							<reference ref="482311558"/>
 						</array>
 						<reference key="parent" ref="837874415"/>
 						<string key="objectName">buttons</string>
@@ -2559,25 +2559,25 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">143</int>
-						<reference key="object" ref="94230012"/>
+						<reference key="object" ref="836740652"/>
 						<reference key="parent" ref="950460796"/>
 						<string key="objectName">leftPadding</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">144</int>
-						<reference key="object" ref="789250601"/>
+						<reference key="object" ref="482311558"/>
 						<reference key="parent" ref="950460796"/>
 						<string key="objectName">rightPadding</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">145</int>
-						<reference key="object" ref="36875225"/>
+						<reference key="object" ref="804009355"/>
 						<reference key="parent" ref="143533231"/>
 						<string key="objectName">rightPadding</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">146</int>
-						<reference key="object" ref="196968749"/>
+						<reference key="object" ref="688068563"/>
 						<reference key="parent" ref="143533231"/>
 						<string key="objectName">leftPadding</string>
 					</object>

From 5423b3b8cb3d2715048160723f655e2d28eede7f Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 13 Nov 2012 14:51:20 +0100
Subject: [PATCH 05/14] update provisionning profile for linphone adhoc

---
 linphone.xcodeproj/project.pbxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 1007a8f6b..88ad73a91 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -5279,7 +5279,7 @@
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = "";
-				PROVISIONING_PROFILE = "EE9CAF78-3536-4133-BAAA-020FDF65D279";
+				PROVISIONING_PROFILE = "7763350E-083E-4ADA-8535-05883F19F947";
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";

From 59adceb9d21fa3a02916144fc71f0d143485d116 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Wed, 14 Nov 2012 12:21:44 +0100
Subject: [PATCH 06/14] Remove dealloc issue in UIDigit button

---
 Classes/LinphoneUI/UIDigitButton.m | 2 +-
 linphone.xcodeproj/project.pbxproj | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Classes/LinphoneUI/UIDigitButton.m b/Classes/LinphoneUI/UIDigitButton.m
index 3f84c0ee6..9d7f03e46 100644
--- a/Classes/LinphoneUI/UIDigitButton.m
+++ b/Classes/LinphoneUI/UIDigitButton.m
@@ -61,8 +61,8 @@
 }	
 
 - (void)dealloc {
-    [super dealloc];
 	[addressField release];
+    [super dealloc];
 }
 
 
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 88ad73a91..2a108235e 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -5684,7 +5684,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -5692,7 +5692,7 @@
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = "";
-				PROVISIONING_PROFILE = "D0073029-09E3-435D-B758-DA3E8EFDA2A3";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";

From 9a6e8dcdf4e23f208e5baf91f47237b4e5d6a7f9 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Wed, 14 Nov 2012 16:11:44 +0100
Subject: [PATCH 07/14] Disable conference button during transition states

---
 Classes/LinphoneUI/UICallBar.m | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m
index eda89bc0e..c1848ad14 100644
--- a/Classes/LinphoneUI/UICallBar.m
+++ b/Classes/LinphoneUI/UICallBar.m
@@ -277,6 +277,22 @@
             [pauseButton setHidden:true];
             [conferenceButton setHidden:false];
         }
+        bool enabled = true;
+        const MSList *list = linphone_core_get_calls(lc);
+        while(list != NULL) {
+            LinphoneCall *call = (LinphoneCall*) list->data;
+            LinphoneCallState state = linphone_call_get_state(call);
+            if(state == LinphoneCallIncomingReceived ||
+               state == LinphoneCallOutgoingInit ||
+               state == LinphoneCallOutgoingProgress ||
+               state == LinphoneCallOutgoingRinging ||
+               state == LinphoneCallOutgoingEarlyMedia ||
+               state == LinphoneCallConnected) {
+                enabled = false;
+            }
+            list = list->next;
+        }
+        [conferenceButton setEnabled:enabled];
     } else {
         if([pauseButton isHidden]) {
             [pauseButton setHidden:false];

From 13d9a7f99d59317c18b0dd4bf94b39ce58ce727a Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Thu, 15 Nov 2012 12:35:48 +0100
Subject: [PATCH 08/14] Hide remove button from contact edition if it is a new
 contact

---
 Classes/ContactDetailsTableViewController.m | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m
index d2e0ef476..74a47a6fe 100644
--- a/Classes/ContactDetailsTableViewController.m
+++ b/Classes/ContactDetailsTableViewController.m
@@ -588,10 +588,11 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C
 
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {   
     if(section == (ContactSections_MAX - 1)) {
-        return [footerController view];
-    } else {
-        return nil;
+        if(ABRecordGetRecordID(contact) != kABRecordInvalidID) {
+            return [footerController view];
+        }
     }
+    return nil;
 }
 
 - (NSString*)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
@@ -619,9 +620,13 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C
     }
 }
 
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section { 
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
     if(section == (ContactSections_MAX - 1)) {
-         return [UIContactDetailsFooter height:[footerController isEditing]];
+        if(ABRecordGetRecordID(contact) != kABRecordInvalidID) {
+            return [UIContactDetailsFooter height:[footerController isEditing]];
+        } else {
+            return 0.000001f; // Hack UITableView = 0
+        }
     } else if(section == ContactSections_None) {
         return 0.000001f; // Hack UITableView = 0
     }

From 19be7093e6964f92efec60ffde9c91056be4561d Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Fri, 16 Nov 2012 11:01:01 +0100
Subject: [PATCH 09/14] Fix test for callSecurityTimer release in call bar

---
 Classes/LinphoneUI/UIStateBar.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/LinphoneUI/UIStateBar.m b/Classes/LinphoneUI/UIStateBar.m
index 90cd30892..926d3b397 100644
--- a/Classes/LinphoneUI/UIStateBar.m
+++ b/Classes/LinphoneUI/UIStateBar.m
@@ -100,7 +100,7 @@ NSTimer *callSecurityTimer;
         [callQualityTimer invalidate];
         callQualityTimer = nil;
     }
-    if(callQualityTimer != nil) {
+    if(callSecurityTimer != nil) {
         [callSecurityTimer invalidate];
         callSecurityTimer = nil;
     }

From 6e953d10f388071e96a5934cf206f6d094d33068 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Fri, 16 Nov 2012 11:31:31 +0100
Subject: [PATCH 10/14] Set LinphoneIPhone as user agent

---
 Classes/LinphoneManager.m | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 6490e6962..02ab35476 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -762,6 +762,8 @@ static LinphoneCoreVTable linphonec_vtable = {
 		linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler);
 	}
 	[LinphoneLogger logc:LinphoneLoggerLog format:"Create linphonecore"];
+    linphone_core_set_user_agent([@"LinphoneIPhone" UTF8String],
+                                 [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]);
 	theLinphoneCore = linphone_core_new (&linphonec_vtable
 										 , [confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]
 										 , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]]

From 1ac1fd95ded2c1317aa9212d2dd8cf4db28b7abf Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Mon, 19 Nov 2012 10:21:32 +0100
Subject: [PATCH 11/14] Fix message not showed when comming back from sleep
 mode

---
 Classes/ChatRoomTableViewController.m |  2 --
 Classes/ChatRoomViewController.m      | 31 +++++++++++++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Classes/ChatRoomTableViewController.m b/Classes/ChatRoomTableViewController.m
index 1555b96f2..1234b40a6 100644
--- a/Classes/ChatRoomTableViewController.m
+++ b/Classes/ChatRoomTableViewController.m
@@ -138,8 +138,6 @@
     }
     self->remoteAddress = [aremoteAddress copy];
     [self loadData];
-    [ChatModel readConversation:remoteAddress];
-    [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneTextReceived object:self];
 }
 
 
diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index 552be969f..0915a4abe 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -143,7 +143,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    [[NSNotificationCenter defaultCenter] addObserver:self 
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(applicationWillEnterForeground:)
+                                                 name:UIApplicationDidBecomeActiveNotification
+                                               object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(keyboardWillShow:) 
                                                  name:UIKeyboardWillShowNotification 
                                                object:nil];
@@ -186,6 +190,10 @@ static UICompositeViewDescription *compositeDescription = nil;
         linphone_chat_room_destroy(chatRoom);
         chatRoom = NULL;
     }
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:UIApplicationDidBecomeActiveNotification
+                                                  object:nil];
+    
     [[NSNotificationCenter defaultCenter] removeObserver:self
                                                     name:UIKeyboardWillShowNotification 
                                                   object:nil];
@@ -226,6 +234,15 @@ static UICompositeViewDescription *compositeDescription = nil;
     [messageField setText:@""];
     [self update];
 	[tableController setRemoteAddress: remoteAddress];
+    [ChatModel readConversation:remoteAddress];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneTextReceived object:self];
+}
+
+- (void)applicationWillEnterForeground:(NSNotification*)notif {
+    if(remoteAddress != nil) {
+        [ChatModel readConversation:remoteAddress];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneTextReceived object:self];
+    }
 }
 
 - (void)update {
@@ -398,16 +415,16 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     }
     char *fromStr = linphone_address_as_string_uri_only(from);
     if(fromStr != NULL) {
-        if (![[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]
-            || [UIApplication sharedApplication].applicationState ==  UIApplicationStateActive) {
-            if([[NSString stringWithUTF8String:fromStr]
-                caseInsensitiveCompare:remoteAddress] == NSOrderedSame) {
+        if([[NSString stringWithUTF8String:fromStr]
+            caseInsensitiveCompare:remoteAddress] == NSOrderedSame) {
+            if (![[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]
+                || [UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
                 [chat setRead:[NSNumber numberWithInt:1]];
                 [chat update];
                 [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneTextReceived object:self];
-                [tableController addChatEntry:chat];
-                [tableController scrollToLastUnread:TRUE];
             }
+            [tableController addChatEntry:chat];
+            [tableController scrollToLastUnread:TRUE];
         }
         ms_free(fromStr);
     }

From 57b2b2c289c703c89711f54f4ee0405f2743ba4f Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Mon, 19 Nov 2012 12:42:03 +0100
Subject: [PATCH 12/14] Fix autocorrection on destination field in chat view

---
 Classes/en.lproj/ChatViewController.xib              |  5 +++--
 Classes/fr.lproj/ChatViewController.xib              |  4 +++-
 linphone.ldb/Contents.plist                          | 12 ++++++------
 .../{17 => 19}/ChatViewController.xib                |  5 +++--
 4 files changed, 15 insertions(+), 11 deletions(-)
 rename linphone.ldb/Resources/Classes/ChatViewController/{17 => 19}/ChatViewController.xib (99%)

diff --git a/Classes/en.lproj/ChatViewController.xib b/Classes/en.lproj/ChatViewController.xib
index d524c9766..5e67b7643 100644
--- a/Classes/en.lproj/ChatViewController.xib
+++ b/Classes/en.lproj/ChatViewController.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11G56</string>
+		<string key="IBDocument.SystemVersion">11G63</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
 		<string key="IBDocument.AppKitVersion">1138.51</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
@@ -174,7 +174,6 @@
 						<string key="NSFrame">{{0, 79}, {320, 381}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -231,6 +230,8 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
+							<int key="IBUIKeyboardType">3</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground">
diff --git a/Classes/fr.lproj/ChatViewController.xib b/Classes/fr.lproj/ChatViewController.xib
index 5fd2b5997..f0148c657 100644
--- a/Classes/fr.lproj/ChatViewController.xib
+++ b/Classes/fr.lproj/ChatViewController.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11G56</string>
+		<string key="IBDocument.SystemVersion">11G63</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
 		<string key="IBDocument.AppKitVersion">1138.51</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
@@ -224,6 +224,8 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
+							<int key="IBUIKeyboardType">3</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground">
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index 72d19e91f..eb0b3d625 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -803,17 +803,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>17</key>
+							<key>19</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/ChatViewController/17/ChatViewController.xib</string>
+								<string>Classes/ChatViewController/19/ChatViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-10-16T14:43:40Z</date>
+					<date>2012-11-19T11:40:43Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -823,7 +823,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>7e5a8ab77b42e6a8f401a59751110598
+					<string>467bb3255f207bc3c8d25dcdfca871ee
 </string>
 					<key>name</key>
 					<string>ChatViewController.xib</string>
@@ -1038,9 +1038,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>17</string>
+						<string>19</string>
 						<key>fr</key>
-						<string>17</string>
+						<string>19</string>
 					</dict>
 				</dict>
 				<dict>
diff --git a/linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib b/linphone.ldb/Resources/Classes/ChatViewController/19/ChatViewController.xib
similarity index 99%
rename from linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib
rename to linphone.ldb/Resources/Classes/ChatViewController/19/ChatViewController.xib
index d524c9766..5e67b7643 100644
--- a/linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib
+++ b/linphone.ldb/Resources/Classes/ChatViewController/19/ChatViewController.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">11G56</string>
+		<string key="IBDocument.SystemVersion">11G63</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
 		<string key="IBDocument.AppKitVersion">1138.51</string>
 		<string key="IBDocument.HIToolboxVersion">569.00</string>
@@ -174,7 +174,6 @@
 						<string key="NSFrame">{{0, 79}, {320, 381}}</string>
 						<reference key="NSSuperview" ref="1010501960"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -231,6 +230,8 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
+							<int key="IBUIKeyboardType">3</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground">

From 0699c80889d50bff563d091521d33f1c68f7ccf7 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 20 Nov 2012 11:15:38 +0100
Subject: [PATCH 13/14] rework CT call center to use it only when required

---
 Classes/LinphoneManager.h |   2 +-
 Classes/LinphoneManager.m | 198 +++++++++++++++++++-------------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h
index 4e7cb15c4..5a9d5491d 100644
--- a/Classes/LinphoneManager.h
+++ b/Classes/LinphoneManager.h
@@ -90,7 +90,7 @@ typedef struct _LinphoneManagerSounds {
     BOOL stopWaitingRegisters;
 	UIBackgroundTaskIdentifier pausedCallBgTask;
 	UIBackgroundTaskIdentifier incallBgTask;
-	CTCallCenter* callCenter;
+	CTCallCenter* mCallCenter;
     
 @public
     CallContext currentCallContextBeforeGoingBackground;
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 02ab35476..e3c461ac6 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -387,70 +387,73 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
 	}
 
 	
-	if (state == LinphoneCallIncomingReceived
-		&&[[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]
-		&& [UIApplication sharedApplication].applicationState !=  UIApplicationStateActive) {
+	if (state == LinphoneCallIncomingReceived) {
         
 		/*first step is to re-enable ctcall center*/
-		[self setupGSMInteraction];
+		CTCallCenter* lCTCallCenter = [[CTCallCenter alloc] init];
 		
 		/*should we reject this call ?*/
-		if ([callCenter currentCalls]!=nil) {
+		if ([lCTCallCenter currentCalls]!=nil) {
 			[LinphoneLogger logc:LinphoneLoggerLog format:"Mobile call ongoing... rejecting call from [%s]",linphone_address_get_username(linphone_call_get_call_log(call)->from)];
 			linphone_core_decline_call([LinphoneManager getLc], call,LinphoneReasonBusy);
+			[lCTCallCenter release];
 			return;
 		}
+		[lCTCallCenter release];
 		
-		
-		LinphoneCallLog* callLog=linphone_call_get_call_log(call);
-		NSString* callId=[NSString stringWithUTF8String:callLog->call_id];
-        const LinphoneAddress *addr = linphone_call_get_remote_address(call);
-        NSString* address = nil;
-        if(addr != NULL) {
-            BOOL useLinphoneAddress = true;
-            // contact name
-            char* lAddress = linphone_address_as_string_uri_only(addr);
-            if(lAddress) {
-                NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:[NSString stringWithUTF8String:lAddress]];
-                ABRecordRef contact = [fastAddressBook getContact:normalizedSipAddress];
-                if(contact) {
-                    address = [FastAddressBook getContactDisplayName:contact];
-                    useLinphoneAddress = false;
-                }
-                ms_free(lAddress);
-            }
-            if(useLinphoneAddress) {
-                const char* lDisplayName = linphone_address_get_display_name(addr);
-                const char* lUserName = linphone_address_get_username(addr);
-                if (lDisplayName)
-                    address = [NSString stringWithUTF8String:lDisplayName];
-                else if(lUserName)
-                    address = [NSString stringWithUTF8String:lUserName];
-            }
-        }
-        if(address == nil) {
-            address = @"Unknown";
-        }
-        
-		if (![[LinphoneManager instance] shouldAutoAcceptCallForCallId:callId]){
-			// case where a remote notification is not already received
-			// Create a new local notification
-			data->notification = [[UILocalNotification alloc] init];
-			if (data->notification) {
-				data->notification.repeatInterval = 0;
-				data->notification.alertBody =[NSString  stringWithFormat:NSLocalizedString(@"IC_MSG",nil), address];
-				data->notification.alertAction = NSLocalizedString(@"Answer", nil);
-				data->notification.soundName = @"ring.caf";
-				data->notification.userInfo = [NSDictionary dictionaryWithObject:callId forKey:@"callId"];
-				
-				[[UIApplication sharedApplication] presentLocalNotificationNow:data->notification];
-				
-				if (!incallBgTask){
-					incallBgTask = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{
-						[LinphoneLogger log:LinphoneLoggerWarning format:@"Call cannot ring any more, too late"];
-					}];
+		if(	[[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]
+		   && [UIApplication sharedApplication].applicationState !=  UIApplicationStateActive) {
+			
+			LinphoneCallLog* callLog=linphone_call_get_call_log(call);
+			NSString* callId=[NSString stringWithUTF8String:callLog->call_id];
+			const LinphoneAddress *addr = linphone_call_get_remote_address(call);
+			NSString* address = nil;
+			if(addr != NULL) {
+				BOOL useLinphoneAddress = true;
+				// contact name
+				char* lAddress = linphone_address_as_string_uri_only(addr);
+				if(lAddress) {
+					NSString *normalizedSipAddress = [FastAddressBook normalizeSipURI:[NSString stringWithUTF8String:lAddress]];
+					ABRecordRef contact = [fastAddressBook getContact:normalizedSipAddress];
+					if(contact) {
+						address = [FastAddressBook getContactDisplayName:contact];
+						useLinphoneAddress = false;
+					}
+					ms_free(lAddress);
+				}
+				if(useLinphoneAddress) {
+					const char* lDisplayName = linphone_address_get_display_name(addr);
+					const char* lUserName = linphone_address_get_username(addr);
+					if (lDisplayName)
+						address = [NSString stringWithUTF8String:lDisplayName];
+					else if(lUserName)
+						address = [NSString stringWithUTF8String:lUserName];
+				}
+			}
+			if(address == nil) {
+				address = @"Unknown";
+			}
+			
+			if (![[LinphoneManager instance] shouldAutoAcceptCallForCallId:callId]){
+				// case where a remote notification is not already received
+				// Create a new local notification
+				data->notification = [[UILocalNotification alloc] init];
+				if (data->notification) {
+					data->notification.repeatInterval = 0;
+					data->notification.alertBody =[NSString  stringWithFormat:NSLocalizedString(@"IC_MSG",nil), address];
+					data->notification.alertAction = NSLocalizedString(@"Answer", nil);
+					data->notification.soundName = @"ring.caf";
+					data->notification.userInfo = [NSDictionary dictionaryWithObject:callId forKey:@"callId"];
+					
+					[[UIApplication sharedApplication] presentLocalNotificationNow:data->notification];
+					
+					if (!incallBgTask){
+						incallBgTask = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{
+							[LinphoneLogger log:LinphoneLoggerWarning format:@"Call cannot ring any more, too late"];
+						}];
+					}
+					
 				}
-
 			}
 		}
 	}
@@ -466,8 +469,10 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
     
     // Disable speaker when no more call
     if ((state == LinphoneCallEnd || state == LinphoneCallError)) {
-        if(linphone_core_get_calls_nb([LinphoneManager getLc]) == 0)
+        if(linphone_core_get_calls_nb([LinphoneManager getLc]) == 0) {
             [self setSpeakerEnabled:FALSE];
+			[self removeCTCallCenterCb];
+		}
 		if (incallBgTask) {
 			[[UIApplication sharedApplication]  endBackgroundTask:incallBgTask];
 			incallBgTask=0;
@@ -483,7 +488,10 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
             [self setSpeakerEnabled:TRUE];
         }
     }
-    
+    if (state == LinphoneCallConnected && !mCallCenter) {
+		/*only register CT call center CB for connected call*/
+		[self setupGSMInteraction];
+	}
     // Post event
     NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys:
                            [NSValue valueWithPointer:call], @"call",
@@ -754,7 +762,6 @@ static LinphoneCoreVTable linphonec_vtable = {
 #if HAVE_G729
 	libmsbcg729_init(); // load g729 plugin
 #endif
-	[self setupGSMInteraction];
 	/* Initialize linphone core*/
     
 	/*to make sure we don't loose debug trace*/
@@ -861,13 +868,8 @@ static LinphoneCoreVTable linphonec_vtable = {
 
 - (void)destroyLibLinphone {
 	[mIterateTimer invalidate]; 
-	// destroying eventHandler if app cannot go in background.
-	// Otherwise if a GSM call happen and Linphone is resumed,
-	// the handler will be called before LinphoneCore is built.
-	// Then handler will be restored in appDidBecomeActive cb
-	callCenter.callEventHandler = nil;
-	[callCenter release];
-	callCenter = nil;
+	//just in case
+	[self removeCTCallCenterCb];
 	
 	AVAudioSession *audioSession = [AVAudioSession sharedInstance];
 	[audioSession setDelegate:nil];
@@ -958,6 +960,13 @@ static int comp_call_state_paused  (const LinphoneCall* call, const void* param)
 	return linphone_call_get_state(call) != LinphoneCallPaused;
 }
 
+- (void) startCallPausedLongRunningTask {
+	pausedCallBgTask = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{
+		[LinphoneLogger log:LinphoneLoggerWarning format:@"Call cannot be paused any more, too late"];
+	}];
+	[LinphoneLogger log:LinphoneLoggerLog format:@"Long running task started, remaining [%g s] because at least one call is paused"
+	 ,[[UIApplication  sharedApplication] backgroundTimeRemaining]];
+}
 - (BOOL)enterBackgroundMode {
 	LinphoneProxyConfig* proxyCfg;
 	linphone_core_get_default_proxy(theLinphoneCore, &proxyCfg);	
@@ -985,13 +994,6 @@ static int comp_call_state_paused  (const LinphoneCall* call, const void* param)
 																   return;
 															   }
 															   //kick up network cnx, just in case
-															   [LinphoneManager kickOffNetworkConnection];
-                                                               
-                                                               [self setupGSMInteraction];
-                                                               //to make sure presence status is correct
-                                                               if ([callCenter currentCalls]==nil)
-                                                                   linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService);
-                                                               
 															   [self refreshRegisters];
 															   linphone_core_iterate(theLinphoneCore);
 														   }
@@ -1007,13 +1009,8 @@ static int comp_call_state_paused  (const LinphoneCall* call, const void* param)
 		if (!currentCall //no active call
 			&& callList // at least one call in a non active state
 			&& ms_list_find_custom((MSList*)callList, (MSCompareFunc) comp_call_state_paused, NULL)) {
-			pausedCallBgTask = [[UIApplication sharedApplication] beginBackgroundTaskWithExpirationHandler: ^{
-				[LinphoneLogger log:LinphoneLoggerWarning format:@"Call cannot be paused any more, too late"];
-			}];
-			[LinphoneLogger log:LinphoneLoggerLog format:@"Long running task started, remaining [%fs] because at least one call is paused"
-			 ,[[UIApplication  sharedApplication] backgroundTimeRemaining]];
+			[self startCallPausedLongRunningTask];
 		}
-		
 		return YES;
 	}
 	else {
@@ -1037,14 +1034,6 @@ static int comp_call_state_paused  (const LinphoneCall* call, const void* param)
 	/*IOS specific*/
 	linphone_core_start_dtmf_stream(theLinphoneCore);
 	
-	
-	//call center is unrelialable on the long run, so we change it each time the application is resumed. To avoid zombie GSM call
-	[self setupGSMInteraction];
-	
-	//to make sure presence status is correct
-	if ([callCenter currentCalls]==nil)
-		linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService);
-	
 
 }
 
@@ -1132,7 +1121,7 @@ static void audioRouteChangeListenerCallback (
 		return;
 	}
     
-    
+    CTCallCenter* callCenter = [[CTCallCenter alloc] init];
     if ([callCenter currentCalls]!=nil) {
         [LinphoneLogger logc:LinphoneLoggerError format:"GSM call in progress, cancelling outgoing SIP call request"];
 		UIAlertView* error = [[UIAlertView alloc]	initWithTitle:NSLocalizedString(@"Cannot make call",nil)
@@ -1142,9 +1131,11 @@ static void audioRouteChangeListenerCallback (
 											  otherButtonTitles:nil];
 		[error show];
         [error release];
+		[callCenter release];
 		return;
     }
-    
+    [callCenter release];
+	
 	LinphoneProxyConfig* proxyCfg;	
 	//get default proxy
 	linphone_core_get_default_proxy([LinphoneManager getLc],&proxyCfg);
@@ -1340,18 +1331,24 @@ static void audioRouteChangeListenerCallback (
 }
 
 #pragma GSM management
+-(void) removeCTCallCenterCb {
+	if (mCallCenter != nil) {
+		[LinphoneLogger log:LinphoneLoggerLog format:@"Removing CT call center listener [%p]",mCallCenter];
+		mCallCenter.callEventHandler=NULL;
+		[mCallCenter release];
+	}
+	mCallCenter=nil;
+}
 
 - (void)setupGSMInteraction {
     
-	if (callCenter != nil) {
-		callCenter.callEventHandler=NULL;
-		[callCenter release];
-	}
-    callCenter = [[CTCallCenter alloc] init];
-    callCenter.callEventHandler = ^(CTCall* call) {
+	[self removeCTCallCenterCb];
+    mCallCenter = [[CTCallCenter alloc] init];
+	[LinphoneLogger log:LinphoneLoggerLog format:@"Adding CT call center listener [%p]",mCallCenter];
+    mCallCenter.callEventHandler = ^(CTCall* call) {
 		// post on main thread
 		[self performSelectorOnMainThread:@selector(handleGSMCallInteration:)
-							   withObject:callCenter
+							   withObject:mCallCenter
 							waitUntilDone:YES];
 	};
     
@@ -1362,12 +1359,15 @@ static void audioRouteChangeListenerCallback (
 	/* pause current call, if any */
 	LinphoneCall* call = linphone_core_get_current_call(theLinphoneCore);
 	if ([ct currentCalls]!=nil) {
-		if (call) {[LinphoneLogger logc:LinphoneLoggerLog format:"Pausing SIP call"];
+		if (call) {
+			[LinphoneLogger log:LinphoneLoggerLog format:@"Pausing SIP call because GSM call"];
 			linphone_core_pause_call(theLinphoneCore, call);
+			[self startCallPausedLongRunningTask];
+		} else if (linphone_core_is_in_conference(theLinphoneCore)) {
+			[LinphoneLogger log:LinphoneLoggerLog format:@"Leaving conference call because GSM call"];
+			linphone_core_leave_conference(theLinphoneCore);
+			[self startCallPausedLongRunningTask];
 		}
-		//set current status to busy
-		linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusBusy);
-	} else
-		linphone_core_set_presence_info(theLinphoneCore, 0, nil, LinphoneStatusAltService);
+	} //else nop, keep call in paused state
 }
 @end

From 7e89293219105a7564a8ef138d70514aaff559e8 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 20 Nov 2012 11:16:03 +0100
Subject: [PATCH 14/14] ipdate xcode project to point to org.linphone.phone
 application id

---
 linphone.xcodeproj/project.pbxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 2a108235e..824e77e6c 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -5684,7 +5684,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -5692,7 +5692,7 @@
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				LIBRARY_SEARCH_PATHS = "";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C";
 				SDKROOT = iphoneos;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";