From 5e9d0ce95ac9020bc270fe69661ae121ac333ae2 Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 10:56:05 -0500 Subject: [PATCH 01/17] =?UTF-8?q?Fix=20warning:=20=E2=80=98-textValue?= =?UTF-8?q?=E2=80=99=20not=20found=20in=20protocol(s)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Confusingly, labelNode is a DOMElement, not a DOMNode, so textValue cannot apply here; textContent which would be an appropriate replacement does not exist AFAIK in this DOM Library. So we manually get the text node via firstChild then get its text value via nodeValue. --- SoObjects/Mailer/SOGoMailAccounts.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoObjects/Mailer/SOGoMailAccounts.m b/SoObjects/Mailer/SOGoMailAccounts.m index 4411a5be3..4227e675e 100644 --- a/SoObjects/Mailer/SOGoMailAccounts.m +++ b/SoObjects/Mailer/SOGoMailAccounts.m @@ -234,7 +234,7 @@ labelNode = [labelNodes objectAtIndex: count]; label = [labelNode attribute: @"id"]; - name = [labelNode textValue]; + name = [[labelNode firstChild] nodeValue]; color = [labelNode attribute: @"color"]; [values addObject: name]; From ddade629fdcf2406bcb46f219f0bf7ee68aedfd5 Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:00:18 -0500 Subject: [PATCH 02/17] Synchronize .h and .m method signatures. --- SoObjects/Mailer/SOGoMailFolder.h | 4 ++-- SoObjects/Mailer/SOGoMailFolder.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SoObjects/Mailer/SOGoMailFolder.h b/SoObjects/Mailer/SOGoMailFolder.h index cbf0dc867..a1ea8cd81 100644 --- a/SoObjects/Mailer/SOGoMailFolder.h +++ b/SoObjects/Mailer/SOGoMailFolder.h @@ -99,8 +99,8 @@ - (NSString *) davCollectionTag; -- (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties - matchingSyncToken: (NSString *) syncToken +- (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) theProperties + matchingSyncToken: (NSString *) theSyncToken fromDate: (NSCalendarDate *) theStartDate initialLoad: (BOOL) initialLoadInProgress; /* flags */ diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index 97e10e92d..d495febbe 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -2234,7 +2234,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) // // FIXME: refactor MAPIStoreMailFolder.m - synchroniseCache to use this method // -- (NSArray *) syncTokenFieldsWithProperties: (NSArray *) theProperties +- (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) theProperties matchingSyncToken: (NSString *) theSyncToken fromDate: (NSCalendarDate *) theStartDate initialLoad: (BOOL) initialLoadInProgress From 5b71ed319ac9ca35167dc33b7ca08d462ddd51e1 Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:01:15 -0500 Subject: [PATCH 03/17] =?UTF-8?q?Fix=20warning:=20variable=20=E2=80=98uidn?= =?UTF-8?q?ext=E2=80=99=20set=20but=20not=20used=20[-Wunused-but-set-varia?= =?UTF-8?q?ble]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove uidnext declaration and calls that change its value. --- SoObjects/Mailer/SOGoMailFolder.m | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index d495febbe..df706e542 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -2245,18 +2245,13 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) NSDictionary *d; id fetchResults; - int uidnext, highestmodseq, i; + int highestmodseq, i; allTokens = [NSMutableArray array]; - if ([theSyncToken isEqualToString: @"-1"]) - { - uidnext = highestmodseq = 0; - } - else + if (![theSyncToken isEqualToString: @"-1"]) { a = [theSyncToken componentsSeparatedByString: @"-"]; - uidnext = [[a objectAtIndex: 0] intValue]; highestmodseq = [[a objectAtIndex: 1] intValue]; } From 986665f011bf966f3e8cc6eaa4e9203cd4bb3a5d Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:02:18 -0500 Subject: [PATCH 04/17] =?UTF-8?q?Workaround=20warning:=20=E2=80=98locale?= =?UTF-8?q?=E2=80=99=20is=20used=20uninitialized=20in=20this=20function=20?= =?UTF-8?q?[-Wuninitialized]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'locale' being an uninitialized pointer, I don't believe setting it to nil will make things worse here. --- Tests/Unit/TestSBJsonParser.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/Unit/TestSBJsonParser.m b/Tests/Unit/TestSBJsonParser.m index 974751f9f..c95c400ce 100644 --- a/Tests/Unit/TestSBJsonParser.m +++ b/Tests/Unit/TestSBJsonParser.m @@ -91,6 +91,7 @@ test ([obtained compare: expected] == NSOrderedSame); #endif + locale = nil; result = [parser objectWithString: @"[ -312.3456 ]"]; obtained = [result objectAtIndex: 0]; expected = [NSDecimalNumber decimalNumberWithString: @"-312.3456" locale: locale]; From 0b1cf9faaf15e9fc7939c6a11041c8503cf6e90f Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:03:37 -0500 Subject: [PATCH 05/17] =?UTF-8?q?Avoid=20warning:=20the=20address=20of=20?= =?UTF-8?q?=E2=80=98timezone=E2=80=99=20will=20always=20evaluate=20as=20?= =?UTF-8?q?=E2=80=98true=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As timezone is a pointer allocated on the stack, there is no need to check for a NULL pointer - if that was ever the initial intention. --- SoObjects/SOGo/BSONCodec.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoObjects/SOGo/BSONCodec.m b/SoObjects/SOGo/BSONCodec.m index 2b5b9d1eb..695d19628 100644 --- a/SoObjects/SOGo/BSONCodec.m +++ b/SoObjects/SOGo/BSONCodec.m @@ -600,7 +600,7 @@ static NSDictionary *BSONTypes() /* We may have the zone using the UTC offset or abbreviation (deprecated) */ - if (timezone && strlen(timezone) > 0 && (timezone[0] == '+' || timezone[0] == '-')) + if (strlen(timezone) > 0 && (timezone[0] == '+' || timezone[0] == '-')) { NSCalendarDate *tzDate; From 3ba0e9f82f45940f6024d327a038959ae51a4749 Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:04:28 -0500 Subject: [PATCH 06/17] Implement stubs for SOGoCalendarComponent::isNew and SOGoCalendarComponent::setIsNew methods. Those are required to implement the SOGoComponentOccurence protocol hence their absence creates compilation warnings. --- .../Appointments/SOGoCalendarComponent.m | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 32a2cb390..e62197056 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -130,6 +130,25 @@ return aclManager; } +- (void) setIsNew: (BOOL) newIsNew +{ + // Required for protocol + // but not yet implemented. Violently warn if + // used. + NSLog (@"SOGoCalendarComponent::setIsNew is not implemented."); + abort(); +} + +- (BOOL) isNew +{ + // Required for protocol + // but not yet implemented. Violently warn if + // used. + NSLog (@"SOGoCalendarComponent::isNew is not implemented."); + abort(); + return false; +} + - (NSException *) changeParticipationStatus: (NSString *) newPartStat withDelegate: (iCalPerson *) delegate alarm: (iCalAlarm *) alarm From 478b313122da59af03233ad25d940637cb906b2d Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:05:24 -0500 Subject: [PATCH 07/17] Fix warning: distinct Objective-C type in return Method is supposed to return a WOResponse pointer, but currently returns a NSException pointer; typecast the return value, just like the archiveUIDs method does. --- SoObjects/Mailer/SOGoMailFolder.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index df706e542..f66bfb258 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -895,7 +895,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) } } - return error; + return (WOResponse *) error; } - (NSDictionary *) statusForFlags: (NSArray *) flags From 022fd814741044db4b360d08f4fdf4a1dfc7c8ec Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:06:12 -0500 Subject: [PATCH 08/17] Fix warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] Those are all log formatting routines that assume pointers are unsigned int, for display purpose. Replace the cast with the native '%p' token from NSString::stringWithFormat that's provided for pointer address output. --- SoObjects/SOGo/SOGoObject.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index 084244286..8a5b172f6 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -1046,8 +1046,8 @@ if (nameInContainer) [_ms appendFormat:@" name=%@", nameInContainer]; if (container) - [_ms appendFormat:@" container=0x%08X/%@", - (unsigned int)container, [container valueForKey:@"nameInContainer"]]; + [_ms appendFormat:@" container=%p/%@", + container, [container valueForKey:@"nameInContainer"]]; } - (NSString *) description @@ -1055,7 +1055,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:64]; - [ms appendFormat:@"<0x%08X[%@]:", (unsigned int) self, NSStringFromClass([self class])]; + [ms appendFormat:@"<%p[%@]:", self, NSStringFromClass([self class])]; [self appendAttributesToDescription:ms]; [ms appendString:@">"]; @@ -1064,8 +1064,8 @@ - (NSString *) loggingPrefix { - return [NSString stringWithFormat:@"<0x%08X[%@]:%@>", - (unsigned int) self, NSStringFromClass([self class]), + return [NSString stringWithFormat:@"<%p[%@]:%@>", + self, NSStringFromClass([self class]), [self nameInContainer]]; } From c1095a5ea906e1f8d7c951a2d3b3589f13d67b8d Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:06:48 -0500 Subject: [PATCH 09/17] Fix warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] As previous commit, this code assumed pointers are unsigned int, for display purpose. Replaced the cast with the native '%p' token from NSMutableString::appendFormat that's provided for pointer address output. --- SoObjects/Appointments/MSExchangeFreeBusy.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoObjects/Appointments/MSExchangeFreeBusy.m b/SoObjects/Appointments/MSExchangeFreeBusy.m index 2028db24b..be8f5919b 100644 --- a/SoObjects/Appointments/MSExchangeFreeBusy.m +++ b/SoObjects/Appointments/MSExchangeFreeBusy.m @@ -339,7 +339,7 @@ size_t curl_body_function_freebusy(void *ptr, size_t size, size_t nmemb, void *i NSMutableString *s; s = [NSMutableString stringWithCapacity: 64]; - [s appendFormat:@"<0x%08X[%@]:", (unsigned int)self, NSStringFromClass([self class])]; + [s appendFormat:@"<%p[%@]:", self, NSStringFromClass([self class])]; if (freeBusyViewType) [s appendFormat:@" freeBusyViewType='%@'", freeBusyViewType]; if (mergedFreeBusy) From f55391b7d032be96dbf7b0a4431fb5f44d11602b Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 11:19:16 -0500 Subject: [PATCH 10/17] Add missing header declarations that made the compiler spit out warnings. --- UI/MailPartViewers/UIxMailPartICalViewer.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.h b/UI/MailPartViewers/UIxMailPartICalViewer.h index e0383005a..c5acd7e5b 100644 --- a/UI/MailPartViewers/UIxMailPartICalViewer.h +++ b/UI/MailPartViewers/UIxMailPartICalViewer.h @@ -39,6 +39,11 @@ } - (iCalEvent *) authorativeEvent; +- (NSString *) endDate; +- (NSString *) endTime; +- (NSString *) startDate; +- (NSString *) startTime; +- (BOOL) isEndDateOnSameDay; @end From 281062a1a147cec9059d19e09f8d1d933545831a Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 13:04:30 -0500 Subject: [PATCH 11/17] =?UTF-8?q?Fix=20warning:=20incomplete=20implementat?= =?UTF-8?q?ion=20of=20category=20=E2=80=98SOGoExtensions=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original method was commented out, but not its matching .h declaration; hence commenting out the .h declaration. --- SoObjects/Appointments/iCalEntityObject+SOGo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.h b/SoObjects/Appointments/iCalEntityObject+SOGo.h index 77134461a..e46da0b69 100644 --- a/SoObjects/Appointments/iCalEntityObject+SOGo.h +++ b/SoObjects/Appointments/iCalEntityObject+SOGo.h @@ -46,7 +46,7 @@ extern NSNumber *iCalDistantFutureNumber; - (iCalPerson *) participantForUser: (SOGoUser *) theUser attendee: (iCalPerson *) theAttendee; -- (NSArray *) attendeeUIDs; +/* - (NSArray *) attendeeUIDs; */ - (BOOL) isStillRelevant; - (id) itipEntryWithMethod: (NSString *) method; From fc9dde885b8e967ea2b9c7bce41720e89b05cc5a Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 13:23:23 -0500 Subject: [PATCH 12/17] =?UTF-8?q?Fix=20warnings;=20both=20=E2=80=98WOReque?= =?UTF-8?q?st=E2=80=99=20may=20not=20respond=20to=20=E2=80=98-httpRequest?= =?UTF-8?q?=E2=80=99=20and=20no=20=E2=80=98-parts=E2=80=99=20method=20foun?= =?UTF-8?q?d.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/Scheduler/UIxCalFolderActions.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/UI/Scheduler/UIxCalFolderActions.m b/UI/Scheduler/UIxCalFolderActions.m index ad90b2aa5..8226b6b0b 100644 --- a/UI/Scheduler/UIxCalFolderActions.m +++ b/UI/Scheduler/UIxCalFolderActions.m @@ -21,9 +21,15 @@ */ #import + +#import #import +#define COMPILING_NGOBJWEB 1 /* httpRequest is needed in + importAction */ #import +#undef COMPILING_NGOBJWEB #import +#import #import From a813e388974d62b6a91b05b19a1010fbd82d9558 Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 16:30:38 -0500 Subject: [PATCH 13/17] Comment out sendMail method in SOGoDraftObject and replace its sole known usage by sendMailAndCopyToSent. In a 2011-09-26 commit (in Changelog.old), I understand the author wanted to phase sendMail out and replace it by sendMailAndCopyToSent. Since there are compilation warnings related to sendMail, removing the sendMail method and replacing the sole call to it seemed like the cleanest way. --- SoObjects/Mailer/SOGoDraftObject.h | 2 +- SoObjects/Mailer/SOGoDraftObject.m | 3 +++ UI/MailerUI/UIxMailEditor.m | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/SoObjects/Mailer/SOGoDraftObject.h b/SoObjects/Mailer/SOGoDraftObject.h index cf4e06d27..0b1eeb93f 100644 --- a/SoObjects/Mailer/SOGoDraftObject.h +++ b/SoObjects/Mailer/SOGoDraftObject.h @@ -114,7 +114,7 @@ - (NSArray *) allBareRecipients; - (NSException *) delete; -- (NSException *) sendMail; +/* - (NSException *) sendMail; */ - (NSException *) sendMailAndCopyToSent: (BOOL) copyToSent; /* default: YES */ - (NSException *) save; diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index 1b0f7ac19..35f414086 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -69,6 +69,7 @@ #import "SOGoDraftObject.h" + static NSString *contentTypeValue = @"text/plain; charset=utf-8"; static NSString *htmlContentTypeValue = @"text/html; charset=utf-8"; static NSString *headerKeys[] = {@"subject", @"to", @"cc", @"bcc", @@ -1782,6 +1783,7 @@ static NSString *userAgent = nil; // // // +/* - (NSException *) sendMail { SOGoUserDefaults *ud; @@ -1843,6 +1845,7 @@ static NSString *userAgent = nil; } return [self sendMailAndCopyToSent: YES]; } +*/ // // diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m index bc372eb7b..243bfc8df 100644 --- a/UI/MailerUI/UIxMailEditor.m +++ b/UI/MailerUI/UIxMailEditor.m @@ -869,7 +869,7 @@ static NSArray *infoKeys = nil; { error = [self validateForSend]; if (!error) - error = [co sendMail]; + error = [co sendMailAndCopyToSent: false]; else error = [self failedToSaveFormResponse: [error reason]]; } From ce38a9c606071afe784dc7c91df12531b0f06245 Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Wed, 17 Feb 2016 16:32:08 -0500 Subject: [PATCH 14/17] =?UTF-8?q?Fix=20one=20warning:=20expected=20?= =?UTF-8?q?=E2=80=98struct=20NSError=20**=E2=80=99=20but=20argument=20is?= =?UTF-8?q?=20of=20type=20=E2=80=98id=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nil is not recognized by GCC as a (NSError**), but as an (id). NULL works the same but does not spawn warnings. --- SoObjects/Mailer/SOGoDraftObject.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index 35f414086..96bf80f8e 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -1116,7 +1116,7 @@ static NSString *userAgent = nil; pmime = [self pathToAttachmentWithName: [NSString stringWithFormat: @".%@.mime", name]]; if (![[mimeType dataUsingEncoding: NSUTF8StringEncoding] writeToFile: pmime atomically: YES]) { - [[NSFileManager defaultManager] removeItemAtPath: p error: nil]; + [[NSFileManager defaultManager] removeItemAtPath: p error: NULL]; return [NSException exceptionWithHTTPStatus: 500 /* Server Error */ reason: @"Could not write attachment to draft!"]; } From 4210131e12de167d4fa3cbfb2c002545707f7c0e Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Mon, 7 Mar 2016 10:43:38 -0500 Subject: [PATCH 15/17] Initialize highestmodseq to avoid any surprise. Strongly inspired by comment at https://github.com/inverse-inc/sogo/pull/201#discussion-diff-54879796 --- SoObjects/Mailer/SOGoMailFolder.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index f66bfb258..f9d443386 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -2245,7 +2245,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) NSDictionary *d; id fetchResults; - int highestmodseq, i; + int highestmodseq = 0, i; allTokens = [NSMutableArray array]; From c3f69416be867168e5276a0adca01b0debb7ac5f Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Mon, 7 Mar 2016 10:46:40 -0500 Subject: [PATCH 16/17] Replace stubs with parent implementations. Which makes real sense; reference from https://github.com/inverse-inc/sogo/pull/201#discussion_r54880038 and https://github.com/inverse-inc/sogo/pull/201#discussion_r54880094 --- SoObjects/Appointments/SOGoCalendarComponent.m | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index e62197056..145869913 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -132,21 +132,12 @@ - (void) setIsNew: (BOOL) newIsNew { - // Required for protocol - // but not yet implemented. Violently warn if - // used. - NSLog (@"SOGoCalendarComponent::setIsNew is not implemented."); - abort(); + [super setIsNew: newIsNew]; } - (BOOL) isNew { - // Required for protocol - // but not yet implemented. Violently warn if - // used. - NSLog (@"SOGoCalendarComponent::isNew is not implemented."); - abort(); - return false; + return [super isNew]; } - (NSException *) changeParticipationStatus: (NSString *) newPartStat From 990a5f4823f61c60a7e37db39c677cab61717e0d Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Mon, 7 Mar 2016 10:50:17 -0500 Subject: [PATCH 17/17] Fix behaviour change in error handling, introduced by commit f284fb71dda0ea9754f1582c6951d5f462e947bc As pointed out on https://github.com/inverse-inc/sogo/pull/201#discussion_r54881994 --- UI/MailerUI/UIxMailEditor.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m index 243bfc8df..67a3e240f 100644 --- a/UI/MailerUI/UIxMailEditor.m +++ b/UI/MailerUI/UIxMailEditor.m @@ -869,7 +869,7 @@ static NSArray *infoKeys = nil; { error = [self validateForSend]; if (!error) - error = [co sendMailAndCopyToSent: false]; + error = [co sendMailAndCopyToSent: YES]; else error = [self failedToSaveFormResponse: [error reason]]; }