rtc, fixes for Mavericks

JeffryBooher · JeffryBooher · commit 2452e1d518f9 · 2014-10-21T14:36:34.000-07:00
diff --git a/appshell/cefclient_mac.mm b/appshell/cefclient_mac.mm
@@ -222,9 +222,9 @@ -(void)windowTitleDidChange:(NSString*)title {
 }
 
 -(BOOL)isRunningOnYosemite {
-    // this API returns nil prior to Yosemite
-    NSDictionary * dict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
-    return dict != nil;
+    NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
+    NSString* version =  [dict objectForKey:@"ProductVersion"];
+    return [version hasPrefix:@"10.10"];
 }
 
 - (BOOL)isFullScreenSupported {
diff --git a/appshell/client_handler_mac.mm b/appshell/client_handler_mac.mm
@@ -166,9 +166,9 @@ - (void)setIsReallyClosing {
 }
 
 -(BOOL)isRunningOnYosemite {
-    // this API returns nil prior to Yosemite
-    NSDictionary * dict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
-    return dict != nil;
+    NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
+    NSString* version =  [dict objectForKey:@"ProductVersion"];
+    return [version hasPrefix:@"10.10"];
 }
 
 - (BOOL)isFullScreenSupported {

Original file line number	Diff line number	Diff line change
`@@ -222,9 +222,9 @@ -(void)windowTitleDidChange:(NSString*)title {`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`-(BOOL)isRunningOnYosemite {`
`225`		`- // this API returns nil prior to Yosemite`
`226`		`- NSDictionary * dict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];`
`227`		`- return dict != nil;`
	`225`	`+ NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];`
	`226`	`+ NSString* version = [dict objectForKey:@"ProductVersion"];`
	`227`	`+ return [version hasPrefix:@"10.10"];`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`- (BOOL)isFullScreenSupported {`
Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,9 @@ - (void)setIsReallyClosing {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`-(BOOL)isRunningOnYosemite {`
`169`		`- // this API returns nil prior to Yosemite`
`170`		`- NSDictionary * dict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];`
`171`		`- return dict != nil;`
	`169`	`+ NSDictionary* dict = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];`
	`170`	`+ NSString* version = [dict objectForKey:@"ProductVersion"];`
	`171`	`+ return [version hasPrefix:@"10.10"];`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`- (BOOL)isFullScreenSupported {`