Revision: 14691
http://sourceforge.net/p/skim-app/code/14691
Author: hofman
Date: 2024-11-15 18:06:20 +0000 (Fri, 15 Nov 2024)
Log Message:
-----------
no need to makee script menu controller a singleton
Modified Paths:
--------------
trunk/SKScriptMenu.m
Modified: trunk/SKScriptMenu.m
===================================================================
--- trunk/SKScriptMenu.m 2024-11-15 17:19:14 UTC (rev 14690)
+++ trunk/SKScriptMenu.m 2024-11-15 18:06:20 UTC (rev 14691)
@@ -58,8 +58,6 @@
@property (nonatomic, readonly) NSMenu *scriptMenu;
@property (nonatomic) BOOL menuNeedsUpdate;
-@property (class, nonatomic, readonly) SKScriptMenuController
*sharedController;
-
- (void)handleApplicationWillTerminateNotification:(NSNotification
*)notification;
- (NSArray *)directoryContentsAtURL:(NSURL *)url
recursionDepth:(NSInteger)depth;
- (void)executeScript:(id)sender;
@@ -70,15 +68,8 @@
@synthesize scriptMenu, menuNeedsUpdate;
-+ (SKScriptMenuController *)sharedController {
- static SKScriptMenuController *sharedController = nil;
- if (sharedController == nil)
- sharedController = [[self alloc] init];
- return sharedController;
-}
-
static void fsevents_callback(FSEventStreamRef streamRef, void
*clientCallBackInfo, int numEvents, const char *const eventPaths[], const
FSEventStreamEventFlags *eventMasks, const uint64_t *eventIDs) {
- [[SKScriptMenuController sharedController] setMenuNeedsUpdate:YES];
+ [(__bridge id)clientCallBackInfo setMenuNeedsUpdate:YES];
}
- (instancetype)init {
@@ -110,9 +101,10 @@
scriptFolders = [folders copy];
+ FSEventStreamContext context = {0, (__bridge void *)self, NULL,
NULL, NULL};
streamRef = FSEventStreamCreate(kCFAllocatorDefault,
(FSEventStreamCallback)&fsevents_callback, // callback
- NULL, // context
+ &context, // context
(__bridge
CFArrayRef)[scriptFolders valueForKey:@"path"], // pathsToWatch
kFSEventStreamEventIdSinceNow, //
sinceWhen
1.0, // latency
@@ -257,7 +249,10 @@
@implementation NSApplication (SKScriptMenu)
- (NSMenu *)scriptMenu {
- return [[SKScriptMenuController sharedController] scriptMenu];
+ static SKScriptMenuController *scriptMenuController = nil;
+ if (scriptMenuController == nil)
+ scriptMenuController = [[SKScriptMenuController alloc] init];
+ return [scriptMenuController scriptMenu];
}
@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
