From 96a0b792baf022f3d44aa79676e472d29323b019 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Tue, 11 Sep 2012 14:12:43 +0200
Subject: [PATCH] Fix History details view

---
 .gitignore                                    |   1 +
 Classes/HistoryDetailsViewController.m        |   1 +
 .../en.lproj/HistoryDetailsViewController.xib |   2 +-
 .../fr.lproj/HistoryDetailsViewController.xib |   2 +-
 Resources/fr.lproj/Localizable.strings        | Bin 14018 -> 14020 bytes
 linphone.ldb/Contents.plist                   |  14 +++++++-------
 .../{1 => 2}/HistoryDetailsViewController.xib |   2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)
 rename linphone.ldb/Resources/Classes/HistoryDetailsViewController/{1 => 2}/HistoryDetailsViewController.xib (99%)

diff --git a/.gitignore b/.gitignore
index dd07bff2c..9c6145750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 build-*
+*.locuser
diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m
index 8b5f2a169..eefed13c2 100644
--- a/Classes/HistoryDetailsViewController.m
+++ b/Classes/HistoryDetailsViewController.m
@@ -268,6 +268,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     if(contact) {
         ContactDetailsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactDetailsViewController compositeViewDescription] push:TRUE], ContactDetailsViewController);
         if(controller != nil) {
+            [ContactSelection setSelectionMode:ContactSelectionModeNone];
             [controller setContact:contact];
         }
     }
diff --git a/Classes/en.lproj/HistoryDetailsViewController.xib b/Classes/en.lproj/HistoryDetailsViewController.xib
index 75f2fc588..afce0f1a5 100644
--- a/Classes/en.lproj/HistoryDetailsViewController.xib
+++ b/Classes/en.lproj/HistoryDetailsViewController.xib
@@ -123,7 +123,7 @@
 								<reference key="IBUIFont" ref="255564883"/>
 							</object>
 						</array>
-						<string key="NSFrameSize">{320, 58}</string>
+						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="581237105"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="778261436"/>
diff --git a/Classes/fr.lproj/HistoryDetailsViewController.xib b/Classes/fr.lproj/HistoryDetailsViewController.xib
index 90142d952..a34626363 100644
--- a/Classes/fr.lproj/HistoryDetailsViewController.xib
+++ b/Classes/fr.lproj/HistoryDetailsViewController.xib
@@ -120,7 +120,7 @@
 								<reference key="IBUIFont" ref="255564883"/>
 							</object>
 						</array>
-						<string key="NSFrameSize">{320, 58}</string>
+						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="581237105"/>
 						<reference key="NSNextKeyView" ref="778261436"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index 5a905d5179a2c24044796e7f2db56d31fb95e240..c364fc42d57079fb1f1e2d18d93c8a57e17ef9e5 100644
GIT binary patch
delta 14
WcmX?<dn9+m4JJm1&DWV;8v_703kKEz

delta 12
UcmX?-dnk9q4W`Yvm|htJ04=-*mjD0&

diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index f587e1cf2..d4220eca9 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -2022,17 +2022,17 @@
 					<dict>
 						<key>backup</key>
 						<dict>
-							<key>1</key>
+							<key>2</key>
 							<dict>
 								<key>class</key>
 								<string>BLWrapperHandle</string>
 								<key>name</key>
-								<string>Classes/HistoryDetailsViewController/1/HistoryDetailsViewController.xib</string>
+								<string>Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib</string>
 							</dict>
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-10T15:21:27Z</date>
+					<date>2012-09-11T12:08:15Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -2042,7 +2042,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>8e3f7756f219a2bd1a73da657abf7f25
+					<string>5772e41dc8ea1406d99370f79cb51bce
 </string>
 					<key>name</key>
 					<string>HistoryDetailsViewController.xib</string>
@@ -2446,9 +2446,9 @@
 					<key>versions</key>
 					<dict>
 						<key>en</key>
-						<string>1</string>
+						<string>2</string>
 						<key>fr</key>
-						<string>1</string>
+						<string>2</string>
 					</dict>
 				</dict>
 				<dict>
@@ -7273,7 +7273,7 @@ La cause était: %2$@</string>
 								<key>en</key>
 								<string>'%@' not registered</string>
 								<key>fr</key>
-								<string>'%' n'est pas enregistré</string>
+								<string>'%@' n'est pas enregistré</string>
 							</dict>
 							<key>snapshots</key>
 							<dict/>
diff --git a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/1/HistoryDetailsViewController.xib b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib
similarity index 99%
rename from linphone.ldb/Resources/Classes/HistoryDetailsViewController/1/HistoryDetailsViewController.xib
rename to linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib
index 75f2fc588..afce0f1a5 100644
--- a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/1/HistoryDetailsViewController.xib
+++ b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib
@@ -123,7 +123,7 @@
 								<reference key="IBUIFont" ref="255564883"/>
 							</object>
 						</array>
-						<string key="NSFrameSize">{320, 58}</string>
+						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="581237105"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="778261436"/>