From 0dc6bc96075af5a17f09598c6c179f32dd4cfda5 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sun, 16 Dec 2012 18:39:55 +0000 Subject: =?UTF-8?q?=20-=20Display=20startup=20release=20notes=20(eg=20post?= =?UTF-8?q?-r3921)=20to=20not=20block=20startup,=20preventing=20duplicate?= =?UTF-8?q?=20"Help"=20menus=20-=20with=20thanks=20to=20Micha=C3=ABl=20Gal?= =?UTF-8?q?lego=20and=20schlabberdog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPPreferencesUpgrade.h | 2 +- Source/SPPreferencesUpgrade.m | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'Source') diff --git a/Source/SPPreferencesUpgrade.h b/Source/SPPreferencesUpgrade.h index 71f6c956..e3de5cb7 100644 --- a/Source/SPPreferencesUpgrade.h +++ b/Source/SPPreferencesUpgrade.h @@ -42,6 +42,6 @@ void SPApplyRevisionChanges(void); void SPMigrateConnectionFavoritesData(void); void SPMigratePreferencesFromPreviousIdentifer(void); -void SPShowPostMigrationReleaseNotes(NSArray *releaseNotes); ++ (void)showPostMigrationReleaseNotes:(NSArray *)releaseNotes; @end diff --git a/Source/SPPreferencesUpgrade.m b/Source/SPPreferencesUpgrade.m index 63046ce6..3c709153 100644 --- a/Source/SPPreferencesUpgrade.m +++ b/Source/SPPreferencesUpgrade.m @@ -325,8 +325,9 @@ void SPApplyRevisionChanges(void) [importantUpdateNotes addObject:NSLocalizedString(@"We've changed Sequel Pro's digital signature for GateKeeper compatibility; you'll have to allow access to your passwords again.", @"Short important release note for why password prompts may occur")]; } - // Display any important release notes, if any - SPShowPostMigrationReleaseNotes(importantUpdateNotes); + // Display any important release notes, if any. Call this after a slight delay to prevent double help + // menus - see http://www.cocoabuilder.com/archive/cocoa/6200-two-help-menus-why.html . + [SPPreferencesUpgrade performSelector:@selector(showPostMigrationReleaseNotes:) withObject:importantUpdateNotes afterDelay:0.1]; [importantUpdateNotes release]; // Update the prefs revision @@ -430,7 +431,7 @@ void SPMigratePreferencesFromPreviousIdentifer(void) /** * Displays important release notes for a new revision. */ -void SPShowPostMigrationReleaseNotes(NSArray *releaseNotes) ++ (void)showPostMigrationReleaseNotes:(NSArray *)releaseNotes { if (![releaseNotes count]) { return; -- cgit v1.2.3