From a56ab71330c4d234e661030196b34c334286309e Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 15 Oct 2015 14:25:24 +0200
Subject: [PATCH] Conference: continuation

---
 Classes/Base.lproj/CallView.xib                      | 2 +-
 Classes/CallIncomingView.m                           | 2 +-
 Classes/CallView.m                                   | 2 ++
 Classes/LinphoneUI/Base.lproj/UIContactCell.xib      | 3 ++-
 Classes/LinphoneUI/UICheckBoxTVTableViewController.m | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index 4d2faa4f1..57699759b 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -156,7 +156,7 @@
                                             </accessibility>
                                         </view>
                                         <view contentMode="scaleAspectFit" id="127" userLabel="preview">
-                                            <rect key="frame" x="254.00000029960563" y="354.99999967643191" width="113" height="140"/>
+                                            <rect key="frame" x="254" y="354.99999934763446" 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/CallIncomingView.m b/Classes/CallIncomingView.m
index 4bc0a1c76..bd83fda4d 100644
--- a/Classes/CallIncomingView.m
+++ b/Classes/CallIncomingView.m
@@ -82,7 +82,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		[self dismiss];
 	} else if ([LinphoneManager.instance lpConfigBoolForKey:@"auto_answer"]) {
 		LinphoneCallState state = linphone_call_get_state(call);
-		if (state == LinphoneCallIncomingReceived || state == LinphoneCallIncomingEarlyMedia) {
+		if (state == LinphoneCallIncomingReceived) {
 			[self onAcceptClick:nil];
 		}
 	}
diff --git a/Classes/CallView.m b/Classes/CallView.m
index 8095d3ffc..80b359aec 100644
--- a/Classes/CallView.m
+++ b/Classes/CallView.m
@@ -836,6 +836,7 @@ static void hideSpinner(LinphoneCall *call, void *user_data) {
 	target.frame = frame;
 	frame.origin.y = original_y;
 	target.hidden = NO;
+
 	[UIView animateWithDuration:0.5
 		delay:0.0
 		options:UIViewAnimationOptionCurveEaseOut
@@ -843,6 +844,7 @@ static void hideSpinner(LinphoneCall *call, void *user_data) {
 		  target.frame = frame;
 		}
 		completion:^(BOOL finished) {
+		  target.frame = frame; // in case application did not finish
 		  completion(finished);
 		}];
 }
diff --git a/Classes/LinphoneUI/Base.lproj/UIContactCell.xib b/Classes/LinphoneUI/Base.lproj/UIContactCell.xib
index 1a3b0bee7..b5646d11e 100644
--- a/Classes/LinphoneUI/Base.lproj/UIContactCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIContactCell.xib
@@ -113,9 +113,10 @@
 					<object class="IBUIImageView" id="647977481">
 						<reference key="NSNextResponder" ref="675878782"/>
 						<int key="NSvFlags">297</int>
-						<string key="NSFrame">{{314, 11}, {25, 22}}</string>
+						<string key="NSFrame">{{280, 11}, {25, 22}}</string>
 						<reference key="NSSuperview" ref="675878782"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
diff --git a/Classes/LinphoneUI/UICheckBoxTVTableViewController.m b/Classes/LinphoneUI/UICheckBoxTVTableViewController.m
index 87743ab6c..3fde52eb8 100644
--- a/Classes/LinphoneUI/UICheckBoxTVTableViewController.m
+++ b/Classes/LinphoneUI/UICheckBoxTVTableViewController.m
@@ -38,7 +38,8 @@
 
 - (void)viewDidAppear:(BOOL)animated {
 	[super viewDidAppear:animated];
-	_editButton.enabled = [self tableView:self.tableView numberOfRowsInSection:0] != 0;
+	_editButton.enabled = (([self numberOfSectionsInTableView:self.tableView] > 0) &&
+						   ([self tableView:self.tableView numberOfRowsInSection:0] != 0));
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {