From 12ed6ad18ed8e7390b9fa6681487c75a0eb9c979 Mon Sep 17 00:00:00 2001 From: Andrew Udvare Date: Fri, 6 Nov 2020 16:40:20 -0500 Subject: [PATCH] Remove update stuff --- Interfaces/MainMenu.xib | 10 --------- Interfaces/PreferencePanel.xib | 26 ---------------------- sources/GeneralPreferencesViewController.m | 16 ------------- sources/iTermApplicationDelegate.m | 8 ------- sources/iTermController.m | 2 +- sources/iTermLaunchExperienceController.m | 2 +- sources/iTermPreferences.m | 2 +- 7 files changed, 3 insertions(+), 63 deletions(-) diff --git Interfaces/MainMenu.xib Interfaces/MainMenu.xib index 093a4958c..76521fa89 100644 --- Interfaces/MainMenu.xib +++ Interfaces/MainMenu.xib @@ -28,14 +28,6 @@ - - - - - - - - @@ -1336,7 +1328,6 @@ DQ - @@ -1344,7 +1335,6 @@ DQ - diff --git Interfaces/PreferencePanel.xib Interfaces/PreferencePanel.xib index e0df82e16..e9716d6fb 100644 --- Interfaces/PreferencePanel.xib +++ Interfaces/PreferencePanel.xib @@ -1225,8 +1225,6 @@ DQ - - @@ -4832,30 +4829,6 @@ DQ - - - - - diff --git sources/GeneralPreferencesViewController.m sources/GeneralPreferencesViewController.m index 572346fd9..0b437dd2f 100644 --- sources/GeneralPreferencesViewController.m +++ sources/GeneralPreferencesViewController.m @@ -64,12 +64,6 @@ enum { // Enable bonjour IBOutlet NSButton *_enableBonjour; - // Check for updates automatically - IBOutlet NSButton *_checkUpdate; - - // Prompt for test-release updates - IBOutlet NSButton *_checkTestRelease; - // Load prefs from custom folder IBOutlet NSButton *_loadPrefsFromCustomFolder; // Should load? IBOutlet NSTextField *_prefsCustomFolder; // Path or URL text field @@ -304,16 +298,6 @@ enum { relatedView:nil type:kPreferenceInfoTypeCheckbox]; - [self defineControl:_checkUpdate - key:kPreferenceKeyCheckForUpdatesAutomatically - relatedView:nil - type:kPreferenceInfoTypeCheckbox]; - - [self defineControl:_checkTestRelease - key:kPreferenceKeyCheckForTestReleases - relatedView:nil - type:kPreferenceInfoTypeCheckbox]; - // --------------------------------------------------------------------------------------------- info = [self defineControl:_loadPrefsFromCustomFolder key:kPreferenceKeyLoadPrefsFromCustomFolder diff --git sources/iTermApplicationDelegate.m sources/iTermApplicationDelegate.m index 1702d1cb0..20e8949f9 100644 --- sources/iTermApplicationDelegate.m +++ sources/iTermApplicationDelegate.m @@ -182,7 +182,6 @@ static BOOL hasBecomeActive = NO; IBOutlet NSMenuItem *showFullScreenTabs; IBOutlet NSMenuItem *useTransparency; IBOutlet NSMenuItem *maximizePane; - IBOutlet SUUpdater * suUpdater; IBOutlet NSMenuItem *_showTipOfTheDay; // Here because we must remove it for older OS versions. BOOL quittingBecauseLastWindowClosed_; @@ -1190,11 +1189,6 @@ static BOOL hasBecomeActive = NO; [self updateBuriedSessionsMenu:_statusIconBuriedSessions]; - item = [[[NSMenuItem alloc] initWithTitle:@"Check For Updates" - action:@selector(checkForUpdatesFromMenu:) - keyEquivalent:@""] autorelease]; - [menu addItem:item]; - item = [[[NSMenuItem alloc] initWithTitle:@"Quit iTerm2" action:@selector(terminate:) keyEquivalent:@""] autorelease]; @@ -1350,7 +1344,6 @@ static BOOL hasBecomeActive = NO; silenceable:kiTermWarningTypeSilenceableForOneMonth window:nil]; if (selection == kiTermWarningSelection1) { - [[SUUpdater sharedUpdater] checkForUpdates:nil]; } } } @@ -1473,7 +1466,6 @@ static BOOL hasBecomeActive = NO; } - (IBAction)checkForUpdatesFromMenu:(id)sender { - [suUpdater checkForUpdates:(sender)]; } #pragma mark - Main Menu diff --git sources/iTermController.m sources/iTermController.m index 5054f89d9..a5fef1132 100644 --- sources/iTermController.m +++ sources/iTermController.m @@ -1175,7 +1175,7 @@ static iTermController *gSharedInstance; } - (void)refreshSoftwareUpdateUserDefaults { - BOOL checkForTestReleases = [iTermPreferences boolForKey:kPreferenceKeyCheckForTestReleases]; + BOOL checkForTestReleases = NO; NSString *appCast = checkForTestReleases ? [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForTesting"] : [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForFinal"]; diff --git sources/iTermLaunchExperienceController.m sources/iTermLaunchExperienceController.m index 2a31322d1..d89935b0c 100644 --- sources/iTermLaunchExperienceController.m +++ sources/iTermLaunchExperienceController.m @@ -110,7 +110,7 @@ typedef NS_ENUM(NSUInteger, iTermLaunchExperienceChoice) { self = [super init]; if (self) { const NSInteger runCount = [iTermLaunchExperienceController incrementRunCount]; - if (runCount == 2 && ![[SUUpdater sharedUpdater] automaticallyChecksForUpdates]) { + if (runCount == 2) { // Sparkle will do its thing this launch. _choice = iTermLaunchExperienceChoiceNone; } else if ([iTermLaunchExperienceController quelled]) { diff --git sources/iTermPreferences.m sources/iTermPreferences.m index 04b1fe381..629f2377f 100644 --- sources/iTermPreferences.m +++ sources/iTermPreferences.m @@ -279,7 +279,7 @@ static NSString *sPreviousVersion; kPreferenceKeyInstantReplayMemoryMegabytes: @4, kPreferenceKeySavePasteAndCommandHistory: @NO, kPreferenceKeyAddBonjourHostsToProfiles: @NO, - kPreferenceKeyCheckForUpdatesAutomatically: @YES, + kPreferenceKeyCheckForUpdatesAutomatically: @NO, kPreferenceKeyCheckForTestReleases: @NO, kPreferenceKeyLoadPrefsFromCustomFolder: @NO, kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO, -- 2.29.2