From d6f68a684b7bfd74fb4cdd9f720636fa82a83f5c Mon Sep 17 00:00:00 2001 From: Matt Ronge Date: Thu, 24 May 2012 18:35:48 -0500 Subject: [PATCH] Updated projects to fix build errors --- Examples/OSX/InboxLister/MyController.h | 6 +-- Examples/OSX/InboxLister/MyController.m | 6 +-- .../MessageSender.xcodeproj/project.pbxproj | 34 ++++++++------- MailCore.xcodeproj/project.pbxproj | 43 +++++++++++++------ Source/CTCoreMessage.m | 4 ++ libetpan | 2 +- 6 files changed, 60 insertions(+), 35 deletions(-) diff --git a/Examples/OSX/InboxLister/MyController.h b/Examples/OSX/InboxLister/MyController.h index 0b4f299..3b33b3f 100644 --- a/Examples/OSX/InboxLister/MyController.h +++ b/Examples/OSX/InboxLister/MyController.h @@ -12,9 +12,9 @@ IBOutlet id useTLS; CTCoreAccount *myAccount; - NSMutableSet *myMessages; + NSMutableArray *myMessages; } - (IBAction)connect:(id)sender; -- (NSMutableSet *)messages; -- (void)setMessages:(NSMutableSet *)messages; +- (NSMutableArray *)messages; +- (void)setMessages:(NSMutableArray *)messages; @end diff --git a/Examples/OSX/InboxLister/MyController.m b/Examples/OSX/InboxLister/MyController.m index 9536549..3f4f7c7 100644 --- a/Examples/OSX/InboxLister/MyController.m +++ b/Examples/OSX/InboxLister/MyController.m @@ -46,19 +46,19 @@ - (IBAction)connect:(id)sender id msg; while(msg = [objEnum nextObject]) { - [msg fetchBody]; + [msg fetchBodyStructure]; [messagesProxy addObject:msg]; } } -- (NSMutableSet *)messages +- (NSMutableArray *)messages { return myMessages; } -- (void)setMessages:(NSMutableSet *)messages +- (void)setMessages:(NSMutableArray *)messages { [messages retain]; [myMessages release]; diff --git a/Examples/iOS/MessageSender/MessageSender.xcodeproj/project.pbxproj b/Examples/iOS/MessageSender/MessageSender.xcodeproj/project.pbxproj index 2ff7927..a87bb68 100644 --- a/Examples/iOS/MessageSender/MessageSender.xcodeproj/project.pbxproj +++ b/Examples/iOS/MessageSender/MessageSender.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ F891959C144D0BF000EADD16 /* ViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F891959A144D0BF000EADD16 /* ViewController_iPad.xib */; }; F89195D0144D0CAB00EADD16 /* libmailcore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F89195CC144D0C8900EADD16 /* libmailcore.a */; }; F89195D7144D0EFA00EADD16 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F89195D6144D0EF900EADD16 /* libiconv.dylib */; }; + F8B6D589156EE4BB008DE9EB /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B6D588156EE4BB008DE9EB /* CFNetwork.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -32,13 +33,6 @@ remoteGlobalIDString = 8DC2EF5B0486A6940098B216; remoteInfo = libetpan; }; - F851FBAF144D133D003F58D4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F851FBA7144D133D003F58D4 /* libetpan.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = C69AB10A10546FE500F32FBD; - remoteInfo = "static libetpan"; - }; F851FBB1144D133D003F58D4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F851FBA7144D133D003F58D4 /* libetpan.xcodeproj */; @@ -88,6 +82,13 @@ remoteGlobalIDString = F8618B5710DADB5C00C41188; remoteInfo = "MailCore iOS"; }; + F8B6D57F156EE463008DE9EB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F851FBA7144D133D003F58D4 /* libetpan.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F8B6D4CC156EE0B6008DE9EB; + remoteInfo = "static libetpan Mac"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -112,6 +113,7 @@ F89195D6144D0EF900EADD16 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; }; F89195D8144D0F0200EADD16 /* libsasl2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsasl2.a; path = "../../../iOSPorts/ports/security/cyrus-sasl/build/Debug-iphoneos/libsasl2.a"; sourceTree = ""; }; F89195DA144D0F1000EADD16 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "../../../iOSPorts/ports/security/openssl/build/Debug-iphoneos/libcrypto.a"; sourceTree = ""; }; + F8B6D588156EE4BB008DE9EB /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -119,6 +121,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + F8B6D589156EE4BB008DE9EB /* CFNetwork.framework in Frameworks */, F81524F5144FA4A5007ABA9C /* libssl.a in Frameworks */, F851FBC6144D13B8003F58D4 /* libcrypto.a in Frameworks */, F851FBBB144D1391003F58D4 /* libsasl2.a in Frameworks */, @@ -138,8 +141,8 @@ isa = PBXGroup; children = ( F851FBAE144D133D003F58D4 /* libetpan.framework */, - F851FBB0144D133D003F58D4 /* libetpan_mac.a */, F851FBB2144D133D003F58D4 /* libetpan_ios.a */, + F8B6D580156EE463008DE9EB /* libetpan_mac.a */, ); name = Products; sourceTree = ""; @@ -164,6 +167,7 @@ F8919573144D0BEF00EADD16 = { isa = PBXGroup; children = ( + F8B6D588156EE4BB008DE9EB /* CFNetwork.framework */, F851FBBC144D13A4003F58D4 /* openssl.xcodeproj */, F851FBB4144D1381003F58D4 /* Cyrus SASL.xcodeproj */, F851FBA7144D133D003F58D4 /* libetpan.xcodeproj */, @@ -301,13 +305,6 @@ remoteRef = F851FBAD144D133D003F58D4 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - F851FBB0144D133D003F58D4 /* libetpan_mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libetpan_mac.a; - remoteRef = F851FBAF144D133D003F58D4 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; F851FBB2144D133D003F58D4 /* libetpan_ios.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -357,6 +354,13 @@ remoteRef = F89195CB144D0C8900EADD16 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + F8B6D580156EE463008DE9EB /* libetpan_mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libetpan_mac.a; + remoteRef = F8B6D57F156EE463008DE9EB /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ diff --git a/MailCore.xcodeproj/project.pbxproj b/MailCore.xcodeproj/project.pbxproj index 2cc0208..ed7ec08 100644 --- a/MailCore.xcodeproj/project.pbxproj +++ b/MailCore.xcodeproj/project.pbxproj @@ -127,6 +127,7 @@ F8A70EEF0C4059E100D1D694 /* JRLog.h in Headers */ = {isa = PBXBuildFile; fileRef = F8A70EED0C4059E100D1D694 /* JRLog.h */; settings = {ATTRIBUTES = (Public, ); }; }; F8A70EF00C4059E100D1D694 /* JRLog.m in Sources */ = {isa = PBXBuildFile; fileRef = F8A70EEE0C4059E100D1D694 /* JRLog.m */; }; F8B245CE144BAC15002B56DA /* libetpan_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B245CA144BABA4002B56DA /* libetpan_ios.a */; }; + F8B6D4F0156EE189008DE9EB /* libetpan_mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B6D4EC156EE173008DE9EB /* libetpan_mac.a */; }; F8DFABF010541804003D3CC1 /* libetpan.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8DFAB0410541708003D3CC1 /* libetpan.framework */; }; F8EC5B0314C37F60006AF4D3 /* CTMIME_HtmlPart.h in Headers */ = {isa = PBXBuildFile; fileRef = F8EC5B0114C37F60006AF4D3 /* CTMIME_HtmlPart.h */; }; F8EC5B0414C37F60006AF4D3 /* CTMIME_HtmlPart.m in Sources */ = {isa = PBXBuildFile; fileRef = F8EC5B0214C37F60006AF4D3 /* CTMIME_HtmlPart.m */; }; @@ -148,13 +149,6 @@ remoteGlobalIDString = 8DC2EF5B0486A6940098B216; remoteInfo = libetpan; }; - F890D39C10CEED080039817C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = C69AB10910546FE500F32FBD; - remoteInfo = "static libetpan"; - }; F8B245C9144BABA4002B56DA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; @@ -169,6 +163,20 @@ remoteGlobalIDString = F8B244B6144B8C48002B56DA; remoteInfo = "static libetpan iOS"; }; + F8B6D4EB156EE173008DE9EB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F8B6D4CC156EE0B6008DE9EB; + remoteInfo = "static libetpan Mac"; + }; + F8B6D4EE156EE183008DE9EB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = F8B6D422156EE0B6008DE9EB; + remoteInfo = "static libetpan Mac"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -318,6 +326,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + F8B6D4F0156EE189008DE9EB /* libetpan_mac.a in Frameworks */, 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, F8483E4109CE7B9000B80440 /* libssl.dylib in Frameworks */, F8483E4309CE7B9C00B80440 /* libiconv.dylib in Frameworks */, @@ -511,6 +520,7 @@ children = ( F890D39610CEECD50039817C /* libetpan.framework */, F8B245CA144BABA4002B56DA /* libetpan_ios.a */, + F8B6D4EC156EE173008DE9EB /* libetpan_mac.a */, ); name = Products; sourceTree = ""; @@ -567,7 +577,7 @@ buildRules = ( ); dependencies = ( - F890D39D10CEED080039817C /* PBXTargetDependency */, + F8B6D4EF156EE183008DE9EB /* PBXTargetDependency */, ); name = MailCore; productInstallPath = "$(HOME)/Library/Frameworks"; @@ -660,6 +670,13 @@ remoteRef = F8B245C9144BABA4002B56DA /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + F8B6D4EC156EE173008DE9EB /* libetpan_mac.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libetpan_mac.a; + remoteRef = F8B6D4EB156EE173008DE9EB /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -798,16 +815,16 @@ target = 8DC2EF4F0486A6940098B216 /* MailCore */; targetProxy = F82D7D220F48ACDA00ADA65C /* PBXContainerItemProxy */; }; - F890D39D10CEED080039817C /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "static libetpan"; - targetProxy = F890D39C10CEED080039817C /* PBXContainerItemProxy */; - }; F8B245CD144BAC04002B56DA /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "static libetpan iOS"; targetProxy = F8B245CC144BAC04002B56DA /* PBXContainerItemProxy */; }; + F8B6D4EF156EE183008DE9EB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "static libetpan Mac"; + targetProxy = F8B6D4EE156EE183008DE9EB /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ diff --git a/Source/CTCoreMessage.m b/Source/CTCoreMessage.m index 7e1fc2b..07a88c4 100644 --- a/Source/CTCoreMessage.m +++ b/Source/CTCoreMessage.m @@ -118,6 +118,10 @@ - (void)dealloc { - (int)fetchBodyStructure { + if (myMessage == NULL) { + return -1; + } + int err; struct mailmime *dummyMime; //Retrieve message mime and message field diff --git a/libetpan b/libetpan index b985888..60ff71f 160000 --- a/libetpan +++ b/libetpan @@ -1 +1 @@ -Subproject commit b98588803ad173cf69b4093cf698c3114df2eea3 +Subproject commit 60ff71fe4c79928ad53321874b5c4b44d98f3f78