• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revisionf812a2a33680bb50cafd0a6883d8613b7a4c3b66 (tree)
Time2014-03-01 23:43:33
AuthorAron Cedercrantz <aron@cede...>
CommiterAron Cedercrantz

Log Message

Merge tag '1.2.2'

Change Summary

Incremental Difference

--- a/CDEvent.m
+++ b/CDEvent.m
@@ -83,7 +83,7 @@
8383 self = [self initWithIdentifier:[[aDecoder decodeObjectForKey:@"identifier"] unsignedIntegerValue]
8484 date:[aDecoder decodeObjectForKey:@"date"]
8585 URL:[aDecoder decodeObjectForKey:@"URL"]
86- flags:[[aDecoder decodeObjectForKey:@"flags"] unsignedIntegerValue]];
86+ flags:[[aDecoder decodeObjectForKey:@"flags"] unsignedIntValue]];
8787
8888 return self;
8989 }
--- a/CDEvents.m
+++ b/CDEvents.m
@@ -60,10 +60,10 @@ const CDEventIdentifier kCDEventsSinceEventNow = kFSEventStreamEventIdSinceNow;
6060 // Private API
6161 @interface CDEvents () {
6262 @private
63- CDEventsEventBlock _eventBlock;
63+ CDEventsEventBlock _eventBlock;
6464
65- FSEventStreamRef _eventStream;
66- NSUInteger _eventStreamCreationFlags;
65+ FSEventStreamRef _eventStream;
66+ CDEventsEventStreamCreationFlags _eventStreamCreationFlags;
6767 }
6868
6969 // Redefine the properties that should be writeable.
@@ -313,7 +313,7 @@ streamCreationFlags:(CDEventsEventStreamCreationFlags)streamCreationFlags
313313 (__bridge CFArrayRef)watchedPaths,
314314 (FSEventStreamEventId)[self sinceEventIdentifier],
315315 [self notificationLatency],
316- _eventStreamCreationFlags);
316+ (uint) _eventStreamCreationFlags);
317317 }
318318
319319 - (void)disposeEventStream
--- a/Info.plist
+++ b/Info.plist
@@ -17,11 +17,11 @@
1717 <key>CFBundlePackageType</key>
1818 <string>FMWK</string>
1919 <key>CFBundleShortVersionString</key>
20- <string>1.2.1</string>
20+ <string>1.2.2</string>
2121 <key>CFBundleSignature</key>
2222 <string>????</string>
2323 <key>CFBundleVersion</key>
24- <string>1.2.1</string>
24+ <string>1.2.2</string>
2525 <key>NSPrincipalClass</key>
2626 <string></string>
2727 </dict>