From fa43f053f7a00b1446720ff3471ae73d3833a874 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 23 Oct 2009 19:57:53 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 362796632635e06d244977f425250ed41b4cd5c2 Monotone-Revision: 0269f0e288002384896f59f89f8205c3327b32fb Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-10-23T19:57:53 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/MailerUI/UIxMailMainFrame.m | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b9e347a0..bb7a8289c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-10-23 Francis Lachapelle + * UI/MailerUI/UIxMailMainFrame.m (-formattedMailtoString:): fixed + the case when dealing with a NGVCardReference (from a list) with + no FN attribute and no N attribute. + * UI/Scheduler/UIxComponentEditor.m (-calendarList): added proper verification of deletion rights on the current calendar and creation rights on other calendars. diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index d09b1d8df..6e79f6c41 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -279,7 +279,8 @@ // We append the contact's name fn = [NSMutableString stringWithString: [card fn]]; - if ([fn length] == 0) + if ([fn length] == 0 + && [card isKindOfClass: [NGVCard class]]) { n = [card n]; if (n) @@ -294,7 +295,7 @@ } } } - if (fn) + if ([fn length] > 0) { [fn appendFormat: @" %@", email]; rc = fn;