Navigation

← Previous Changeset
Next Changeset →

Changeset 3763

Timestamp:

10/15/07 09:32:28 (1 year ago)

Author:

timothy

Message:

Rip out 10.3.9 support and worarounds. Mac OS 10.4 is now required.

Files:

trunk/Additions/NSAttributedStringAdditions.m (modified) (1 diff)
trunk/Basic.pch (modified) (1 diff)
trunk/Chat Core/MVDirectClientConnection.m (modified) (3 diffs)
trunk/Chat Core/MVICBChatConnection.m (modified) (3 diffs)
trunk/Chat Core/MVIRCChatConnection.m (modified) (5 diffs)
trunk/Chat Core/MVSILCChatConnection.m (modified) (2 diffs)
trunk/Colloquy.pch (modified) (1 diff)
trunk/Colloquy.xcodeproj/project.pbxproj (modified) (3 diffs)
trunk/Controllers/JVChatRoomBrowser.m (modified) (2 diffs)
trunk/Controllers/JVPreferencesController.m (modified) (2 diffs)
trunk/Controllers/MVApplicationController.m (modified) (1 diff)
trunk/Controllers/MVConnectionsController.m (modified) (1 diff)
trunk/Controllers/MVCrashCatcher.m (modified) (1 diff)
trunk/Inspectors/JVChatRoomInspector.m (modified) (3 diffs)
trunk/Models/JVEmoticonSet.m (modified) (1 diff)
trunk/Models/JVSQLChatTranscript.m (modified) (1 diff)
trunk/Models/JVStyle.m (modified) (2 diffs)
trunk/Panels/JVChatRoomMember.m (modified) (6 diffs)
trunk/Panels/JVChatTranscriptPanel.m (modified) (2 diffs)
trunk/Plug-Ins/JavaScript Support/JVJavaScriptChatPlugin.m (modified) (1 diff)
trunk/Preferences/JVAppearancePreferences.m (modified) (2 diffs)
trunk/Resources/Info.plist (modified) (1 diff)
trunk/Settings/Common Settings.xcconfig (modified) (2 diffs)
trunk/Views/JVStyleView.m (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/Additions/NSAttributedStringAdditions.m

r3755	r3763
105	105	NSParameterAssert( fragment != nil );
106	106
107		NSMutableDictionary *options = [[NSMutableDictionary allocWithZone:nil] initWithObjectsAndKeys:[NSNumber numberWith~~Int:1], @"UseWebKit", [NSNumber numberWithUnsignedInt:NSUTF8StringEncoding], @"CharacterEncoding"~~, nil];
108		if( url ) [options setObject:url forKey:~~@"BaseURL"~~];
	107	NSMutableDictionary *options = [[NSMutableDictionary allocWithZone:nil] initWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:NSUTF8StringEncoding], NSCharacterEncodingDocumentOption, nil];
	108	if( url ) [options setObject:url forKey:NSBaseURLDocumentOption];
109	109
110	110	// we suround the fragment in the #01FE02 green color so we can later key it out and strip it

trunk/Basic.pch

r3755	r3763
1	1	#ifndef MAC_OS_X_VERSION_10_5
2	2	#define MAC_OS_X_VERSION_10_5 1050
3		~~#endif~~
4
5		~~#ifndef NSAppKitVersionNumber10_3~~
6		~~#define NSAppKitVersionNumber10_3 743~~
7	3	#endif
8	4

trunk/Chat Core/MVDirectClientConnection.m

r3755	r3763
349	349	[_threadWaitLock unlockWithCondition:1];
350	350
351		if( [pool respondsToSelector:@selector( drain )] )
352		[pool drain];
353		else [pool release];
	351	[pool drain];
354	352	pool = nil;
355	353
…	…
366	364	[timeout release];
367	365
368		if( [pool respondsToSelector:@selector( drain )] )
369		[pool drain];
370		else [pool release];
	366	[pool drain];
