From 7162f4c23770d5d88e06f3d8e60e8dd59097e2de Mon Sep 17 00:00:00 2001 From: C Robert Date: Mon, 24 Aug 2009 21:02:47 +0000 Subject: [PATCH] Fixed compilation warnings Monotone-Parent: b2bb37a5b0be639020525c8cbc8f174b9869b25d Monotone-Revision: 305e5198a69984fa19ae3d615ff25e6f48bed1bd Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-08-24T21:02:47 Monotone-Branch: ca.inverse.sogo --- SoObjects/Contacts/SOGoContactGCSList.h | 3 +++ UI/Contacts/UIxListEditor.h | 2 ++ UI/Contacts/UIxListEditor.m | 1 + UI/MailerUI/UIxMailMainFrame.h | 2 ++ UI/MailerUI/UIxMailMainFrame.m | 9 +++++---- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/SoObjects/Contacts/SOGoContactGCSList.h b/SoObjects/Contacts/SOGoContactGCSList.h index 56a309cec..89068a528 100644 --- a/SoObjects/Contacts/SOGoContactGCSList.h +++ b/SoObjects/Contacts/SOGoContactGCSList.h @@ -32,6 +32,9 @@ NGVList *list; } +- (NGVList *) vList; +- (void) save; + @end #endif /* SOGOCONTACTGCSLIST_H */ diff --git a/UI/Contacts/UIxListEditor.h b/UI/Contacts/UIxListEditor.h index 72f3ce5af..a48a565c4 100644 --- a/UI/Contacts/UIxListEditor.h +++ b/UI/Contacts/UIxListEditor.h @@ -33,6 +33,8 @@ id reference; } +- (BOOL) cardReferences: (NSArray *) references contain: (NSString *) ref; + @end #endif /* UIXLISTEDITOR_H */ diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m index aa18e5123..be347bbeb 100644 --- a/UI/Contacts/UIxListEditor.m +++ b/UI/Contacts/UIxListEditor.m @@ -24,6 +24,7 @@ #import #import +#import #import #import #import diff --git a/UI/MailerUI/UIxMailMainFrame.h b/UI/MailerUI/UIxMailMainFrame.h index 48907f926..1b20fa470 100644 --- a/UI/MailerUI/UIxMailMainFrame.h +++ b/UI/MailerUI/UIxMailMainFrame.h @@ -40,6 +40,8 @@ - (WOResponse *) saveDragHandleStateAction; - (WOResponse *) saveFoldersStateAction; +- (NSString *) formattedMailtoString: (NGVCard *) card; + @end #endif /* UIXMAILMAINFRAME_H */ diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index 881281b17..f0f858232 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -25,6 +25,7 @@ #import #import +#import #import #import #import @@ -203,7 +204,7 @@ acquire: NO]; if ([contact isKindOfClass: [SOGoContactGCSList class]]) { - list = [contact vList]; + list = [(SOGoContactGCSList *)contact vList]; cards = [list cardReferences]; count = [cards count]; for (i = 0; i < count; i++) @@ -247,10 +248,10 @@ NSArray *n; unsigned int max; - if ([card respondsToSelector: @selector (preferredEMail)]) + if ([card isKindOfClass: [NGVCard class]]) email = [card preferredEMail]; else - email = [card email]; + email = [(NGVCardReference *)card email]; if (email == nil) email = (NSString*)[card firstChildWithTag: @"EMAIL"]; @@ -282,7 +283,7 @@ rc = fn; } else - rc = email; + rc = [NSMutableString stringWithString: email]; } return rc;