# HG changeset patch
# User Ivan Andrus <darthandrus@gmail.com>
# Date 1360706020 25200
# Node ID 3ba836470d253cb3b6826ab10b6231c4aea8143f
# Parent d7923146097712fef8c3d021db6c13618c781d77
Trac 11026: Fixed some warnings
diff --git a/sage/ext/mac-app/AppController.m b/sage/ext/mac-app/AppController.m
a
|
b
|
|
410 | 410 | // If it's lowercased, assume it's the command, but remove ... from the end |
411 | 411 | return [title stringByTrimmingCharactersInSet: |
412 | 412 | [NSCharacterSet characterSetWithCharactersInString: |
413 | | [NSString stringWithFormat:@"%C", 0x2026]]]; // @"…" |
| 413 | [NSString stringWithFormat:@"%C", ((unsigned short)0x2026)]]]; // @"…" |
414 | 414 | } |
415 | 415 | } |
416 | 416 | |
… |
… |
|
442 | 442 | |
443 | 443 | -(NSString*)createPrompt:(NSString*)sessionType forCommand:(NSString*)command{ |
444 | 444 | return [NSString stringWithFormat:@"Going to run sage %@\nPlease enter any arguments, escaped as you would for a shell.\n\nThe command will be run as\n%@ %C", |
445 | | sessionType ? sessionType : @"", command, 0x2026]; |
| 445 | sessionType ? sessionType : @"", command, ((unsigned short)0x2026)]; |
446 | 446 | } |
447 | 447 | |
448 | 448 | -(IBAction)terminalSessionPromptForFile:(id)sender{ |
… |
… |
|
549 | 549 | OSErr err; |
550 | 550 | SInt32 version; |
551 | 551 | if ((err = Gestalt(gestaltSystemVersionMajor, &version)) != noErr) { |
552 | | NSLog(@"Unable to determine gestaltSystemVersionMajor: %ld",err); |
| 552 | NSLog(@"Unable to determine gestaltSystemVersionMajor: %hd",err); |
553 | 553 | return YES; |
554 | 554 | } |
555 | 555 | if ( version < 10 ) return YES; // Of course this should never happen... |
556 | 556 | if ((err = Gestalt(gestaltSystemVersionMinor, &version)) != noErr) { |
557 | | NSLog(@"Unable to determine gestaltSystemVersionMinor: %ld",err); |
| 557 | NSLog(@"Unable to determine gestaltSystemVersionMinor: %hd",err); |
558 | 558 | return YES; |
559 | 559 | } |
560 | 560 | if ( version < 5 ) return YES; |
diff --git a/sage/ext/mac-app/AppDelegate.m b/sage/ext/mac-app/AppDelegate.m
a
|
b
|
|
35 | 35 | if( returnCode != 0 ) { |
36 | 36 | // According to http://www.cocoadev.com/index.pl?TransformProcessType |
37 | 37 | // TransformProcessType is available since 10.3, but doen't work for our case until 10.5 |
38 | | NSLog(@"Could not show Sage.app in the dock. Error %d", returnCode); |
| 38 | NSLog(@"Could not show Sage.app in the dock. Error %ld", returnCode); |
39 | 39 | // It's forbidden to showInDock since it doesn't work |
40 | 40 | [defaults setBool:NO forKey:@"myShowInDock"]; |
41 | 41 | [defaults synchronize]; |
diff --git a/sage/ext/mac-app/Sage-Info.plist b/sage/ext/mac-app/Sage-Info.plist
a
|
b
|
|
129 | 129 | <key>CFBundlePackageType</key> |
130 | 130 | <string>APPL</string> |
131 | 131 | <key>CFBundleShortVersionString</key> |
132 | | <string>SAGE_VERSION</string> |
| 132 | <string>SAGE_VERSION</string> |
133 | 133 | <key>CFBundleSignature</key> |
134 | 134 | <string>????</string> |
135 | 135 | <key>CFBundleURLTypes</key> |