From a98a5b32619830c9b6927ed899f7856efd327515 Mon Sep 17 00:00:00 2001 From: Aaron Madlon-Kay Date: Thu, 13 Jun 2019 22:40:21 +0900 Subject: [PATCH] Remove Sparkle and auto-update --- Interfaces/English.lproj/MainMenu.xib | 7 -- Interfaces/English.lproj/Preferences.xib | 114 ----------------------- Source/SPAppController.m | 27 ------ Source/SPPreferenceController.h | 1 - Source/SPPreferenceController.m | 10 -- sequel-pro.xcodeproj/project.pbxproj | 6 -- 6 files changed, 165 deletions(-) diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 40174585..aab94a22 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -28,12 +28,6 @@ - - - - - - @@ -1057,7 +1051,6 @@ CQ - diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 2777afb3..5a690700 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -8,7 +8,6 @@ - @@ -56,11 +55,6 @@ - - - - - @@ -70,7 +64,6 @@ - @@ -897,113 +890,6 @@ Line 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/SPAppController.m b/Source/SPAppController.m index 5116c94c..4d4848dc 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -52,7 +52,6 @@ #import "SPOSInfo.h" #import -#import @interface SPAppController () @@ -133,9 +132,6 @@ // Set up the prefs controller prefsController = [[SPPreferenceController alloc] init]; - // Set Sparkle delegate - [[SUUpdater sharedUpdater] setDelegate:self]; - // Register SPAppController as services provider [NSApp setServicesProvider:self]; @@ -2216,29 +2212,6 @@ return [bundleKeyEquivalents objectForKey:scope]; } -/** - * Sparkle updater delegate method. Called just before the updater relaunches Sequel Pro and we need to make - * sure that no sheets are currently open, which will prevent the app from being quit. - */ -- (void)updaterWillRelaunchApplication:(SUUpdater *)updater -{ - // Sparkle might call this on a background thread, but calling endSheet: from a bg thread is unhealthy - if(![NSThread isMainThread]) return [[self onMainThread] updaterWillRelaunchApplication:updater]; - - // Get all the currently open windows and their attached sheets if any - NSArray *windows = [NSApp windows]; - - for (NSWindow *window in windows) - { - NSWindow *attachedSheet = [window attachedSheet]; - - if (attachedSheet) { - [NSApp endSheet:attachedSheet returnCode:0]; - [attachedSheet orderOut:nil]; - } - } -} - /** * If Sequel Pro is terminating kill all running BASH scripts and release all HTML output controller. * diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h index 3434663e..f888a536 100644 --- a/Source/SPPreferenceController.h +++ b/Source/SPPreferenceController.h @@ -51,7 +51,6 @@ IBOutlet SPTablesPreferencePane *tablesPreferencePane; IBOutlet SPNotificationsPreferencePane *notificationsPreferencePane; IBOutlet SPEditorPreferencePane *editorPreferencePane; - IBOutlet SPAutoUpdatePreferencePane *autoUpdatePreferencePane; IBOutlet SPNetworkPreferencePane *networkPreferencePane; NSToolbar *toolbar; diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index c782c591..b0bc5029 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -48,7 +48,6 @@ @synthesize tablesPreferencePane; @synthesize notificationsPreferencePane; @synthesize editorPreferencePane; -@synthesize autoUpdatePreferencePane; @synthesize networkPreferencePane; @synthesize fontChangeTarget; @@ -73,7 +72,6 @@ tablesPreferencePane, notificationsPreferencePane, editorPreferencePane, - autoUpdatePreferencePane, networkPreferencePane, nil]; } @@ -183,14 +181,6 @@ [editorItem setTarget:self]; [editorItem setAction:@selector(displayPreferencePane:)]; - // AutoUpdate preferences - autoUpdateItem = [[NSToolbarItem alloc] initWithItemIdentifier:[autoUpdatePreferencePane preferencePaneIdentifier]]; - - [autoUpdateItem setLabel:[autoUpdatePreferencePane preferencePaneName]]; - [autoUpdateItem setImage:[autoUpdatePreferencePane preferencePaneIcon]]; - [autoUpdateItem setTarget:self]; - [autoUpdateItem setAction:@selector(displayPreferencePane:)]; - // Network preferences networkItem = [[NSToolbarItem alloc] initWithItemIdentifier:[networkPreferencePane preferencePaneIdentifier]]; diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 08e1ac7d..c32c12e0 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -161,9 +161,7 @@ 4D90B79E101E0CF200D116A1 /* SPUserManager.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = 4D90B79B101E0CF200D116A1 /* SPUserManager.xcdatamodel */; }; 4D90B79F101E0CF200D116A1 /* SPUserMO.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D90B79D101E0CF200D116A1 /* SPUserMO.m */; }; 4D90B7A2101E0D1500D116A1 /* UserManagerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4D90B7A0101E0D1500D116A1 /* UserManagerView.xib */; }; - 4DECC3350EC2A170008D359E /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DECC3320EC2A170008D359E /* Sparkle.framework */; }; 4DECC3370EC2A170008D359E /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DECC3340EC2A170008D359E /* Growl.framework */; }; - 4DECC48F0EC2B436008D359E /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 4DECC3320EC2A170008D359E /* Sparkle.framework */; }; 4DECC4910EC2B436008D359E /* Growl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 4DECC3340EC2A170008D359E /* Growl.framework */; }; 50082B3D1BF7CD2100746ECC /* ICUTemplateMatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 296DC8AC0F909194002A3258 /* ICUTemplateMatcher.m */; }; 50082B3E1BF7CD2100746ECC /* NSArray_DeepMutableCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 296DC8AE0F909194002A3258 /* NSArray_DeepMutableCopy.m */; }; @@ -617,7 +615,6 @@ files = ( 58B907FB11BDA5A9000826E5 /* PSMTabBar.framework in Copy Frameworks */, 4DECC4910EC2B436008D359E /* Growl.framework in Copy Frameworks */, - 4DECC48F0EC2B436008D359E /* Sparkle.framework in Copy Frameworks */, 586EBD5D11418D9400B3DE45 /* FeedbackReporter.framework in Copy Frameworks */, 58C6C71F11FBB18000A3F5E9 /* UniversalDetector.framework in Copy Frameworks */, 58DC0D7C12932AB200B76DA5 /* ShortcutRecorder.framework in Copy Frameworks */, @@ -888,7 +885,6 @@ 4D90B79C101E0CF200D116A1 /* SPUserMO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUserMO.h; sourceTree = ""; }; 4D90B79D101E0CF200D116A1 /* SPUserMO.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUserMO.m; sourceTree = ""; }; 4D90B7A1101E0D1500D116A1 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/UserManagerView.xib; sourceTree = ""; }; - 4DECC3320EC2A170008D359E /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = ""; }; 4DECC3340EC2A170008D359E /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = Frameworks/Growl.framework; sourceTree = ""; }; 500C1F901BFB5F9F0095DC7F /* SPPrivilegesMO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPPrivilegesMO.h; sourceTree = ""; }; 500C1F911BFB5F9F0095DC7F /* SPPrivilegesMO.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPPrivilegesMO.m; sourceTree = ""; }; @@ -1339,7 +1335,6 @@ 296DC8BF0F9091DF002A3258 /* libicucore.dylib in Frameworks */, 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */, 4DECC3370EC2A170008D359E /* Growl.framework in Frameworks */, - 4DECC3350EC2A170008D359E /* Sparkle.framework in Frameworks */, 584D877815140F7B00F24774 /* SPMySQL.framework in Frameworks */, 586AAB1514FAD3AF007F82BF /* QueryKit.framework in Frameworks */, 296DC89F0F8FD336002A3258 /* WebKit.framework in Frameworks */, @@ -1365,7 +1360,6 @@ 58B9077D11BD9B64000826E5 /* Carbon.framework */, 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */, 4DECC3340EC2A170008D359E /* Growl.framework */, - 4DECC3320EC2A170008D359E /* Sparkle.framework */, 296DC89E0F8FD336002A3258 /* WebKit.framework */, 586EBD2311418D7C00B3DE45 /* FeedbackReporter.framework */, 58C6C71511FBB17200A3F5E9 /* UniversalDetector.framework */, -- 2.21.0