amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 03:45:25 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: b552fe5364e08d96c08f86ef6b0a3adad28f6b28
Monotone-Revision: b4016357467b1b77091ccbf1b0179dcad63f8843

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-07-05T02:06:01
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2010-07-05 02:06:01 +00:00
parent 1b4db03da3
commit f4475e7c75
3 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Contacts/UIxContactView.m
+26 -8
View File
@@ -189,6 +189,7 @@
- (NSString *) _phoneOfType: (NSString *) aType
withLabel: (NSString *) aLabel
excluding: (NSString *) aTypeToExclude
{
NSArray *elements;
NSString *phone;
@@ -196,37 +197,54 @@
elements = [phones cardElementsWithAttribute: @"type"
havingValue: aType];
phone = nil;
if ([elements count] > 0)
phone = [[elements objectAtIndex: 0] value: 0];
else
phone = nil;
{
CardElement *ce;
int i;
for (i = 0; i < [elements count]; i++)
{
ce = [elements objectAtIndex: i];
phone = [ce value: 0];
if (!aTypeToExclude)
break;
if (![ce hasAttribute: @"type" havingValue: aTypeToExclude])
break;
}
}
return [self _cardStringWithLabel: aLabel value: phone];
}
- (NSString *) workPhone
{
return [self _phoneOfType: @"work" withLabel: @"Work:"];
// We do this (exclude FAX) in order to avoid setting the WORK number as the FAX
// one if we do see the FAX field BEFORE the WORK number.
return [self _phoneOfType: @"work" withLabel: @"Work:" excluding: @"fax"];
}
- (NSString *) homePhone
{
return [self _phoneOfType: @"home" withLabel: @"Home:"];
return [self _phoneOfType: @"home" withLabel: @"Home:" excluding: nil];
}
- (NSString *) fax
{
return [self _phoneOfType: @"fax" withLabel: @"Fax:"];
return [self _phoneOfType: @"fax" withLabel: @"Fax:" excluding: nil];
}
- (NSString *) mobile
{
return [self _phoneOfType: @"cell" withLabel: @"Mobile:"];
return [self _phoneOfType: @"cell" withLabel: @"Mobile:" excluding: nil];
}
- (NSString *) pager
{
return [self _phoneOfType: @"pager" withLabel: @"Pager:"];
return [self _phoneOfType: @"pager" withLabel: @"Pager:" excluding: nil];
}
- (BOOL) hasHomeInfos