371	367	}
372	368
…	…
382	378	[self release];
383	379
384		if( [pool respondsToSelector:@selector( drain )] )
385		[pool drain];
386		else [pool release];
	380	[pool drain];
387	381	}
388	382	@end

trunk/Chat Core/MVICBChatConnection.m

r3755	r3763
409	409	[_threadWaitLock unlockWithCondition:1];
410	410
411		if( [pool respondsToSelector:@selector( drain )] )
412		[pool drain];
413		else [pool release];
	411	[pool drain];
414	412	pool = nil;
415	413
…	…
421	419	runMode:NSDefaultRunLoopMode
422	420	beforeDate:[NSDate dateWithTimeIntervalSinceNow:5.]];
423		if( [pool respondsToSelector:@selector( drain )] )
424		[pool drain];
425		else [pool release];
	421	[pool drain];
426	422	}
427	423
…	…
437	433	_connectionThread = nil;
438	434
439		if( [pool respondsToSelector:@selector( drain )] )
440		[pool drain];
441		else [pool release];
	435	[pool drain];
442	436	}
443	437

trunk/Chat Core/MVIRCChatConnection.m

r3755	r3763
565	565	[_threadWaitLock unlockWithCondition:1];
566	566
567		if( [pool respondsToSelector:@selector( drain )] )
568		[pool drain];
569		else [pool release];
	567	[pool drain];
570	568	pool = nil;
571	569
…	…
573	571	pool = [[NSAutoreleasePool allocWithZone:nil] init];
574	572	[[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:5.]];
575		if( [pool respondsToSelector:@selector( drain )] )
576		[pool drain];
577		else [pool release];
	573	[pool drain];
578	574	}
579	575
…	…
586	582	_connectionThread = nil;
587	583
588		if( [pool respondsToSelector:@selector( drain )] )
589		[pool drain];
590		else [pool release];
	584	[pool drain];
591	585	}
592	586
…	…
649	643
650	644	NSMutableDictionary *settings = [[NSMutableDictionary allocWithZone:nil] init];
651		[settings setObject:[NSNumber numberWithBool:YES] forKey:~~@"kCFStreamSSLAllowsAnyRoot"~~];
652
653		CFReadStreamSetProperty( [sock getCFReadStream], ~~CFSTR("kCFStreamPropertySSLSettings")~~, (CFDictionaryRef) settings );
654		CFWriteStreamSetProperty( [sock getCFWriteStream], ~~CFSTR("kCFStreamPropertySSLSettings")~~, (CFDictionaryRef) settings );
	645	[settings setObject:[NSNumber numberWithBool:YES] forKey:(NSString *)kCFStreamSSLAllowsAnyRoot];
	646
	647	CFReadStreamSetProperty( [sock getCFReadStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings );
	648	CFWriteStreamSetProperty( [sock getCFWriteStream], kCFStreamPropertySSLSettings, (CFDictionaryRef) settings );
655	649	}
656	650
…	…
2527	2521	}
2528	2522
2529		if( [pool respondsToSelector:@selector( drain )] )
2530		[pool drain];
2531		[pool release];
	2523	[pool drain];
2532	2524	}
2533	2525	}

trunk/Chat Core/MVSILCChatConnection.m

r3755	r3763
1452	1452	[[NSThread currentThread] setName:[[self url] absoluteString]];
1453	1453
1454		if( [pool respondsToSelector:@selector( drain )] )
1455		[pool drain];
1456		else [pool release];
	1454	[pool drain];
1457	1455	pool = nil;
1458	1456
…	…
1460	1458	pool = [[NSAutoreleasePool allocWithZone:nil] init];
1461	1459	silc_schedule_one( _silcClient -> schedule, -1 );
1462		if( [pool respondsToSelector:@selector( drain )] )
1463		[pool drain];
1464		else [pool release];
	1460	[pool drain];
1465	1461	}
1466	1462	}

trunk/Colloquy.pch

