From f554bfe1f673b9abf17668e385f5b51d573f817c Mon Sep 17 00:00:00 2001 From: GRMrGecko Date: Tue, 12 Jan 2010 14:11:52 +0000 Subject: [PATCH] Fixed bug with isAfterTiger, ... and fixed bug with MGMGRContactEmail not being used in MGMContactWindow. --- Classes/Framework/MGMSender.m | 10 ++-- Classes/Framework/MGMSystemInfo.m | 14 ++--- GeckoReporter.xcodeproj/grmrgecko.pbxuser | 44 ++++++++++---- .../grmrgecko.perspectivev3 | 57 ++++++++++--------- 4 files changed, 75 insertions(+), 50 deletions(-) diff --git a/Classes/Framework/MGMSender.m b/Classes/Framework/MGMSender.m index 35f8d88..6213d9f 100644 --- a/Classes/Framework/MGMSender.m +++ b/Classes/Framework/MGMSender.m @@ -296,7 +296,11 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; MGMSystemInfo *sysInfo = [[MGMSystemInfo new] autorelease]; NSString *email = nil, *url = nil, *userEmail = nil, *userName = nil; - if ([userDefaults objectForKey:MGMGRBugsEmail]!=nil && ![[userDefaults objectForKey:MGMGRBugsEmail] isEqualToString:@""]) { + if ([userDefaults objectForKey:MGMGRContactEmail]!=nil && ![[userDefaults objectForKey:MGMGRContactEmail] isEqualToString:@""]) { + email = [userDefaults objectForKey:MGMGRContactEmail]; + } else if ([infoDictionary objectForKey:MGMGRContactEmail]!=nil && ![[infoDictionary objectForKey:MGMGRContactEmail] isEqualToString:@""]) { + email = [infoDictionary objectForKey:MGMGRContactEmail]; + } else if ([userDefaults objectForKey:MGMGRBugsEmail]!=nil && ![[userDefaults objectForKey:MGMGRBugsEmail] isEqualToString:@""]) { email = [userDefaults objectForKey:MGMGRBugsEmail]; } else if ([infoDictionary objectForKey:MGMGRBugsEmail]!=nil && ![[infoDictionary objectForKey:MGMGRBugsEmail] isEqualToString:@""]) { email = [infoDictionary objectForKey:MGMGRBugsEmail]; @@ -304,10 +308,6 @@ NSString * const MGMGRLogFiles = @"MGMGRLogFiles"; email = [userDefaults objectForKey:MGMGRCrashEmail]; } else if ([infoDictionary objectForKey:MGMGRCrashEmail]!=nil && ![[infoDictionary objectForKey:MGMGRCrashEmail] isEqualToString:@""]) { email = [infoDictionary objectForKey:MGMGRCrashEmail]; - } else if ([userDefaults objectForKey:MGMGRContactEmail]!=nil && ![[userDefaults objectForKey:MGMGRContactEmail] isEqualToString:@""]) { - email = [userDefaults objectForKey:MGMGRContactEmail]; - } else if ([infoDictionary objectForKey:MGMGRContactEmail]!=nil && ![[infoDictionary objectForKey:MGMGRContactEmail] isEqualToString:@""]) { - email = [infoDictionary objectForKey:MGMGRContactEmail]; } else { email = MGMDefaultBugsEmail; } diff --git a/Classes/Framework/MGMSystemInfo.m b/Classes/Framework/MGMSystemInfo.m index 92731bb..38a301e 100644 --- a/Classes/Framework/MGMSystemInfo.m +++ b/Classes/Framework/MGMSystemInfo.m @@ -206,7 +206,7 @@ NSString * const MGMModel = @"hw.model"; - (BOOL)isAfterCheetah { if ([self OSMajorVersion]==10) { int minorVersion = [self OSMinorVersion]; - return (minorVersion=>0); + return (minorVersion>=0); } return NO; } @@ -214,7 +214,7 @@ NSString * const MGMModel = @"hw.model"; - (BOOL)isAfterPuma { if ([self OSMajorVersion]==10) { int minorVersion = [self OSMinorVersion]; - return (minorVersion=>1); + return (minorVersion>=1); } return NO; } @@ -222,7 +222,7 @@ NSString * const MGMModel = @"hw.model"; - (BOOL)isAfterJaguar { if ([self OSMajorVersion]==10) { int minorVersion = [self OSMinorVersion]; - return (minorVersion=>2); + return (minorVersion>=2); } return NO; } @@ -230,7 +230,7 @@ NSString * const MGMModel = @"hw.model"; - (BOOL)isAfterPanther { if ([self OSMajorVersion]==10) { int minorVersion = [self OSMinorVersion]; - return (minorVersion=>3); + return (minorVersion>=3); } return NO; } @@ -238,7 +238,7 @@ NSString * const MGMModel = @"hw.model"; - (BOOL)isAfterTiger { if ([self OSMajorVersion]==10) { int minorVersion = [self OSMinorVersion]; - return (minorVersion=>4); + return (minorVersion>=4); } return NO; } @@ -246,7 +246,7 @@ NSString * const MGMModel = @"hw.model"; - (BOOL)isAfterLeopard { if ([self OSMajorVersion]==10) { int minorVersion = [self OSMinorVersion]; - return (minorVersion=>5); + return (minorVersion>=5); } return NO; } @@ -254,7 +254,7 @@ NSString * const MGMModel = @"hw.model"; - (BOOL)isAfterSnowLeopard { if ([self OSMajorVersion]==10) { int minorVersion = [self OSMinorVersion]; - return (minorVersion=>6); + return (minorVersion>=6); } return NO; } diff --git a/GeckoReporter.xcodeproj/grmrgecko.pbxuser b/GeckoReporter.xcodeproj/grmrgecko.pbxuser index bda9e42..1c1534e 100644 --- a/GeckoReporter.xcodeproj/grmrgecko.pbxuser +++ b/GeckoReporter.xcodeproj/grmrgecko.pbxuser @@ -136,10 +136,12 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 284996359; - PBXWorkspaceStateSaveDate = 284996359; + PBXPerProjectTemplateStateSaveDate = 284998280; + PBXWorkspaceStateSaveDate = 284998280; }; perUserProjectItems = { + 2A5B7B1010FCBA8B00051C18 /* PBXTextBookmark */ = 2A5B7B1010FCBA8B00051C18 /* PBXTextBookmark */; + 2A5B7B1C10FCBA9500051C18 /* PBXTextBookmark */ = 2A5B7B1C10FCBA9500051C18 /* PBXTextBookmark */; 2A85029A10F05D6B00CA1273 /* PBXTextBookmark */ = 2A85029A10F05D6B00CA1273 /* PBXTextBookmark */; }; sourceControlManager = 2A478DA110E8456500EBC4A9 /* Source Control */; @@ -160,6 +162,26 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; + 2A5B7B1010FCBA8B00051C18 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2AC8694C10EE8062000743D2 /* MGMReporter.m */; + name = "MGMReporter.m: 28"; + rLen = 0; + rLoc = 835; + rType = 0; + vrLen = 785; + vrLoc = 442; + }; + 2A5B7B1C10FCBA9500051C18 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 2AC8694C10EE8062000743D2 /* MGMReporter.m */; + name = "MGMReporter.m: 28"; + rLen = 0; + rLoc = 835; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; 2A85014210EFA6A700CA1273 /* MGMFeedback.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1176, 646}}"; @@ -296,9 +318,9 @@ }; 2AC8694C10EE8062000743D2 /* MGMReporter.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1176, 1352}}"; - sepNavSelRange = "{791, 0}"; - sepNavVisRange = "{0, 2162}"; + sepNavIntBoundsRect = "{{0, 0}, {1219, 1365}}"; + sepNavSelRange = "{835, 0}"; + sepNavVisRange = "{442, 785}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; @@ -336,9 +358,9 @@ }; 2AC8695210EE8062000743D2 /* MGMSystemInfo.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1176, 4030}}"; - sepNavSelRange = "{4846, 914}"; - sepNavVisRange = "{4169, 1117}"; + sepNavIntBoundsRect = "{{0, 0}, {1176, 4277}}"; + sepNavSelRange = "{5446, 12}"; + sepNavVisRange = "{4820, 911}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; @@ -474,9 +496,9 @@ }; 2AC86CF010EEC54C000743D2 /* MGMSender.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1209, 5083}}"; - sepNavSelRange = "{19655, 0}"; - sepNavVisRange = "{18391, 2142}"; + sepNavIntBoundsRect = "{{0, 0}, {1209, 4875}}"; + sepNavSelRange = "{16252, 0}"; + sepNavVisRange = "{14265, 3068}"; sepNavWindowFrame = "{{15, 4}, {1235, 774}}"; }; }; diff --git a/GeckoReporter.xcodeproj/grmrgecko.perspectivev3 b/GeckoReporter.xcodeproj/grmrgecko.perspectivev3 index a4686d5..67970a8 100644 --- a/GeckoReporter.xcodeproj/grmrgecko.perspectivev3 +++ b/GeckoReporter.xcodeproj/grmrgecko.perspectivev3 @@ -287,14 +287,14 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 18 - 2 - 1 + 39 + 37 + 28 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {185, 660}} + {{0, 107}, {185, 660}} PBXTopSmartGroupGIDs @@ -327,7 +327,7 @@ PBXProjectModuleGUID 2A478DDD10E8598900EBC4A9 PBXProjectModuleLabel - + MGMReporter.m PBXSplitModuleInNavigatorKey Split0 @@ -335,10 +335,15 @@ PBXProjectModuleGUID 2A478DDE10E8598900EBC4A9 PBXProjectModuleLabel - + MGMReporter.m + _historyCapacity + 0 + bookmark + 2A5B7B1C10FCBA9500051C18 history 2A85029A10F05D6B00CA1273 + 2A5B7B1010FCBA8B00051C18 SplitCount @@ -482,11 +487,11 @@ TableOfContents - 2A5B7AC810FCB63600051C18 + 2A5B7B1310FCBA9400051C18 1CA23ED40692098700951B8B - 2A5B7AC910FCB63600051C18 + 2A5B7B1410FCBA9400051C18 2A478DDD10E8598900EBC4A9 - 2A5B7ACA10FCB63600051C18 + 2A5B7B1510FCBA9400051C18 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -539,12 +544,12 @@ GeometryConfiguration Frame - {{0, 0}, {1280, 202}} + {{0, 0}, {1280, 187}} Module PBXDebugCLIModule Proportion - 202pt + 187pt ContentConfiguration @@ -563,8 +568,8 @@ yes sizes - {{0, 0}, {625, 229}} - {{625, 0}, {655, 229}} + {{0, 0}, {625, 237}} + {{625, 0}, {655, 237}} VerticalSplitView @@ -579,8 +584,8 @@ yes sizes - {{0, 0}, {1280, 229}} - {{0, 229}, {1280, 242}} + {{0, 0}, {1280, 237}} + {{0, 237}, {1280, 249}} @@ -600,7 +605,7 @@ DebugSTDIOWindowFrame {{200, 200}, {500, 300}} Frame - {{0, 207}, {1280, 471}} + {{0, 192}, {1280, 486}} PBXDebugSessionStackFrameViewKey DebugVariablesTableConfiguration @@ -613,13 +618,13 @@ 425 Frame - {{625, 0}, {655, 229}} + {{625, 0}, {655, 237}} Module PBXDebugSessionModule Proportion - 471pt + 486pt Name @@ -637,14 +642,14 @@ TableOfContents - 2A5B7ACB10FCB63600051C18 + 2A5B7B1610FCBA9400051C18 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - 2A5B7ACC10FCB63600051C18 - 2A5B7ACD10FCB63600051C18 - 2A5B7ACE10FCB63600051C18 - 2A5B7ACF10FCB63600051C18 - 2A5B7AB710FCB54600051C18 + 2A5B7B1710FCBA9400051C18 + 2A5B7B1810FCBA9400051C18 + 2A5B7B1910FCBA9400051C18 + 2A5B7B1A10FCBA9400051C18 + 2A478DDD10E8598900EBC4A9 ToolbarConfigUserDefaultsMinorVersion 2 @@ -678,9 +683,7 @@ 5 WindowOrderList - 2A478EAD10E881CF00EBC4A9 - 2A5B7AD310FCB63600051C18 - 2A5B7AD410FCB63600051C18 + 2A5B7B1B10FCBA9400051C18 /Development/James' Applications/GeckoReporter/GeckoReporter.xcodeproj WindowString