Skip to content

Commit 0a5fcd6

Browse files
committed
Did a lot of work on Smarky, Synkmark and Markster.
1 parent fc5897e commit 0a5fcd6

5 files changed

+21
-7
lines changed

GCUndoManager.m

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
#import "GCUndoManager.h"
10+
#import <objc/runtime.h>
1011

1112
// this proxy object is returned by -prepareWithInvocationTarget: if GCUM_USE_PROXY is 1. This provides a similar behaviour to NSUndoManager
1213
// on 10.6 so that a wider range of methods can be submitted as undo tasks. Unlike 10.6 however, it does not bypass um's -forwardInvocation:
@@ -610,15 +611,25 @@ - (void) removeAllActionsWithTarget:(id) target
610611

611612
#pragma mark -
612613
#pragma mark - private NSUndoManager API
614+
#if 11
615+
#warning Fixing Graham's Private Stuff
616+
void doNothingIMP(id self, SEL _cmd, NSNotification* note) {
617+
NSLog(@"Nothing doing!");
618+
}
613619

620+
+ (void)load {
621+
SEL aSEL = NSSelectorFromString(@"_processEndOfEventNotification:") ;
622+
class_addMethod(self, aSEL, (IMP) doNothingIMP, "v@:@");
623+
}
624+
#else
614625
- (void) _processEndOfEventNotification:(NSNotification*) note
615626
{
616627
#pragma unused(note)
617628

618629
// private API invoked by NSDocument before a document is saved. Does nothing, but required for NSDocument compatibility.
619630
//NSLog(@"_processEndOfEventNotification: %@", note );
620631
}
621-
632+
#endif
622633

623634

624635
#pragma mark -

SSYAlert.h

+1
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,7 @@ extern NSObject <SSYAlertErrorHideManager> * gSSYAlertErrorHideManager ;
774774
message:(NSString*)msg
775775
buttonsArray:(NSArray*)buttonsArray ;
776776

777+
777778
#pragma mark * Public Methods For Setting Views
778779

779780
/*!

SSYAlert.m

-1
Original file line numberDiff line numberDiff line change
@@ -2200,7 +2200,6 @@ + (NSInteger)runModalDialogTitle:(NSString*)title
22002200
}
22012201

22022202

2203-
22042203
#pragma mark * Basic Infrastructure
22052204

22062205
- (void)dealloc {

SSYDropboxGuy.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ + (BOOL)pathIsInDropbox:(NSString*)path {
255255
// on my old 32-bit Mac Mini, path will at this point be instead
256256
// /Users/jk/Cloud/dropbox/dropbox/DeleteTest.bkmslf. The same
257257
// thing happens in BookMacster-Worker, where the path is obtained
258-
// from -[BkmxDocumentController pathOfDocumentWithUuid:::], which
258+
// from -[BkmxDocumentController pathOfDocumentWithUuid::::], which
259259
// gets it from a stored alias record.
260260
// So if that didn't work, we morph and retest it.
261261
NSMutableString* morphedPath = [path mutableCopy] ;

SSYLaunchdGuy.m

+7-4
Original file line numberDiff line numberDiff line change
@@ -625,12 +625,15 @@ + (BOOL)removeAgentsWithGlob:(NSString*)glob
625625
stderrData_p:&stderrData
626626
timeout:3.0
627627
error_p:&error] ;
628-
// We allowed 3.0 seconds because it is important to unload jobs before removing their
629-
// plist files. Otherwise you can't unload it due to "no such file or directory".
628+
// We allowed 3.0 seconds because it is important to unload jobs before
629+
// removing their plist files. Otherwise you can't unload it due to
630+
// "no such file or directory".
630631

631632
// If there were no loaded jobs matching the given glob, then at this
632-
// point we will have result=0, error=nil, and
633-
// stderr=launchctl: Couldn't stat("/path/to/*whatever*.plist"): No such file or directory
633+
// point we will have result=1 (OS X 10.9) or result=0 (earlier OS X
634+
// versions??), error=nil, and stderr will be
635+
// launchctl: Couldn't stat("/path/to/*whatever*.plist"):
636+
// No such file or directory
634637

635638
// Uninstall (Remove .plist file)
636639
if (result == 0) {

0 commit comments

Comments
 (0)