r3757	r3763
1	1	#ifndef MAC_OS_X_VERSION_10_5
2	2	#define MAC_OS_X_VERSION_10_5 1050
3		~~#endif~~
4
5		~~#ifndef NSAppKitVersionNumber10_3~~
6		~~#define NSAppKitVersionNumber10_3 743~~
7	3	#endif
8	4

trunk/Colloquy.xcodeproj/project.pbxproj

r3762	r3763
3067	3067	"-lxslt",
3068	3068	"-lexslt",
3069		~~"-undefined",~~
3070		~~dynamic_lookup,~~
3071	3069	);
3072	3070	PRODUCT_NAME = Colloquy;
…	…
3096	3094	"-lxslt",
3097	3095	"-lexslt",
3098		~~"-undefined",~~
3099		~~dynamic_lookup,~~
3100	3096	);
3101	3097	PRODUCT_NAME = Colloquy;
…	…
3185	3181	"-lxslt",
3186	3182	"-lexslt",
3187		~~"-undefined",~~
3188		~~dynamic_lookup,~~
3189	3183	);
3190	3184	PRODUCT_NAME = Colloquy;

trunk/Controllers/JVChatRoomBrowser.m

r3460	r3763
105	105	[self _refreshResults:nil];
106	106
107		if( [[self window] respondsToSelector:@selector( recalculateKeyViewLoop )] )
108		[[self window] recalculateKeyViewLoop];
	107	[[self window] recalculateKeyViewLoop];
109	108
110	109	if( [connectionPopup indexOfSelectedItem] != -1 )
…	…
220	219	[self _refreshResults:nil];
221	220
222		if( [[self window] respondsToSelector:@selector( recalculateKeyViewLoop )] )
223		[[self window] recalculateKeyViewLoop];
	221	[[self window] recalculateKeyViewLoop];
224	222	}
225	223

trunk/Controllers/JVPreferencesController.m

r3418	r3763
29	29	if( [_preferencesPanel respondsToSelector:@selector( _setContentHasShadow: )] )
30	30	[_preferencesPanel _setContentHasShadow:NO]; // this is new in Tiger
31		if( [_preferencesPanel respondsToSelector:@selector( setShowsToolbarButton: )] )
32		[_preferencesPanel setShowsToolbarButton:NO];
	31	[_preferencesPanel setShowsToolbarButton:NO];
33	32	}
34	33
…	…
38	37	if( [_preferencesPanel respondsToSelector:@selector( _setContentHasShadow: )] )
39	38	[_preferencesPanel _setContentHasShadow:NO]; // this is new in Tiger
40		if( [_preferencesPanel respondsToSelector:@selector( setShowsToolbarButton: )] )
41		[_preferencesPanel setShowsToolbarButton:NO];
	39	[_preferencesPanel setShowsToolbarButton:NO];
42	40	}
43	41	@end

trunk/Controllers/MVApplicationController.m

r3757	r3763
309	309	NSAppleEventManager *sam = [NSAppleEventManager sharedAppleEventManager];
310	310	NSAppleEventDescriptor *lastEvent = [sam currentAppleEvent];
311		searchString = [[lastEvent descriptorForKeyword:~~'stxt'~~] stringValue];
	311	searchString = [[lastEvent descriptorForKeyword:keyAESearchText] stringValue];
312	312
313	313	JVChatTranscriptPanel *transcript = [[JVChatController defaultController] chatViewControllerForTranscript:filename];

trunk/Controllers/MVConnectionsController.m

r3753	r3763
335	335	[openConnection setFrame:newWindowFrame display:YES animate:YES];
336	336	if( [sender state] ) [detailsTabView selectTabViewItemAtIndex:1];
337		if( [openConnection respondsToSelector:@selector( recalculateKeyViewLoop )] )
338		[openConnection recalculateKeyViewLoop];
	337	[openConnection recalculateKeyViewLoop];
339	338	}
340	339

trunk/Controllers/MVCrashCatcher.m

