Ticket #9462: macosx-updates.patch

File macosx-updates.patch, 1.4 KB (added by fingolfin, 12 years ago)

Patch sparkle code to use CFStringCreateWithCString, too

  • backends/updates/macosx/macosx-updates.mm 

    diff --git a/backends/updates/macosx/macosx-updates.mm b/backends/updates/macosx/macosx-updates.mm
index 741e898..f3b221c 100644
    a b MacOSXUpdateManager::MacOSXUpdateManager() {  
    5959        [sparkleUpdater setFeedURL:[NSURL URLWithString:feedbackURL]];
    6060
    6161        // Get current encoding
    62         NSStringEncoding stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)[NSString stringWithCString:(TransMan.getCurrentCharset()).c_str() encoding:NSASCIIStringEncoding]));
     62        CFStringRef encStr = CFStringCreateWithCString(NULL, TransMan.getCurrentCharset().c_str(), kCFStringEncodingASCII);
     63        CFStringEncoding stringEncoding = CFStringConvertIANACharSetNameToEncoding(encStr);
     64        CFRelease(encStr);
    6365
    6466        // Add "Check for Updates..." menu item
    65         NSMenuItem *updateMenuItem = [applicationMenu insertItemWithTitle:[NSString stringWithCString:_("Check for Updates...") encoding:stringEncoding] action:@selector(checkForUpdates:) keyEquivalent:@"" atIndex:1];
     67        CFStringRef title = CFStringCreateWithCString(NULL, _("Check for Updates..."), stringEncoding);
     68        NSMenuItem *updateMenuItem = [applicationMenu insertItemWithTitle:(NSString *)title action:@selector(checkForUpdates:) keyEquivalent:@"" atIndex:1];
     69        CFRelease(title);
    6670
    6771        // Set the target of the new menu item
    6872        [updateMenuItem setTarget:sparkleUpdater];