X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/9d8dbcc95c9e3ea959f034d5ddb2edcc71fe1f59..0a481b1f1afeda7c270362348b129fb6427117f9:/MTBlingController.m diff --git a/MTBlingController.m b/MTBlingController.m index bc20477..7541747 100755 --- a/MTBlingController.m +++ b/MTBlingController.m @@ -8,6 +8,7 @@ #import "MTBlingController.h" #import "MTeSerialNumber.h" +#import "MainController.h" #define APP_SUPPORT_PATH_STRING [@"~/Library/Application Support/MenuTunes/" stringByExpandingTildeInPath] #define LICENSE_PATH_STRING [APP_SUPPORT_PATH_STRING stringByAppendingString:@"/.license"] @@ -49,7 +50,7 @@ [window center]; [window makeKeyAndOrderFront:nil]; - [window setLevel:NSStatusWindowLevel]; +// [window setLevel:NSStatusWindowLevel]; } - (void)showPanelIfNeeded @@ -82,7 +83,7 @@ name:o extra:nil publisher:@"04611"] autorelease]; - if ( [s isValid] == ITeSerialNumberIsValid && ( [[s infoDictionary] objectForKey:@"appIdentifier"] == @"MT" ) ) { + if ( ([s isValid] == ITeSerialNumberIsValid) && ( [[[s infoDictionary] objectForKey:@"appIdentifier"] isEqualToString:@"MT"] ) ) { NSFileManager *fm = [NSFileManager defaultManager]; @@ -115,7 +116,7 @@ nil, nil, nil, NSLocalizedString(@"failed_msg", @"Failed Message")); } - + [[MainController sharedController] blingTime]; } - (int)checkKeyFile @@ -124,7 +125,7 @@ MTeSerialNumber *k = [[[MTeSerialNumber alloc] initWithContentsOfFile:p extra:@"" publisher:@"04611"] autorelease]; - if ( k && [k isValid] == ITeSerialNumberIsValid && ( [[k infoDictionary] objectForKey:@"appIdentifier"] == @"MT" )) { + if ( k && ([k isValid] == ITeSerialNumberIsValid) && ( [[[k infoDictionary] objectForKey:@"appIdentifier"] isEqualToString:@"MT"] )) { return 7465; } else { [[NSFileManager defaultManager] removeFileAtPath:p handler:nil]; @@ -135,6 +136,13 @@ - (int)checkDone { + if ( ! (checkDone == 2475) ) { + if ( ! ([self checkKeyFile] == 7465) ) { + checkDone = 0; + } else { + checkDone = 2475; + } + } return checkDone; }