From e578019a9c6cba1af4f7eef268f8948b2e6b4279 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Tue, 7 Aug 2012 18:11:56 +0200
Subject: [PATCH] Fix prefix and label stuff for castel

---
 Classes/ContactDetailsTableViewController.m | 8 ++++----
 Classes/DialerViewController.m              | 4 ++++
 Classes/DialerViewController.xib            | 2 +-
 Classes/DialerViewController~ipad.xib       | 8 ++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m
index 5f2c25371..0b779b8d4 100644
--- a/Classes/ContactDetailsTableViewController.m
+++ b/Classes/ContactDetailsTableViewController.m
@@ -663,16 +663,16 @@
             ABRecordSetValue(contact, kABPersonPhoneProperty, lMap, nil);
             CFRelease(lMap);
         } else if([path section] == 1) {
+            /* MODIFICATION prefix with sip: */
+            value = [FastAddressBook normalizeSipURI:value];
+            [textField setText:value];
+            /**/
             ABMultiValueRef lcMap = ABRecordCopyValue(contact, kABPersonInstantMessageProperty);
             ABMutableMultiValueRef lMap = ABMultiValueCreateMutableCopy(lcMap);
             CFRelease(lcMap);
             int index = ABMultiValueGetIndexForIdentifier(lMap, [entry identifier]);
             CFStringRef keys[] = { kABPersonInstantMessageUsernameKey,  kABPersonInstantMessageServiceKey};
-            /* MODIFICATION prefix with sip: 
              CFTypeRef values[] = { [value copy], CONTACT_SIP_FIELD };
-             */
-            CFTypeRef values[] = { [FastAddressBook normalizeSipURI:value], CONTACT_SIP_FIELD };
-            /**/
             CFDictionaryRef lDict = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 2, NULL, NULL);
             ABMultiValueReplaceValueAtIndex(lMap, lDict, index);
             CFRelease(lDict);
diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m
index 61c77c9ca..dfade8c38 100644
--- a/Classes/DialerViewController.m
+++ b/Classes/DialerViewController.m
@@ -227,6 +227,10 @@ static UICompositeViewDescription *compositeDescription = nil;
     return YES;
 }
 
+- (BOOL)textFieldShouldEndEditing:(UITextField *)textField {
+    [textField setText:[FastAddressBook normalizeSipURI:[textField text]]];
+    return YES;
+}
 
 #pragma mark - Action Functions
 
diff --git a/Classes/DialerViewController.xib b/Classes/DialerViewController.xib
index 0b5f30409..457b7ea95 100644
--- a/Classes/DialerViewController.xib
+++ b/Classes/DialerViewController.xib
@@ -77,7 +77,7 @@
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentVerticalAlignment">0</int>
 								<string key="IBUIText"/>
-								<string key="IBUIPlaceholder">Enter sip address or phone number...</string>
+								<string key="IBUIPlaceholder">sip:</string>
 								<object class="NSColor" key="IBUITextColor">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
diff --git a/Classes/DialerViewController~ipad.xib b/Classes/DialerViewController~ipad.xib
index d8f7b2398..a01f893ed 100644
--- a/Classes/DialerViewController~ipad.xib
+++ b/Classes/DialerViewController~ipad.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
+		<int key="IBDocument.SystemTarget">1280</int>
 		<string key="IBDocument.SystemVersion">11E53</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
 		<string key="IBDocument.AppKitVersion">1138.47</string>
@@ -72,7 +72,7 @@
 								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 								<int key="IBUIContentVerticalAlignment">0</int>
 								<string key="IBUIText"/>
-								<string key="IBUIPlaceholder">Enter sip address or phone number...</string>
+								<string key="IBUIPlaceholder">sip:</string>
 								<object class="NSColor" key="IBUITextColor">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
@@ -1460,10 +1460,6 @@
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">