r3617	r3763
34	34
35	35	- (void) awakeFromNib {
36		NSString *logContent = nil;
37		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
38		logContent = [NSString performSelector:@selector( stringWithContentsOfFile: ) withObject:logPath];
39		else logContent = [NSString stringWithContentsOfFile:logPath encoding:NSUTF8StringEncoding error:NULL];
	36	NSString *logContent = [NSString stringWithContentsOfFile:logPath encoding:NSUTF8StringEncoding error:NULL];
40	37
41	38	// get only the last crash trace, there is hardly ever more than one since we delete the file. it can still happen

trunk/Inspectors/JVChatRoomInspector.m

r3755	r3763
86	86	[nameField setStringValue:[_room title]];
87	87
88		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) {
89		[saveTopic setBezelStyle:NSShadowlessSquareBezelStyle];
90		[resetTopic setBezelStyle:NSShadowlessSquareBezelStyle];
91
92		NSString *dateFormat = [[NSUserDefaults standardUserDefaults] objectForKey:NSShortTimeDateFormatString];
93		NSDictionary *locale = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
94		if( [[_room target] isJoined] )
95		[infoField setObjectValue:[NSString stringWithFormat:NSLocalizedString( @"Joined: %@", "chat room joined date label" ), [[[_room target] dateJoined] descriptionWithCalendarFormat:dateFormat timeZone:nil locale:locale]]];
96		else [infoField setObjectValue:[NSString stringWithFormat:NSLocalizedString( @"Parted: %@", "chat room parted date label" ), [[[_room target] dateParted] descriptionWithCalendarFormat:dateFormat timeZone:nil locale:locale]]];
97		} else {
98		NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease];
99		[formatter setFormatterBehavior:1040];
100		[formatter setDateStyle:kCFDateFormatterShortStyle];
101		[formatter setTimeStyle:kCFDateFormatterShortStyle];
102
103		if( [[_room target] isJoined] )
104		[infoField setObjectValue:[NSString stringWithFormat:NSLocalizedString( @"Joined: %@", "chat room joined date label" ), [formatter stringFromDate:[[_room target] dateJoined]]]];
105		else [infoField setObjectValue:[NSString stringWithFormat:NSLocalizedString( @"Parted: %@", "chat room parted date label" ), [formatter stringFromDate:[[_room target] dateParted]]]];
106		}
	88	NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease];
	89	[formatter setFormatterBehavior:NSDateFormatterBehavior10_4];
	90	[formatter setDateStyle:NSDateFormatterShortStyle];
	91	[formatter setTimeStyle:NSDateFormatterShortStyle];
	92
	93	if( [[_room target] isJoined] )
	94	[infoField setObjectValue:[NSString stringWithFormat:NSLocalizedString( @"Joined: %@", "chat room joined date label" ), [formatter stringFromDate:[[_room target] dateJoined]]]];
	95	else [infoField setObjectValue:[NSString stringWithFormat:NSLocalizedString( @"Parted: %@", "chat room parted date label" ), [formatter stringFromDate:[[_room target] dateParted]]]];
107	96
108	97	[encodingSelection setMenu:[_room _encodingMenu]];
…	…
260	249	if ( [[column identifier] isEqualToString:@"author"] ) {
261	250	MVChatUser *user = [_latestBanList objectAtIndex:row];
262		if( [user respondsToSelector:@selector( attributeForKey: )] ) {
	251	if( [user respondsToSelector:@selector( attributeForKey: )] )
263	252	return [user attributeForKey:MVChatUserBanServerAttribute];
264		}
265	253	return nil;
266	254	}
…	…
273	261	NSString *dateString = nil;
274	262
275		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) {
276		NSString *dateFormat = [[NSUserDefaults standardUserDefaults] objectForKey:NSShortTimeDateFormatString];
277		NSDictionary *locale = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
278		dateString = [date descriptionWithCalendarFormat:dateFormat timeZone:nil locale:locale];
279		} else {
280		NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease];
281		[formatter setFormatterBehavior:1040];
282		[formatter setDateStyle:kCFDateFormatterShortStyle];
283		[formatter setTimeStyle:kCFDateFormatterShortStyle];
284		dateString = [formatter stringFromDate:date];
285		}
	263	NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease];
	264	[formatter setFormatterBehavior:NSDateFormatterBehavior10_4];
	265	[formatter setDateStyle:NSDateFormatterShortStyle];
	266	[formatter setTimeStyle:NSDateFormatterShortStyle];
	267	dateString = [formatter stringFromDate:date];
