From 90de9252e8424bd73bc3434cfd1e114421fdeea4 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 19 Oct 2015 15:01:27 +0200
Subject: [PATCH] Settings: fix crash

---
 Classes/Base.lproj/CallView.xib     |  2 +-
 Classes/Base.lproj/DialerView.xib   | 37 ++++++++++++++++-------------
 Classes/LinphoneCoreSettingsStore.m |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index 377e9a707..b93eb19b6 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -144,7 +144,7 @@
                                             </accessibility>
                                         </view>
                                         <view contentMode="scaleAspectFit" id="127" userLabel="preview">
-                                            <rect key="frame" x="254.00000029960563" y="355" width="113" height="140"/>
+                                            <rect key="frame" x="254" y="354.99999967643191" width="113" height="140"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
diff --git a/Classes/Base.lproj/DialerView.xib b/Classes/Base.lproj/DialerView.xib
index 0f8f80054..ff9d0ee56 100644
--- a/Classes/Base.lproj/DialerView.xib
+++ b/Classes/Base.lproj/DialerView.xib
@@ -258,33 +258,21 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Call"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" image="call_alt_start.png" backgroundImage="color_A.png">
+                                    <state key="normal" image="call_start_body_default.png" backgroundImage="color_A.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
-                                    <state key="highlighted" backgroundImage="color_L.png"/>
+                                    <state key="disabled" image="call_start_body_disabled.png"/>
+                                    <state key="highlighted" image="call_start_body_over.png" backgroundImage="color_L.png"/>
                                     <connections>
                                         <outlet property="addressField" destination="4" id="235"/>
                                     </connections>
                                 </button>
-                                <button hidden="YES" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="184" userLabel="addCallButton" customClass="UICallButton">
-                                    <rect key="frame" x="125" y="0.0" width="250" height="66"/>
-                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                    <accessibility key="accessibilityConfiguration" label="Add call"/>
-                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" image="call_add.png" backgroundImage="color_F.png">
-                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                    </state>
-                                    <state key="highlighted" backgroundImage="color_E.png"/>
-                                    <connections>
-                                        <outlet property="addressField" destination="4" id="234"/>
-                                    </connections>
-                                </button>
                                 <button hidden="YES" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="236" userLabel="transferButton" customClass="UITransferButton">
                                     <rect key="frame" x="125" y="0.0" width="250" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Transfer call"/>
                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
-                                    <state key="normal" image="call_transfer.png" backgroundImage="color_F.png">
+                                    <state key="normal" image="call_transfer.png" backgroundImage="color_A.png">
                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                     </state>
                                     <state key="highlighted" backgroundImage="color_E.png"/>
@@ -292,6 +280,19 @@
                                         <outlet property="addressField" destination="4" id="237"/>
                                     </connections>
                                 </button>
+                                <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="184" userLabel="addCallButton" customClass="UICallButton">
+                                    <rect key="frame" x="125" y="0.0" width="250" height="66"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                    <accessibility key="accessibilityConfiguration" label="Add call"/>
+                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                    <state key="normal" image="call_add.png" backgroundImage="color_A.png">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <state key="highlighted" backgroundImage="color_E.png"/>
+                                    <connections>
+                                        <outlet property="addressField" destination="4" id="234"/>
+                                    </connections>
+                                </button>
                             </subviews>
                             <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         </view>
@@ -308,7 +309,9 @@
         <image name="backspace_default.png" width="36" height="19"/>
         <image name="backspace_over.png" width="36" height="19"/>
         <image name="call_add.png" width="39" height="35"/>
-        <image name="call_alt_start.png" width="29" height="29"/>
+        <image name="call_start_body_default.png" width="51" height="51"/>
+        <image name="call_start_body_disabled.png" width="51" height="51"/>
+        <image name="call_start_body_over.png" width="51" height="51"/>
         <image name="call_transfer.png" width="40" height="36"/>
         <image name="color_A.png" width="1" height="1"/>
         <image name="color_E.png" width="1" height="1"/>
diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 43848f853..b04f2301f 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -514,7 +514,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 				linphone_auth_info_set_passwd(proxyAi, password);
 				linphone_auth_info_set_ha1(proxyAi, NULL);
 			}
-			linphone_auth_info_set_domain(info, linphone_proxy_config_get_domain(proxyCfg));
+			linphone_auth_info_set_domain(proxyAi, linphone_proxy_config_get_domain(proxyCfg));
 		} else {
 			LinphoneAddress *from = linphone_address_new(identity);
 			if (from) {