Merge pull request #2 from rentzsch/master

Xcode 3.2.6 compatibility and Don't Record Clipboard Updates with Passwords
snark · Oct 5, 2011 · 00f8db4 · 00f8db4
2 parents ac32999 + b747cb9
commit 00f8db4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/project/AppController.m b/project/AppController.m
@@ -360,7 +360,7 @@ -(void)pollPB:(NSTimer *)timer
         pbCount = [[NSNumber numberWithInt:[jcPasteboard changeCount]] retain];
         if ( type != nil ) {
 			NSString *contents = [jcPasteboard stringForType:type];
-			if ( contents == nil ) {
+			if ( contents == nil || [jcPasteboard stringForType:@"PasswordPboardType"] ) {
 //                NSLog(@"Contents: Empty");
             } else {
 				if (( [clippingStore jcListCount] == 0 || ! [contents isEqualToString:[clippingStore clippingContentsAtPosition:0]])

diff --git a/project/Jumpcut.xcodeproj/project.pbxproj b/project/Jumpcut.xcodeproj/project.pbxproj
@@ -414,6 +414,7 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Jumpcut" */;
 			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -563,6 +564,7 @@
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
@@ -578,6 +580,7 @@
 					i386,
 				);
 				GCC_OPTIMIZATION_LEVEL = s;
+				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;