actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Lookup the bundle identifier and the version number at runtime. Simplify logic (slightly).

Browse Source
This commit is contained in:
Steve Checkoway
2005-12-29 11:54:54 +00:00
parent 0e366eef75
commit 8d70bcdbf4
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/ArchHooks/ArchHooks_darwin.cpp
+5 -7
View File
@@ -67,14 +67,14 @@ ArchHooks_darwin::ArchHooks_darwin()
// CF*Copy* functions' return values need to be released, CF*Get* functions' do not. // CF*Copy* functions' return values need to be released, CF*Get* functions' do not.
CFStringRef key = CFSTR( "ApplicationBundlePath" ); CFStringRef key = CFSTR( "ApplicationBundlePath" );
CFStringRef appID = CFSTR( "com." PRODUCT_NAME );
CFStringRef version = CFSTR( PRODUCT_VER );
CFURLRef path = CFBundleCopyBundleURL( CFBundleGetMainBundle() ); CFBundleRef bundle = CFBundleGetMainBundle();
CFStringRef appID = CFBundleGetIdentifier( bundle );
CFStringRef version = CFStringRef( CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey) );
CFURLRef path = CFBundleCopyBundleURL( bundle );
CFPropertyListRef value = CFURLCopyPath( path ); CFPropertyListRef value = CFURLCopyPath( path );
CFPropertyListRef old = CFPreferencesCopyAppValue( key, appID ); CFPropertyListRef old = CFPreferencesCopyAppValue( key, appID );
CFMutableDictionaryRef newDict = NULL; CFMutableDictionaryRef newDict = NULL;
bool changed = false;
if( old && CFGetTypeID(old) != CFDictionaryGetTypeID() ) if( old && CFGetTypeID(old) != CFDictionaryGetTypeID() )
{ {
@@ -87,7 +87,6 @@ ArchHooks_darwin::ArchHooks_darwin()
newDict = CFDictionaryCreateMutable( kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, newDict = CFDictionaryCreateMutable( kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks ); &kCFTypeDictionaryValueCallBacks );
CFDictionaryAddValue( newDict, version, value ); CFDictionaryAddValue( newDict, version, value );
changed = true;
} }
else else
{ {
@@ -99,12 +98,11 @@ ArchHooks_darwin::ArchHooks_darwin()
// The value is either not present or it is but it is different // The value is either not present or it is but it is different
newDict = CFDictionaryCreateMutableCopy( kCFAllocatorDefault, 0, dict ); newDict = CFDictionaryCreateMutableCopy( kCFAllocatorDefault, 0, dict );
CFDictionaryAddValue( newDict, version, value ); CFDictionaryAddValue( newDict, version, value );
changed = true;
} }
CFRelease( old ); CFRelease( old );
} }
if( changed ) if( newDict )
{ {
CFPreferencesSetAppValue( key, newDict, appID ); CFPreferencesSetAppValue( key, newDict, appID );
if( !CFPreferencesAppSynchronize(appID) ) if( !CFPreferencesAppSynchronize(appID) )