From b80abb06728bf6de722ceccb1369e1026098c01d Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 19 Oct 2006 17:35:28 +0000 Subject: [PATCH] Monotone-Parent: 00dd928bbf94a03723ae2a10834fa0c27640df46 Monotone-Revision: 21336607671cae2f88c376198194b888c617d148 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-19T17:35:28 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/Contacts/UIxContactEditor.m | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a55921e4c..09dfa23c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-10-19 Wolfgang Sourdeau + * UI/Contacts/UIxContactEditor.m ([UIxContactEditor + -writeAction]): updated method to fetch the card before initing + the snapshot. + * OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor -extractQuickFieldsFromTodo:_task]): fixed to use NSNull instead of NSNotFound. diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m index 364e1537f..a49cd19d8 100644 --- a/UI/Contacts/UIxContactEditor.m +++ b/UI/Contacts/UIxContactEditor.m @@ -492,8 +492,13 @@ { NSString *email, *url; + card = [[self clientObject] vCard]; [self initSnapshot]; - email = [snapshot objectForKey: @"mail"]; + if ([preferredEmail isEqualToString: @"home"]) + email = [snapshot objectForKey: @"homeMail"]; + else + email = [snapshot objectForKey: @"workMail"]; + if (email) url = [NSString stringWithFormat: @"Mail/compose?mailto=%@", email]; else