diff --git a/Application/AppController.h b/Application/AppController.h index 4c1282f8d..b455e028d 100644 --- a/Application/AppController.h +++ b/Application/AppController.h @@ -7,7 +7,6 @@ @class PlaylistController; @class PlaylistView; @class PlaylistLoader; -@class SUUpdater; @class PreferencesController; @interface AppController : NSObject { @@ -47,8 +46,6 @@ IBOutlet NSWindowController *spotlightWindowController; - IBOutlet SUUpdater *updater; - IBOutlet FileTreeViewController *fileTreeViewController; IBOutlet PreferencesController *preferencesController; @@ -110,6 +107,8 @@ - (void)showPathSuggester; + (void)globalShowPathSuggester; +- (IBAction)checkForUpdates:(id)sender; + @property NSWindow *mainWindow; @property NSWindow *miniWindow; diff --git a/Application/AppController.m b/Application/AppController.m index 9c7bfe164..011dc810b 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -40,6 +40,22 @@ BOOL kAppControllerShuttingDown = NO; static AppController *kAppController = nil; +@interface SparkleBridge : NSObject ++ (SPUStandardUpdaterController *)sharedStandardUpdaterController; +@end + +@implementation SparkleBridge + ++ (SPUStandardUpdaterController *)sharedStandardUpdaterController { + static SPUStandardUpdaterController *sharedStandardUpdaterController_ = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + sharedStandardUpdaterController_ = [[SPUStandardUpdaterController alloc] initWithUpdaterDelegate: nil userDriverDelegate: nil]; + }); + return sharedStandardUpdaterController_; +} +@end + @implementation AppController { BOOL _isFullToolbarStyle; } @@ -172,8 +188,9 @@ static AppController *kAppController = nil; #ifdef DEBUG // Prevent updates automatically in debug builds - [updater setAutomaticallyChecksForUpdates:NO]; + [[[SparkleBridge sharedStandardUpdaterController] updater] setAutomaticallyChecksForUpdates:NO]; #endif + [[[SparkleBridge sharedStandardUpdaterController] updater] setUpdateCheckInterval:3600]; [[totalTimeField cell] setBackgroundStyle:NSBackgroundStyleRaised]; @@ -785,4 +802,8 @@ static AppController *kAppController = nil; [kAppController showPathSuggester]; } +- (IBAction)checkForUpdates:(id)sender { + [[SparkleBridge sharedStandardUpdaterController] checkForUpdates:[[NSApplication sharedApplication] delegate]]; +} + @end diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib index 4cda5ca94..6378da994 100644 --- a/Base.lproj/MainMenu.xib +++ b/Base.lproj/MainMenu.xib @@ -1382,7 +1382,7 @@ - + @@ -2201,7 +2201,6 @@ Gw - @@ -2459,7 +2458,6 @@ Gw -