Commit: 58ab9283660faf83b1ebbeefa69e8d74c973c18e - CDEvents (git)

An Objective-C wrapper for Mac OS X’s FSEvents C API.

Commit MetaInfo

• Revisión: 58ab9283660faf83b1ebbeefa69e8d74c973c18e (tree)
• Tiempo: 2010-04-04 17:38:28
• Autor: Aron Cedercrantz <aron@cede...>
• Commiter: Aron Cedercrantz

Log Message

Merge branch 'release/1.0.1'

Cambiar Resumen

• modified: CDEvent.h
• modified: CDEvents.m
• modified: CDEvents.xcodeproj/project.pbxproj

Diferencia incremental

--- a/CDEvent.h
+++ b/CDEvent.h
@@ -46,6 +46,13 @@
  */
 typedef NSUInteger CDEventIdentifier;
 
+/**
+ * The event stream event flags type.
+ *
+ * @since 1.0.1
+ */
+typedef NSUInteger CDEventFlags;
+
 
 /**
  * An Objective-C wrapper for a <code>FSEvents</code> event data.
@@ -62,7 +69,7 @@ typedef NSUInteger CDEventIdentifier;
 	CDEventIdentifier			_identifier;
 	NSDate						*_date;
 	NSURL						*_URL;
-	FSEventStreamEventFlags		_flags;
+	CDEventFlags				_flags;
 }
 
 #pragma mark Properties
@@ -106,7 +113,7 @@ typedef NSUInteger CDEventIdentifier;
  *
  * @since 1.0.0
  */
-@property (readonly) FSEventStreamEventFlags	flags;
+@property (readonly) CDEventFlags				flags;
 
 #pragma mark Class object creators
 
@@ -127,7 +134,7 @@ typedef NSUInteger CDEventIdentifier;
 + (CDEvent *)eventWithIdentifier:(NSUInteger)identifier
 							date:(NSDate *)date
 							 URL:(NSURL *)URL
-						   flags:(FSEventStreamEventFlags)flags;
+						   flags:(CDEventFlags)flags;
 
 #pragma mark Init methods
 /**
@@ -146,6 +153,6 @@ typedef NSUInteger CDEventIdentifier;
 - (id)initWithIdentifier:(NSUInteger)identifier
 					date:(NSDate *)date
 					 URL:(NSURL *)URL
-				   flags:(FSEventStreamEventFlags)flags;
+				   flags:(CDEventFlags)flags;
 
 @end

--- a/CDEvents.m
+++ b/CDEvents.m
@@ -146,15 +146,14 @@ ignoreEventsFromSubDirs:(BOOL)ignoreEventsFromSubDirs
 #pragma mark NSCopying method
 - (id)copyWithZone:(NSZone *)zone
 {
-	CDEvents *copy = [[CDEvents alloc] init];
-	
-	copy->_delegate = _delegate;
-	copy->_notificationLatency = [self notificationLatency];
-	copy->_ignoreEventsFromSubDirectories = [self ignoreEventsFromSubDirectories];
-	copy->_lastEvent = [[self lastEvent] retain];
-	copy->_sinceEventIdentifier = _sinceEventIdentifier;
-	copy->_watchedURLs = [[self watchedURLs] copyWithZone:zone];
-	copy->_excludedURLs = [[self excludedURLs] copyWithZone:zone];
+	CDEvents *copy = [[CDEvents alloc] initWithURLs:[self watchedURLs]
+										   delegate:[self delegate]
+										  onRunLoop:[NSRunLoop currentRunLoop]
+							   sinceEventIdentifier:[self sinceEventIdentifier]
+							   notificationLantency:[self notificationLatency]
+							ignoreEventsFromSubDirs:[self ignoreEventsFromSubDirectories]
+										excludeURLs:[self excludedURLs]
+								streamCreationFlags:_eventStreamCreationFlags];
 	
 	return copy;
 }

--- a/CDEvents.xcodeproj/project.pbxproj
+++ b/CDEvents.xcodeproj/project.pbxproj
@@ -26,7 +26,7 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 8DC2EF4F0486A6940098B216 /* CDEvents */;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
 			remoteInfo = CDEvents;
 		};
 /* End PBXContainerItemProxy section */
@@ -325,8 +325,9 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
+				GCC_VERSION = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "@rpath";
+				INSTALL_PATH = "@loader_path/../Frameworks";
 				PRODUCT_NAME = CDEvents;
 				WRAPPER_EXTENSION = framework;
 			};
@@ -344,8 +345,9 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = CDEvents_Prefix.pch;
+				GCC_VERSION = "";
 				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "@rpath";
+				INSTALL_PATH = "@loader_path/../Frameworks";
 				PRODUCT_NAME = CDEvents;
 				WRAPPER_EXTENSION = framework;
 			};