286	268
287	269	NSString *server = [user attributeForKey:MVChatUserBanServerAttribute];

trunk/Models/JVEmoticonSet.m

r3615	r3763
244	244
245	245	- (NSString *) contentsOfStyleSheet {
246		NSString *contents = nil;
247		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
248		contents = [NSString performSelector:@selector( stringWithContentsOfURL: ) withObject:[self styleSheetLocation]];
249		else contents = [NSString stringWithContentsOfURL:[self styleSheetLocation] encoding:NSUTF8StringEncoding error:NULL];
	246	NSString *contents = [NSString stringWithContentsOfURL:[self styleSheetLocation] encoding:NSUTF8StringEncoding error:NULL];
250	247	return ( contents ? contents : @"" );
251	248	}

trunk/Models/JVSQLChatTranscript.m

r3638	r3763
611	611
612	612	- (BOOL) _initializeDatabase {
613		NSString *setup = nil;
614		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
615		setup = [NSString performSelector:@selector( stringWithContentsOfFile: ) withObject:[[NSBundle mainBundle] pathForResource:@"transcriptSchema" ofType:@"sql"]];
616		else setup = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"transcriptSchema" ofType:@"sql"] encoding:NSUTF8StringEncoding error:NULL];
	613	NSString *setup = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"transcriptSchema" ofType:@"sql"] encoding:NSUTF8StringEncoding error:NULL];
617	614
618	615	@synchronized( self ) {

trunk/Models/JVStyle.m

r3695	r3763
494	494
495	495	- (NSString *) contentsOfMainStyleSheet {
496		NSString *contents = nil;
497		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
498		contents = [NSString performSelector:@selector( stringWithContentsOfURL: ) withObject:[self mainStyleSheetLocation]];
499		else contents = [NSString stringWithContentsOfURL:[self mainStyleSheetLocation] encoding:NSUTF8StringEncoding error:NULL];
	496	NSString *contents = [NSString stringWithContentsOfURL:[self mainStyleSheetLocation] encoding:NSUTF8StringEncoding error:NULL];
500	497	return ( contents ? contents : @"" );
501	498	}
502	499
503	500	- (NSString ) contentsOfVariantStyleSheetWithName:(NSString ) name {
504		NSString *contents = nil;
505		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
506		contents = [NSString performSelector:@selector( stringWithContentsOfURL: ) withObject:[self variantStyleSheetLocationWithName:name]];
507		else contents = [NSString stringWithContentsOfURL:[self variantStyleSheetLocationWithName:name] encoding:NSUTF8StringEncoding error:NULL];
	501	NSString *contents = [NSString stringWithContentsOfURL:[self variantStyleSheetLocationWithName:name] encoding:NSUTF8StringEncoding error:NULL];
508	502	return ( contents ? contents : @"" );
509	503	}
…	…
513	507	if( ! url ) return @"";
514	508
515		NSString *contents = nil;
516		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
517		contents = [NSString performSelector:@selector( stringWithContentsOfURL: ) withObject:url];
518		else contents = [NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:NULL];
	509	NSString *contents = [NSString stringWithContentsOfURL:url encoding:NSUTF8StringEncoding error:NULL];
519	510
520	511	NSURL *resources = [NSURL fileURLWithPath:[[NSBundle mainBundle] resourcePath]];

trunk/Panels/JVChatRoomMember.m

r3619	r3763
377	377	item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( [NSString stringWithUTF8String:"Kick From Room..."], "kick from room (customized) contextual menu - admin only" ) action:@selector( customKick: ) keyEquivalent:@""] autorelease];
378	378	[item setKeyEquivalentModifierMask:NSAlternateKeyMask];
379		if( [item respondsToSelector:@selector( setAlternate: )] )
380		[item setAlternate:YES];
	379	[item setAlternate:YES];
