Ticket #11026: trac_11026-warnings.patch

File trac_11026-warnings.patch, 3.0 KB (added by iandrus, 9 years ago)
  • sage/ext/mac-app/AppController.m

    # 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  
    410410        // If it's lowercased, assume it's the command, but remove ... from the end
    411411        return [title stringByTrimmingCharactersInSet:
    412412                [NSCharacterSet characterSetWithCharactersInString:
    413                  [NSString stringWithFormat:@"%C", 0x2026]]]; // @"…"
     413                 [NSString stringWithFormat:@"%C", ((unsigned short)0x2026)]]]; // @"…"
    414414    }
    415415}
    416416
     
    442442
    443443-(NSString*)createPrompt:(NSString*)sessionType forCommand:(NSString*)command{
    444444    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)];
    446446}
    447447
    448448-(IBAction)terminalSessionPromptForFile:(id)sender{
     
    549549    OSErr err;
    550550    SInt32 version;
    551551    if ((err = Gestalt(gestaltSystemVersionMajor, &version)) != noErr) {
    552         NSLog(@"Unable to determine gestaltSystemVersionMajor: %ld",err);
     552        NSLog(@"Unable to determine gestaltSystemVersionMajor: %hd",err);
    553553        return YES;
    554554    }
    555555    if ( version < 10 ) return YES; // Of course this should never happen...
    556556    if ((err = Gestalt(gestaltSystemVersionMinor, &version)) != noErr) {
    557         NSLog(@"Unable to determine gestaltSystemVersionMinor: %ld",err);
     557        NSLog(@"Unable to determine gestaltSystemVersionMinor: %hd",err);
    558558        return YES;
    559559    }
    560560    if ( version < 5 )  return YES;
  • sage/ext/mac-app/AppDelegate.m

    diff --git a/sage/ext/mac-app/AppDelegate.m b/sage/ext/mac-app/AppDelegate.m
    a b  
    3535        if( returnCode != 0 ) {
    3636            // According to http://www.cocoadev.com/index.pl?TransformProcessType
    3737            // 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);
    3939            // It's forbidden to showInDock since it doesn't work
    4040            [defaults setBool:NO forKey:@"myShowInDock"];
    4141            [defaults synchronize];
  • sage/ext/mac-app/Sage-Info.plist

    diff --git a/sage/ext/mac-app/Sage-Info.plist b/sage/ext/mac-app/Sage-Info.plist
    a b  
    129129        <key>CFBundlePackageType</key>
    130130        <string>APPL</string>
    131131        <key>CFBundleShortVersionString</key>
    132         <string>SAGE_VERSION</string>
     132        <string>SAGE_VERSION</string>
    133133        <key>CFBundleSignature</key>
    134134        <string>????</string>
    135135        <key>CFBundleURLTypes</key>