From 63aedf6047c05b676bc9accd852ce4c10eedbb84 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 9 Apr 2009 20:06:32 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 0280dffce97a63277bc84ffa183716452b431953 Monotone-Revision: b8c469061302cf2a28202e96504b5ec370eb8211 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-04-09T20:06:32 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 +++++ SOPE/NGCards/NSString+NGCards.m | 2 +- SOPE/NGCards/samples/GNUmakefile | 36 ++++++++++++++++-------------- SoObjects/Mailer/SOGoDraftObject.m | 9 -------- SoObjects/Mailer/SOGoMailFolder.m | 3 ++- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ed8a6b33..3a739a47d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-09 Ludovic Marcotte + + * Reverted previous patch and provided the correct + fix in SOGoMailFolder: -postData:flags: + * Fixed the compilation of unit tests for NGCards. + 2009-04-09 Francis Lachapelle * SoObjects/Mailer/SOGoDraftObject.m ([SOGoDraftObject diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m index e791879c1..5b57909b0 100644 --- a/SOPE/NGCards/NSString+NGCards.m +++ b/SOPE/NGCards/NSString+NGCards.m @@ -1,6 +1,6 @@ /* NSString+NGCards.m - this file is part of SOPE * - * Copyright (C) 2006-2008 Inverse inc. + * Copyright (C) 2006-2009 Inverse inc. * * Author: Wolfgang Sourdeau * diff --git a/SOPE/NGCards/samples/GNUmakefile b/SOPE/NGCards/samples/GNUmakefile index b7a0389c4..877b03949 100644 --- a/SOPE/NGCards/samples/GNUmakefile +++ b/SOPE/NGCards/samples/GNUmakefile @@ -1,18 +1,18 @@ # GNUstep makefile --include ../../config.make +-include ../../../config.make include $(GNUSTEP_MAKEFILES)/common.make TOOL_NAME = vcardtest versittest icalparsetest icalds vcf2xml vcfparsetest ievalrrule -ADDITIONAL_INCLUDE_DIRS += -I../NGCards +ADDITIONAL_INCLUDE_DIRS += -I.. -vcardtest_OBJC_FILES = unittest.m vcardtest.m CardElement.m CardGroup.m CardVersitRenderer.m NSArray+NGCards.m NSDictionary+NGCards.m -versittest_OBJC_FILES = unittest.m versittest.m CardElement.m CardGroup.m CardVersitRenderer.m NSArray+NGCards.m NSDictionary+NGCards.m NSString+NGCards.m +vcardtest_OBJC_FILES = unittest.m vcardtest.m CardElement.m CardGroup.m CardVersitRenderer.m NSArray+NGCards.m NSDictionary+NGCards.m NGCardsSaxHandler.m +versittest_OBJC_FILES = unittest.m versittest.m CardElement.m CardGroup.m CardVersitRenderer.m NSArray+NGCards.m NSDictionary+NGCards.m NSString+NGCards.m NGCardsSaxHandler.m icalparsetest_OBJC_FILES = icalparsetest.m icalds_OBJC_FILES = icalds.m vcf2xml_OBJC_FILES = vcf2xml.m -vcfparsetest_OBJC_FILES = vcfparsetest.m CardElement.m CardGroup.m CardVersitRenderer.m NSArray+NGCards.m NSDictionary+NGCards.m NSString+NGCards.m +vcfparsetest_OBJC_FILES = vcfparsetest.m CardElement.m CardGroup.m CardVersitRenderer.m NSArray+NGCards.m NSDictionary+NGCards.m NSString+NGCards.m NGCardsSaxHandler.m ievalrrule_OBJC_FILES = ievalrrule.m -include GNUmakefile.preamble @@ -20,24 +20,26 @@ include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble -include fhs.make -CardElement.m: ../NGCards/CardElement.m - ln -sf ../NGCards/CardElement.m ./ +CardElement.m: ../CardElement.m + ln -sf ../CardElement.m ./ -CardGroup.m: ../NGCards/CardGroup.m - ln -sf ../NGCards/CardGroup.m ./ +CardGroup.m: ../CardGroup.m + ln -sf ../CardGroup.m ./ -CardVersitRenderer.m: ../NGCards/CardVersitRenderer.m - ln -sf ../NGCards/CardVersitRenderer.m ./ +CardVersitRenderer.m: ../CardVersitRenderer.m + ln -sf ../CardVersitRenderer.m ./ -NSArray+NGCards.m: ../NGCards/NSArray+NGCards.m - ln -sf ../NGCards/NSArray+NGCards.m ./ +NSArray+NGCards.m: ../NSArray+NGCards.m + ln -sf ../NSArray+NGCards.m ./ -NSDictionary+NGCards.m: ../NGCards/NSDictionary+NGCards.m - ln -sf ../NGCards/NSDictionary+NGCards.m ./ +NSDictionary+NGCards.m: ../NSDictionary+NGCards.m + ln -sf ../NSDictionary+NGCards.m ./ -NSString+NGCards.m: ../NGCards/NSString+NGCards.m - ln -sf ../NGCards/NSString+NGCards.m ./ +NSString+NGCards.m: ../NSString+NGCards.m + ln -sf ../NSString+NGCards.m ./ +NGCardsSaxHandler.m: ../NGCardsSaxHandler.m + ln -sf ../NGCardsSaxHandler.m ./ distclean clean:: -rm -f CardElement.m CardGroup.m CardVersitRenderer.m NSArray+NGCards.m NSDictionary+NGCards.m NSString+NGCards.m diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index b5476fc60..b9b713aaf 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -1381,15 +1381,6 @@ static BOOL showTextAttachmentsInline = NO; if (!error) { error = [sentFolder postData: message flags: @"seen"]; - if (error) - { - // Sent folder probably doesn't exist -- create it - error = [[self imap4Connection] - createMailbox: [imap4 imap4FolderNameForURL: [sentFolder imap4URL]] - atURL: [[self mailAccountFolder] imap4URL]]; - if (!error) - error = [sentFolder postData: message flags: @"seen"]; - } if (!error) { [self imap4Connection]; diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index 1b0b3d1f4..5b5d6f37d 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -497,7 +497,8 @@ static NSString *spoolFolder = nil; // We check for the existence of the IMAP folder (likely to be the // Sent mailbox) prior to appending messages to it. if ([[self imap4Connection] doesMailboxExistAtURL: [self imap4URL]] || - ![[self imap4Connection] createMailbox: [self relativeImap4Name] atURL: [[self mailAccountFolder] imap4URL]]) + ![[self imap4Connection] createMailbox: [[self imap4Connection] imap4FolderNameForURL: [self imap4URL]] + atURL: [[self mailAccountFolder] imap4URL]]) return [[self imap4Connection] postData: _data flags: _flags toFolderURL: [self imap4URL]];