381	380	[item setTarget:self];
382	381	[menu addItem:item];
…	…
389	388	item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( [NSString stringWithUTF8String:"Ban From Room..."], "ban from room (customized) contextual menu - admin only" ) action:@selector( customBan: ) keyEquivalent:@""] autorelease];
390	389	[item setKeyEquivalentModifierMask:NSAlternateKeyMask];
391		if( [item respondsToSelector:@selector( setAlternate: )] )
392		[item setAlternate:YES];
	390	[item setAlternate:YES];
393	391	[item setTarget:self];
394	392	[menu addItem:item];
…	…
400	398	item = [[[NSMenuItem alloc] initWithTitle:NSLocalizedString( [NSString stringWithUTF8String:"Kick & Ban From Room..."], "kickban from room (customized) contextual menu - admin only" ) action:@selector( customKickban: ) keyEquivalent:@""] autorelease];
401	399	[item setKeyEquivalentModifierMask:NSAlternateKeyMask];
402		if( [item respondsToSelector:@selector( setAlternate: )] )
403		[item setAlternate:YES];
	400	[item setAlternate:YES];
404	401	[item setTarget:self];
405	402	[menu addItem:item];
…	…
593	590	[banWindow makeFirstResponder:firstField];
594	591
595		if( [secondTitle respondsToSelector:@selector(setHidden:)] ) {
596		[secondTitle setHidden:YES];
597		[secondField setHidden:YES];
598		} else {
599		NSRect frame = [secondTitle frame];
600		frame.origin.x = 0. - frame.size.width - 10.;
601		[secondTitle setFrame:frame];
602		frame = [secondField frame];
603		frame.origin.x = 0. - frame.size.width - 10.;
604		[secondField setFrame:frame];
605		}
	592	[secondTitle setHidden:YES];
	593	[secondField setHidden:YES];
606	594
607	595	NSRect frame = [banWindow frame];
…	…
629	617	[banWindow makeFirstResponder:firstField];
630	618
631		if( [secondTitle respondsToSelector:@selector( setHidden: )] ) {
632		[secondTitle setHidden:YES];
633		[secondField setHidden:YES];
634		} else {
635		NSRect frame = [secondTitle frame];
636		frame.origin.x = 0. - frame.size.width - 10.;
637		[secondTitle setFrame:frame];
638		frame = [secondField frame];
639		frame.origin.x = 0. - frame.size.width - 10.;
640		[secondField setFrame:frame];
641		}
	619	[secondTitle setHidden:YES];
	620	[secondField setHidden:YES];
642	621
643	622	NSRect frame = [banWindow frame];
…	…
674	653	[banWindow makeFirstResponder:firstField];
675	654
676		if( [secondTitle respondsToSelector:@selector( setHidden: )] ) {
677		[secondTitle setHidden:NO];
678		[secondField setHidden:NO];
679		} else {
680		NSRect frame = [secondTitle frame];
681		frame.origin.y = [firstField frame].origin.y - frame.size.height - 8;
682		frame.origin.x = [firstField frame].origin.x;
683		[secondTitle setFrame:frame];
684		frame.size = [secondField frame].size;
685		frame.origin.y = frame.origin.y - frame.size.height - 8;
686		[secondField setFrame:frame];
687		}
	655	[secondTitle setHidden:NO];
	656	[secondField setHidden:NO];
688	657
689	658	NSRect frame = [banWindow frame];

trunk/Panels/JVChatTranscriptPanel.m

