Changeset 3764

Show
Ignore:
Timestamp:
10/15/07 09:38:40 (9 months ago)
Author:
timothy
Message:

Fix some things from my last commit.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Frameworks/Acid/jabber/JabberSocket.m

    r3755 r3764  
    107107 
    108108                NSMutableDictionary *settings = [[NSMutableDictionary allocWithZone:nil] init]; 
    109                 [settings setObject:[NSNumber numberWithBool:YES] forKey:@"kCFStreamSSLAllowsAnyRoot"]; 
     109                [settings setObject:[NSNumber numberWithBool:YES] forKey:(NSString *)kCFStreamSSLAllowsAnyRoot]; 
    110110 
    111                 CFReadStreamSetProperty( [sock getCFReadStream], CFSTR("kCFStreamPropertySSLSettings"), (CFDictionaryRef) settings ); 
    112                 CFWriteStreamSetProperty( [sock getCFWriteStream], CFSTR("kCFStreamPropertySSLSettings"), (CFDictionaryRef) settings ); 
     111                CFReadStreamSetProperty( [sock getCFReadStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings ); 
     112                CFWriteStreamSetProperty( [sock getCFWriteStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings ); 
    113113        } 
    114114 

  • trunk/Panels/JVChatTranscriptPanel.m

    r3763 r3764  
    726726                                [[MVFileTransferController defaultController] downloadFileAtURL:url toLocalFile:nil]; 
    727727                        } else { 
    728                                 [[NSWorkspace sharedWorkspace] openURLs:[NSArray arrayWithObject:url] withAppBundleIdentifier:nil options:NSWorkspaceLaunchWithoutActivation additionalEventParamDescriptor:nil launchIdentifiers:nil]; 
     728                                NSWorkspaceLaunchOptions options = ( [[actionInformation objectForKey:WebActionModifierFlagsKey] unsignedIntValue] & NSCommandKeyMask ? NSWorkspaceLaunchWithoutActivation : 0 ); 
     729                                [[NSWorkspace sharedWorkspace] openURLs:[NSArray arrayWithObject:url] withAppBundleIdentifier:nil options:options additionalEventParamDescriptor:nil launchIdentifiers:nil]; 
    729730                        } 
    730731                }