Skip to content

Commit

Permalink
pending changes
Browse files Browse the repository at this point in the history 
added to the code when last editing it
  • Loading branch information
@ssp
ssp committed Jun 28, 2012
1 parent ac8ea2e commit 5530109
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 63 deletions.
24 changes: 10 additions & 14 deletions Keychain/Keychain.xcodeproj/project.pbxproj
View file
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objectVersion = 46;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -486,7 +486,7 @@
757A985D0CB98BF300513299 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = "English.lproj/Extension Format Constants.strings"; sourceTree = "<group>"; };
757A985F0CB98BF300513299 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = "English.lproj/Extension Format Names.strings"; sourceTree = "<group>"; };
757A98610CB98BF300513299 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = "English.lproj/GUID Names.strings"; sourceTree = "<group>"; };
757A98630CB98BF300513299 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
757A98630CB98BF300513299 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
757A98650CB98BF300513299 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = "English.lproj/Key Attribute Constants.strings"; sourceTree = "<group>"; };
757A98670CB98BF300513299 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = "English.lproj/Key Attribute Names.strings"; sourceTree = "<group>"; };
757A98690CB98BF300513299 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = "English.lproj/Key Class Constants.strings"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1230,8 +1230,11 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0430;
};
buildConfigurationList = 7528103408569F6900FEFBDC /* Build configuration list for PBXProject "Keychain" */;
compatibilityVersion = "Xcode 3.1";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -2203,7 +2206,6 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
PRODUCT_NAME = World;
ZERO_LINK = NO;
Expand All @@ -2216,10 +2218,8 @@
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Development\"";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = supported;
GCC_ENABLE_SSE3_EXTENSIONS = YES;
GCC_FAST_OBJC_DISPATCH = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
Expand All @@ -2241,10 +2241,9 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.6;
OTHER_CFLAGS = "-ggdb3";
PREBINDING = NO;
SDKROOT = macosx10.5;
SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";
};
name = Development;
Expand All @@ -2254,10 +2253,8 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
DEBUG_INFORMATION_FORMAT = dwarf;
FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Development\"";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = supported;
GCC_ENABLE_SSE3_EXTENSIONS = YES;
GCC_FAST_OBJC_DISPATCH = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -2278,10 +2275,9 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
MACOSX_DEPLOYMENT_TARGET = 10.6;
OTHER_CFLAGS = "-ggdb3";
PREBINDING = NO;
SDKROOT = macosx10.5;
SDKROOT = macosx;
VERSIONING_SYSTEM = "apple-generic";
};
name = Deployment;
Expand Down
3 changes: 3 additions & 0 deletions delimport/DIBookmarksController.m
View file
Expand Up @@ -102,13 +102,16 @@ - (void)addToLoginItems {
- (KeychainItem *) getKeychainUserAndPass {
KeychainSearch * search = [[KeychainSearch alloc] init];
[search setServer:[DIBookmarksController serverAddress]];

NSArray *results = [search internetSearchResults];
if ([results count] <= 0) {
return nil;
}

KeychainItem *item = [results objectAtIndex:0];
username = [item account];
password = [item dataAsString];

return item;
}

Expand Down
18 changes: 15 additions & 3 deletions delimport/DIFileController.m
View file
Expand Up @@ -15,6 +15,10 @@
#define DIFAILPlistFileName @"Failed Downloads.plist"


@interface DIFileController (Callback)
- (void) downloadFinishedWithStatus: (NSNotification*) notification;
@end


@implementation DIFileController

Expand Down Expand Up @@ -166,19 +170,27 @@ - (void) saveDictionary: (NSDictionary *) dictionary {
NSNumber *osType = [NSNumber numberWithUnsignedLong:'DELi'];
[mutable removeObjectForKey: DIHashKey];
[mutable writeToFile:path atomically:YES];

NSFileManager * fM = [[[NSFileManager alloc] init] autorelease];
NSError * error;

if (![fM setAttributes:[NSDictionary dictionaryWithObject:osType forKey:NSFileHFSTypeCode] ofItemAtPath:path error:&error]) {
NSLog(@"Failed to set HFS Type Code for file %@ (%@)", path, [error localizedDescription]);
}

[fM changeFileAttributes:[NSDictionary dictionaryWithObject:osType forKey:NSFileHFSTypeCode] atPath:path];

/* Set creation date do bookmark date.
/* Set creation date to bookmark date.
Setting the modification date might be more useful, but would be 'wrong'
as we don't know when the bookmark was last edited.
Investigate setting the last used date as well?
This would put bookmarks in their correct order in Spotlight results.
*/
NSDate * date = [mutable objectForKey: DITimeKey];
if (date) {
[fM changeFileAttributes:[NSDictionary dictionaryWithObject:date forKey:NSFileCreationDate] atPath:path];
if (![fM setAttributes:[NSDictionary dictionaryWithObject:date forKey:NSFileCreationDate] ofItemAtPath:path error:&error]) {
NSLog(@"Failed to set creation date for file %@ (%@)", path, [error localizedDescription]);

}
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions delimport/DILoginController.m
View file
Expand Up @@ -22,8 +22,12 @@ - (void)getUsername:(NSString **)username password:(NSString **)password
[self showWindow:self];
[[self window] makeKeyAndOrderFront:self];
[[self window] center];
[userField setStringValue:*username];
[passField setStringValue:*password];
if(*username) {
[userField setStringValue:*username];
}
if (*password) {
[passField setStringValue:*password];
}
[NSApp runModalForWindow:[self window]];
*username = [userField stringValue];
*password = [passField stringValue];
Expand Down
22 changes: 14 additions & 8 deletions delimport/Info.plist
View file
Expand Up @@ -17,8 +17,6 @@
<array>
<string>org.ianhenderson.delicious.bookmark</string>
</array>
<key>NSPersistentStoreTypeKey</key>
<string>XML</string>
</dict>
<dict>
<key>CFBundleTypeIconFile</key>
Expand All @@ -31,8 +29,6 @@
<array>
<string>org.ianhenderson.pinboard.bookmark</string>
</array>
<key>NSPersistentStoreTypeKey</key>
<string>XML</string>
</dict>
</array>
<key>CFBundleExecutable</key>
Expand All @@ -45,22 +41,26 @@
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.6a3</string>
<key>CFBundleSignature</key>
<string>DeLi</string>
<key>CFBundleURLTypes</key>
<array/>
<key>CFBundleVersion</key>
<string>55</string>
<key>CFBundleShortVersionString</key>
<string>0.6a3</string>
<key>LSMinimumSystemVersion</key>
<string>10.5</string>
<key>LSUIElement</key>
<true/>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSServices</key>
<array/>
<key>NSSupportsSuddenTermination</key>
<string>YES</string>
<key>LSMinimumSystemVersion</key>
<string>10.5</string>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>
Expand All @@ -70,6 +70,8 @@
</array>
<key>UTTypeDescription</key>
<string>delicious Bookmark</string>
<key>UTTypeIconFile</key>
<string>delicious</string>
<key>UTTypeIdentifier</key>
<string>org.ianhenderson.delicious.bookmark</string>
<key>UTTypeTagSpecification</key>
Expand All @@ -89,6 +91,8 @@
</array>
<key>UTTypeDescription</key>
<string>pinboard Bookmark</string>
<key>UTTypeIconFile</key>
<string>pinboard</string>
<key>UTTypeIdentifier</key>
<string>org.ianhenderson.pinboard.bookmark</string>
<key>UTTypeTagSpecification</key>
Expand All @@ -102,5 +106,7 @@
</dict>
</dict>
</array>
<key>UTImportedTypeDeclarations</key>
<array/>
</dict>
</plist>
35 changes: 20 additions & 15 deletions delimport/delimport.xcodeproj/project.pbxproj
View file
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 45;
objectVersion = 46;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -199,11 +199,11 @@
6C21EC6A12D290B100091671 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
6C383FF21066F2370001AAAD /* Readme.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Readme.markdown; path = ../Readme.markdown; sourceTree = "<group>"; };
6C41DF3313632F0200EB6477 /* DIWebarchiveDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DIWebarchiveDownload.h; sourceTree = "<group>"; };
6C41DF3413632F0200EB6477 /* DIWebarchiveDownload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DIWebarchiveDownload.m; sourceTree = "<group>"; };
6C41DF3413632F0200EB6477 /* DIWebarchiveDownload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DIWebarchiveDownload.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
6C41E01E1364335C00EB6477 /* DIQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DIQueue.h; sourceTree = "<group>"; };
6C41E01F1364335C00EB6477 /* DIQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DIQueue.m; sourceTree = "<group>"; };
6C41E04B13643B5300EB6477 /* DIQueueItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DIQueueItem.h; sourceTree = "<group>"; };
6C41E04C13643B5300EB6477 /* DIQueueItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DIQueueItem.m; sourceTree = "<group>"; };
6C41E04C13643B5300EB6477 /* DIQueueItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DIQueueItem.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
6C5A9C66104D9A030092E350 /* fr */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
6C5A9C67104D9A090092E350 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/LogIn.xib; sourceTree = "<group>"; };
6C5AA488104E91210092E350 /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
Expand All @@ -223,9 +223,9 @@
BF138E6E082587BA009D55C5 /* DILoginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DILoginController.h; sourceTree = "<group>"; };
BF138E6F082587BA009D55C5 /* DILoginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DILoginController.m; sourceTree = "<group>"; };
BF5D10050824537F0096CC1B /* DIBookmarksController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DIBookmarksController.h; sourceTree = "<group>"; };
BF5D10060824537F0096CC1B /* DIBookmarksController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DIBookmarksController.m; sourceTree = "<group>"; };
BF5D10060824537F0096CC1B /* DIBookmarksController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DIBookmarksController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
BFAA6A2A0821F9F300828D28 /* DIFileController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DIFileController.h; sourceTree = "<group>"; };
BFAA6A2B0821F9F300828D28 /* DIFileController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DIFileController.m; sourceTree = "<group>"; };
BFAA6A2B0821F9F300828D28 /* DIFileController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DIFileController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
BFAA6A5F082210D500828D28 /* delicious.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = delicious.icns; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -399,8 +399,11 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0410;
};
buildConfigurationList = 6CCC64330A40CC7F00540A50 /* Build configuration list for PBXProject "delimport" */;
compatibilityVersion = "Xcode 3.1";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -658,18 +661,17 @@
buildSettings = {
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
PRODUCT_NAME = Release;
};
name = Deployment;
};
6CCC64300A40CC7F00540A50 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CODE_SIGN_IDENTITY = "earthlingsoft Software";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -686,7 +688,6 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
PRODUCT_NAME = delimport;
WRAPPER_EXTENSION = app;
};
Expand All @@ -695,8 +696,8 @@
6CCC64310A40CC7F00540A50 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CODE_SIGN_IDENTITY = "earthlingsoft Software";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = delimport_Prefix.pch;
Expand All @@ -710,7 +711,6 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Info.plist;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
PRODUCT_NAME = delimport;
WRAPPER_EXTENSION = app;
};
Expand All @@ -719,7 +719,8 @@
6CCC64340A40CC7F00540A50 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CODE_SIGN_IDENTITY = earthlingsoft;
COPY_PHASE_STRIP = NO;
GCC_ENABLE_OBJC_GC = supported;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
Expand All @@ -743,7 +744,9 @@
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
SDKROOT = macosx10.5;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "";
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = NO;
};
name = Development;
Expand All @@ -752,8 +755,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CODE_SIGN_IDENTITY = earthlingsoft;
GCC_ENABLE_OBJC_GC = supported;
GCC_VERSION = "";
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = YES;
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
Expand All @@ -774,7 +778,8 @@
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
SDKROOT = macosx10.5;
PROVISIONING_PROFILE = "";
SDKROOT = macosx;
};
name = Deployment;
};
Expand Down

0 comments on commit 5530109

Please sign in to comment.