r3755	r3763
465	465	NSSearchField *field = [[[NSSearchField alloc] initWithFrame:NSMakeRect( 0., 0., 150., 22. )] autorelease];
466	466	[[field cell] setSendsWholeSearchString:NO];
467		if( [[field cell] respondsToSelector:@selector( setSendsSearchStringImmediately: )] )
468		[[field cell] setSendsSearchStringImmediately:NO];
	467	[[field cell] setSendsSearchStringImmediately:NO];
469	468	[[field cell] setPlaceholderString:NSLocalizedString( @"Search Messages", "search field placeholder string" )];
470	469	[[field cell] setMaximumRecents:10];
…	…
727	726	[[MVFileTransferController defaultController] downloadFileAtURL:url toLocalFile:nil];
728	727	} else {
729		if( ( [[actionInformation objectForKey:WebActionModifierFlagsKey] unsignedIntValue] & NSCommandKeyMask ) && [[NSWorkspace sharedWorkspace] respondsToSelector:@selector( openURLs:withAppBundleIdentifier:options:additionalEventParamDescriptor:launchIdentifiers: )] ) {
730		[[NSWorkspace sharedWorkspace] openURLs:[NSArray arrayWithObject:url] withAppBundleIdentifier:nil options:NSWorkspaceLaunchWithoutActivation additionalEventParamDescriptor:nil launchIdentifiers:nil];
731		} else {
732		[[NSWorkspace sharedWorkspace] openURL:url];
733		}
	728	[[NSWorkspace sharedWorkspace] openURLs:[NSArray arrayWithObject:url] withAppBundleIdentifier:nil options:NSWorkspaceLaunchWithoutActivation additionalEventParamDescriptor:nil launchIdentifiers:nil];
734	729	}
735	730	}

trunk/Plug-Ins/JavaScript Support/JVJavaScriptChatPlugin.m

r3736	r3763
143	143	_loading = NO;
144	144
145		NSString *contents = nil;
146		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
147		contents = [NSString performSelector:@selector( stringWithContentsOfFile: ) withObject:[self scriptFilePath]];
148		else contents = [NSString stringWithContentsOfFile:[self scriptFilePath] encoding:NSUTF8StringEncoding error:NULL];
	145	NSString *contents = [NSString stringWithContentsOfFile:[self scriptFilePath] encoding:NSUTF8StringEncoding error:NULL];
149	146
150	147	[[sender windowScriptObject] evaluateWebScript:contents];

trunk/Preferences/JVAppearancePreferences.m

r3718	r3763
564	564	if( _variantLocked ) return;
565	565
566		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
567		((void(*)(id, SEL, id, BOOL))objc_msgSend)( _userStyle, @selector( writeToURL: ), [_style variantStyleSheetLocationWithName:[_style defaultVariantName]], YES );
568		else [_userStyle writeToURL:[_style variantStyleSheetLocationWithName:[_style defaultVariantName]] atomically:YES encoding:NSUTF8StringEncoding error:NULL];
	566	[_userStyle writeToURL:[_style variantStyleSheetLocationWithName:[_style defaultVariantName]] atomically:YES encoding:NSUTF8StringEncoding error:NULL];
569	567
570	568	NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:[_style defaultVariantName], @"variant", nil];
…	…
771	769	NSString *path = [[NSString stringWithFormat:@"~/Library/Application Support/Colloquy/Styles/Variants/%@/%@.css", [_style identifier], name] stringByExpandingTildeInPath];
772	770
773		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
774		((void(*)(id, SEL, id, BOOL))objc_msgSend)( _userStyle, @selector( writeToFile: ), path, YES );
775		else [_userStyle writeToFile:path atomically:YES encoding:NSUTF8StringEncoding error:NULL];
	771	[_userStyle writeToFile:path atomically:YES encoding:NSUTF8StringEncoding error:NULL];
776	772
777	773	[_style setDefaultVariantName:name];

trunk/Resources/Info.plist

