diff --git a/MailCore.xcodeproj/mronge.mode1v3 b/MailCore.xcodeproj/mronge.mode1v3 index 415e35f..9d9c571 100644 --- a/MailCore.xcodeproj/mronge.mode1v3 +++ b/MailCore.xcodeproj/mronge.mode1v3 @@ -254,7 +254,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 274 + 346 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -266,25 +266,16 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey 0867D691FE84028FC02AAC07 - F85A18AF09C7D8F200305C06 - 08FB77AEFE84172EC02AAC07 - F81E26720C6ED56000B3FBAC - 32C88DFF0371C24200C91783 - 089C1665FE841158C02AAC07 - 0867D69AFE84028FC02AAC07 - 1058C7B0FEA5585E11CA2CBB - 1058C7B2FEA5585E11CA2CBB 1C37FBAC04509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 71 - 70 + 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {274, 698}} + {{0, 0}, {346, 698}} PBXTopSmartGroupGIDs @@ -296,11 +287,11 @@ GeometryConfiguration Frame - {{0, 0}, {291, 716}} + {{0, 0}, {363, 716}} GroupTreeTableConfiguration MainColumn - 274 + 346 RubberWindowFrame 0 121 1440 757 0 0 1440 878 @@ -308,7 +299,7 @@ Module PBXSmartGroupTreeModule Proportion - 291pt + 363pt Dock @@ -319,7 +310,7 @@ PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - MailCoreUtilities.m + idle.c PBXSplitModuleInNavigatorKey Split0 @@ -327,11 +318,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - MailCoreUtilities.m + idle.c _historyCapacity 0 bookmark - F890D24D10CEBADB0039817C + F890D3BB10CEEE520039817C history F82D7D4C0F4A0D2500ADA65C @@ -344,7 +335,6 @@ F8B2719E108FB85600BA08D2 F8B271A4108FE4F100BA08D2 F8B271BA108FEEC300BA08D2 - F8B271BB108FEEC300BA08D2 F8B271BD108FEEC300BA08D2 F8B271BE108FEEC300BA08D2 F8B271BF108FEEC300BA08D2 @@ -362,7 +352,9 @@ F81AAF49109EA48F0036374C F81AAF4A109EA48F0036374C F81AAF4B109EA48F0036374C - F890782810A5FFA700852ABD + F890D3A910CEED920039817C + F890D3B810CEEE520039817C + F890D3B910CEEE520039817C SplitCount @@ -374,7 +366,7 @@ GeometryConfiguration Frame - {{0, 0}, {1144, 492}} + {{0, 0}, {1072, 492}} RubberWindowFrame 0 121 1440 757 0 0 1440 878 @@ -394,7 +386,7 @@ GeometryConfiguration Frame - {{0, 497}, {1144, 219}} + {{0, 497}, {1072, 219}} RubberWindowFrame 0 121 1440 757 0 0 1440 878 @@ -405,7 +397,7 @@ Proportion - 1144pt + 1072pt Name @@ -583,7 +575,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + idle.c StatusBarVisibility @@ -600,6 +592,8 @@ 187pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID diff --git a/MailCore.xcodeproj/mronge.pbxuser b/MailCore.xcodeproj/mronge.pbxuser index 3e995d8..1a989b7 100644 --- a/MailCore.xcodeproj/mronge.pbxuser +++ b/MailCore.xcodeproj/mronge.pbxuser @@ -55,7 +55,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_FiletypeID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 905, + 833, 20, 48, 43, @@ -101,7 +101,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 865, + 793, 60, 20, 48, @@ -138,6 +138,17 @@ F890781C10A5FF7400852ABD = F890781C10A5FF7400852ABD /* PBXTextBookmark */; F890782810A5FFA700852ABD = F890782810A5FFA700852ABD /* PBXTextBookmark */; F890D24D10CEBADB0039817C /* PBXTextBookmark */ = F890D24D10CEBADB0039817C /* PBXTextBookmark */; + F890D3A510CEED8F0039817C /* XCBuildMessageTextBookmark */ = F890D3A510CEED8F0039817C /* XCBuildMessageTextBookmark */; + F890D3A610CEED8F0039817C /* PBXTextBookmark */ = F890D3A610CEED8F0039817C /* PBXTextBookmark */; + F890D3A910CEED920039817C /* PBXTextBookmark */ = F890D3A910CEED920039817C /* PBXTextBookmark */; + F890D3AA10CEED920039817C /* XCBuildMessageTextBookmark */ = F890D3AA10CEED920039817C /* XCBuildMessageTextBookmark */; + F890D3AB10CEED920039817C /* PBXTextBookmark */ = F890D3AB10CEED920039817C /* PBXTextBookmark */; + F890D3B310CEEE3E0039817C /* PBXTextBookmark */ = F890D3B310CEEE3E0039817C /* PBXTextBookmark */; + F890D3B410CEEE3E0039817C /* XCBuildMessageTextBookmark */ = F890D3B410CEEE3E0039817C /* XCBuildMessageTextBookmark */; + F890D3B610CEEE3E0039817C /* PBXTextBookmark */ = F890D3B610CEEE3E0039817C /* PBXTextBookmark */; + F890D3B810CEEE520039817C /* PBXTextBookmark */ = F890D3B810CEEE520039817C /* PBXTextBookmark */; + F890D3B910CEEE520039817C /* XCBuildMessageTextBookmark */ = F890D3B910CEEE520039817C /* XCBuildMessageTextBookmark */; + F890D3BB10CEEE520039817C /* PBXTextBookmark */ = F890D3BB10CEEE520039817C /* PBXTextBookmark */; F8B2719E108FB85600BA08D2 = F8B2719E108FB85600BA08D2 /* PBXTextBookmark */; F8B271A4108FE4F100BA08D2 = F8B271A4108FE4F100BA08D2 /* PBXTextBookmark */; F8B271BA108FEEC300BA08D2 = F8B271BA108FEEC300BA08D2 /* PBXTextBookmark */; @@ -351,9 +362,9 @@ }; F81B88500A74AA7100143DF6 /* CTCoreAccount.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1530, 1248}}"; - sepNavSelRange = "{1576, 0}"; - sepNavVisRange = "{0, 3161}"; + sepNavIntBoundsRect = "{{0, 0}, {1011, 1248}}"; + sepNavSelRange = "{1601, 0}"; + sepNavVisRange = "{0, 1658}"; sepNavWindowFrame = "{{63, 87}, {1100, 785}}"; }; }; @@ -603,7 +614,7 @@ }; F88804D60B4243C000D400E7 /* MailCoreUtilities.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1083, 1014}}"; + sepNavIntBoundsRect = "{{0, 0}, {1011, 1014}}"; sepNavSelRange = "{2144, 0}"; sepNavVisRange = "{1327, 965}"; }; @@ -676,6 +687,136 @@ vrLen = 965; vrLoc = 1327; }; + F890D3A510CEED8F0039817C /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Libetpan/libetpan.h: No such file or directory"; + fRef = F81B88500A74AA7100143DF6 /* CTCoreAccount.h */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 32; + rType = 1; + }; + F890D3A610CEED8F0039817C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F81B88500A74AA7100143DF6 /* CTCoreAccount.h */; + name = "CTCoreAccount.h: 33"; + rLen = 0; + rLoc = 1601; + rType = 0; + vrLen = 491; + vrLoc = 1405; + }; + F890D3A910CEED920039817C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F88804D60B4243C000D400E7 /* MailCoreUtilities.m */; + name = "MailCoreUtilities.m: 55"; + rLen = 0; + rLoc = 2144; + rType = 0; + vrLen = 965; + vrLoc = 1327; + }; + F890D3AA10CEED920039817C /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Libetpan/libetpan.h: No such file or directory"; + fRef = F81B88500A74AA7100143DF6 /* CTCoreAccount.h */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 32; + rType = 1; + }; + F890D3AB10CEED920039817C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F81B88500A74AA7100143DF6 /* CTCoreAccount.h */; + name = "CTCoreAccount.h: 33"; + rLen = 0; + rLoc = 1601; + rType = 0; + vrLen = 1658; + vrLoc = 0; + }; + F890D3B310CEEE3E0039817C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F81B88500A74AA7100143DF6 /* CTCoreAccount.h */; + name = "CTCoreAccount.h: 33"; + rLen = 0; + rLoc = 1601; + rType = 0; + vrLen = 491; + vrLoc = 1405; + }; + F890D3B410CEEE3E0039817C /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Implicit declaration of function 'mailimap_struct_multiple_parse'"; + fRef = F890D3B510CEEE3E0039817C /* idle.c */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 70; + rType = 1; + }; + F890D3B510CEEE3E0039817C /* idle.c */ = { + isa = PBXFileReference; + name = idle.c; + path = "/Users/mronge/Projects/mailcore-work/libetpan/build-mac/../src/low-level/imap/idle.c"; + sourceTree = ""; + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1011, 2314}}"; + sepNavSelRange = "{1304, 0}"; + sepNavVisRange = "{939, 1001}"; + }; + }; + F890D3B610CEEE3E0039817C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F890D3B710CEEE3E0039817C /* idle.c */; + name = "idle.c: 71"; + rLen = 0; + rLoc = 1304; + rType = 0; + vrLen = 326; + vrLoc = 1208; + }; + F890D3B710CEEE3E0039817C /* idle.c */ = { + isa = PBXFileReference; + name = idle.c; + path = "/Users/mronge/Projects/mailcore-work/libetpan/build-mac/../src/low-level/imap/idle.c"; + sourceTree = ""; + }; + F890D3B810CEEE520039817C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F81B88500A74AA7100143DF6 /* CTCoreAccount.h */; + name = "CTCoreAccount.h: 33"; + rLen = 0; + rLoc = 1601; + rType = 0; + vrLen = 1658; + vrLoc = 0; + }; + F890D3B910CEEE520039817C /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Implicit declaration of function 'mailimap_struct_multiple_parse'"; + fRef = F890D3BA10CEEE520039817C /* idle.c */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 1; + rLoc = 70; + rType = 1; + }; + F890D3BA10CEEE520039817C /* idle.c */ = { + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + name = idle.c; + path = "/Users/mronge/Projects/mailcore-work/libetpan/build-mac/../src/low-level/imap/idle.c"; + sourceTree = ""; + }; + F890D3BB10CEEE520039817C /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F890D3B510CEEE3E0039817C /* idle.c */; + name = "idle.c: 71"; + rLen = 0; + rLoc = 1304; + rType = 0; + vrLen = 1001; + vrLoc = 939; + }; F8A70EED0C4059E100D1D694 /* JRLog.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {996, 1050}}"; diff --git a/MailCore.xcodeproj/project.pbxproj b/MailCore.xcodeproj/project.pbxproj index fef6fdd..a1d6c2f 100644 --- a/MailCore.xcodeproj/project.pbxproj +++ b/MailCore.xcodeproj/project.pbxproj @@ -57,9 +57,9 @@ F88CA0CF0BF7A7B00055AC29 /* CTSMTP.m in Sources */ = {isa = PBXBuildFile; fileRef = F88CA0CD0BF7A7B00055AC29 /* CTSMTP.m */; }; F88CA0D40BF7AC0B0055AC29 /* CTESMTP.h in Headers */ = {isa = PBXBuildFile; fileRef = F88CA0D20BF7AC0B0055AC29 /* CTESMTP.h */; settings = {ATTRIBUTES = (Public, ); }; }; F88CA0D50BF7AC0B0055AC29 /* CTESMTP.m in Sources */ = {isa = PBXBuildFile; fileRef = F88CA0D30BF7AC0B0055AC29 /* CTESMTP.m */; }; + F890D39F10CEED640039817C /* libetpan.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F890D39810CEECD50039817C /* libetpan.a */; }; 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 */; }; - F8DFAB0510541708003D3CC1 /* libetpan.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8DFAB0410541708003D3CC1 /* libetpan.framework */; }; F8DFABF010541804003D3CC1 /* libetpan.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8DFAB0410541708003D3CC1 /* libetpan.framework */; }; /* End PBXBuildFile section */ @@ -71,6 +71,34 @@ remoteGlobalIDString = 8DC2EF4F0486A6940098B216; remoteInfo = MailCore; }; + F890D39510CEECD50039817C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216 /* libetpan.framework */; + remoteInfo = libetpan; + }; + F890D39710CEECD50039817C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C69AB10A10546FE500F32FBD /* libetpan.a */; + remoteInfo = "static libetpan"; + }; + F890D39910CEECD50039817C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = C6DC660510829E8300FA050B /* libetpan-iphone.a */; + remoteInfo = "static libetpan iphone"; + }; + F890D39C10CEED080039817C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = C69AB10910546FE500F32FBD /* static libetpan */; + remoteInfo = "static libetpan"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -144,6 +172,7 @@ F88CA0CD0BF7A7B00055AC29 /* CTSMTP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTSMTP.m; path = Source/CTSMTP.m; sourceTree = ""; }; F88CA0D20BF7AC0B0055AC29 /* CTESMTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTESMTP.h; path = Source/CTESMTP.h; sourceTree = ""; }; F88CA0D30BF7AC0B0055AC29 /* CTESMTP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CTESMTP.m; path = Source/CTESMTP.m; sourceTree = ""; }; + F890D38D10CEECD50039817C /* libetpan.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libetpan.xcodeproj; path = "libetpan/build-mac/libetpan.xcodeproj"; sourceTree = SOURCE_ROOT; }; F8A70EED0C4059E100D1D694 /* JRLog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JRLog.h; path = Source/JRLog.h; sourceTree = ""; }; F8A70EEE0C4059E100D1D694 /* JRLog.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = JRLog.m; path = Source/JRLog.m; sourceTree = ""; }; F8D31A3109C524EA00468234 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -160,12 +189,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + F890D39F10CEED640039817C /* libetpan.a in Frameworks */, 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */, F8483E4109CE7B9000B80440 /* libssl.dylib in Frameworks */, F8483E4309CE7B9C00B80440 /* libiconv.dylib in Frameworks */, F8483E4C09CE7C2800B80440 /* libcrypto.dylib in Frameworks */, F88804620B42018500D400E7 /* libsasl2.dylib in Frameworks */, - F8DFAB0510541708003D3CC1 /* libetpan.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -193,6 +222,7 @@ 0867D691FE84028FC02AAC07 /* MailCore */ = { isa = PBXGroup; children = ( + F890D38D10CEECD50039817C /* libetpan.xcodeproj */, F85A18AF09C7D8F200305C06 /* Tests */, 08FB77AEFE84172EC02AAC07 /* Classes */, 32C88DFF0371C24200C91783 /* Other Sources */, @@ -335,6 +365,16 @@ name = Tests; sourceTree = ""; }; + F890D39010CEECD50039817C /* Products */ = { + isa = PBXGroup; + children = ( + F890D39610CEECD50039817C /* libetpan.framework */, + F890D39810CEECD50039817C /* libetpan.a */, + F890D39A10CEECD50039817C /* libetpan-iphone.a */, + ); + name = Products; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -386,6 +426,7 @@ buildRules = ( ); dependencies = ( + F890D39D10CEED080039817C /* PBXTargetDependency */, ); name = MailCore; productInstallPath = "$(HOME)/Library/Frameworks"; @@ -423,6 +464,12 @@ mainGroup = 0867D691FE84028FC02AAC07 /* MailCore */; productRefGroup = 034768DFFF38A50411DB9C8B /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = F890D39010CEECD50039817C /* Products */; + ProjectRef = F890D38D10CEECD50039817C /* libetpan.xcodeproj */; + }, + ); projectRoot = ..; targets = ( 8DC2EF4F0486A6940098B216 /* MailCore */, @@ -431,6 +478,30 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + F890D39610CEECD50039817C /* libetpan.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = libetpan.framework; + remoteRef = F890D39510CEECD50039817C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F890D39810CEECD50039817C /* libetpan.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libetpan.a; + remoteRef = F890D39710CEECD50039817C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F890D39A10CEECD50039817C /* libetpan-iphone.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libetpan-iphone.a"; + remoteRef = F890D39910CEECD50039817C /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 8DC2EF520486A6940098B216 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -473,7 +544,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "find Tests Source OpenSourceProjects -name \"*.h\" -or -name \"*.c\" -or -name \"*.m\" | xargs /usr/bin/etags"; + shellScript = "find Tests Source libetpan -name \"*.h\" -or -name \"*.c\" -or -name \"*.m\" | xargs /usr/bin/etags"; }; F848422D09CFACA000B80440 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -499,7 +570,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "python Scripts/BuildScripts/buildopensource.py"; + shellScript = "#python Scripts/BuildScripts/buildopensource.py"; }; /* End PBXShellScriptBuildPhase section */ @@ -550,6 +621,11 @@ target = 8DC2EF4F0486A6940098B216 /* MailCore */; targetProxy = F82D7D220F48ACDA00ADA65C /* PBXContainerItemProxy */; }; + F890D39D10CEED080039817C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "static libetpan"; + targetProxy = F890D39C10CEED080039817C /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -633,7 +709,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = "libetpan/build-mac/include/**"; LIBRARY_SEARCH_PATHS = ""; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; @@ -650,7 +726,7 @@ GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = "libetpan/build-mac/include/**"; LIBRARY_SEARCH_PATHS = ""; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;