r3751	r3763
105	105	</array>
106	106	<key>LSMinimumSystemVersion</key>
107		<string>10.~~3.9~~</string>
	107	<string>10.4</string>
108	108	<key>CFBundleVersion</key>
109	109	<string>source</string>

trunk/Settings/Common Settings.xcconfig

r3762	r3763
38	38	LIBRARY_SEARCH_PATHS = "$(SRCROOT)/Frameworks"
39	39	MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(CURRENT_ARCH))
40		MACOSX_DEPLOYMENT_TARGET_ = 10.3
	40	MACOSX_DEPLOYMENT_TARGET_ = 10.4
41	41	MACOSX_DEPLOYMENT_TARGET_i386 = 10.4
42	42	MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5
43		MACOSX_DEPLOYMENT_TARGET_ppc7400 = 10.3
44		MACOSX_DEPLOYMENT_TARGET_ppc970 = 10.3
45		MACOSX_DEPLOYMENT_TARGET_ppc = 10.3
	43	MACOSX_DEPLOYMENT_TARGET_ppc7400 = 10.4
	44	MACOSX_DEPLOYMENT_TARGET_ppc970 = 10.4
	45	MACOSX_DEPLOYMENT_TARGET_ppc = 10.4
46	46	MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5
47	47	ONLY_LINK_ESSENTIAL_SYMBOLS = YES
…	…
50	50	PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO
51	51	SDKROOT = $(SDKROOT_$(CURRENT_ARCH))
52		SDKROOT_ = /Developer/SDKs/MacOSX10.~~3.9~~.sdk
	52	SDKROOT_ = /Developer/SDKs/MacOSX10.4u.sdk
53	53	SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk
54	54	SDKROOT_ppc64 = /Developer/SDKs/MacOSX10.5.sdk
55		SDKROOT_ppc7400 = /Developer/SDKs/MacOSX10.~~3.9~~.sdk
56		SDKROOT_ppc970 = /Developer/SDKs/MacOSX10.~~3.9~~.sdk
57		SDKROOT_ppc = /Developer/SDKs/MacOSX10.~~3.9~~.sdk
	55	SDKROOT_ppc7400 = /Developer/SDKs/MacOSX10.4u.sdk
	56	SDKROOT_ppc970 = /Developer/SDKs/MacOSX10.4u.sdk
	57	SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk
58	58	SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk
59	59	STRIP_INSTALLED_PRODUCT = NO

trunk/Views/JVStyleView.m

r3708	r3763
411	411	}
412	412
413		NSString *shell = nil;
414		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
415		shell = [NSString performSelector:@selector( stringWithContentsOfFile: ) withObject:[[NSBundle mainBundle] pathForResource:name ofType:@"html"]];
416		else shell = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:name ofType:@"html"] encoding:NSUTF8StringEncoding error:NULL];
	413	NSString *shell = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:name ofType:@"html"] encoding:NSUTF8StringEncoding error:NULL];
417	414
418	415	DOMHTMLElement element = (DOMHTMLElement )[_mainDocument createElement:@"div"];
…	…
915	912	if( ! variantStyleSheetLocation ) variantStyleSheetLocation = @"";
916	913
917		NSString *shell = nil;
918		if( floor( NSAppKitVersionNumber ) <= NSAppKitVersionNumber10_3 ) // test for 10.3
919		shell = [NSString performSelector:@selector( stringWithContentsOfFile: ) withObject:[[NSBundle mainBundle] pathForResource:@"template" ofType:@"html"]];
920		else shell = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"template" ofType:@"html"] encoding:NSUTF8StringEncoding error:NULL];
	914	NSString *shell = [NSString stringWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"template" ofType:@"html"] encoding:NSUTF8StringEncoding error:NULL];
921	915
922	916	NSString *bodyTemplate = [[self style] contentsOfBodyTemplateWithName:[self bodyTemplate]];

Navigation

Changeset 3763

Legend:

Download in other formats: