diff --git a/ChangeLog b/ChangeLog index 050a44d63..11d479ab4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-12-16 13:58-EST Gregory John Casamento + + * Source/GSNibLoading.m: Make the log ino debug in awakeFromNib + * Source/NSApplication.m: Allow modal to end multiple times, per spec + there is no exception for doing this. + * Source/NSPasteboard.m: Allow multiple threads in pasteboard + communication. + 2008-12-16 Fred Kiefer * Source/NSImage.m (-drawRepresentation:inRect:, diff --git a/Source/GSNibLoading.m b/Source/GSNibLoading.m index be633ded5..625fbd15b 100644 --- a/Source/GSNibLoading.m +++ b/Source/GSNibLoading.m @@ -815,7 +815,7 @@ static BOOL _isInInterfaceBuilder = NO; - (void) awakeFromNib { - NSLog(@"Called awakeFromNib on an NSCustomObject instance: %@", self); + NSDebugLog(@"Called awakeFromNib on an NSCustomObject instance: %@", self); if([_object respondsToSelector: @selector(awakeFromNib)]) { [_object awakeFromNib]; diff --git a/Source/NSApplication.m b/Source/NSApplication.m index 963018808..84ac5a48a 100644 --- a/Source/NSApplication.m +++ b/Source/NSApplication.m @@ -1779,8 +1779,10 @@ See -runModalForWindow: { if (_session == 0) { - [NSException raise: NSInvalidArgumentException - format: @"stopModalWithCode: when not in a modal session"]; + // According to the spec, there is no exception which is thrown if we are not + // currently in a modal session. While it is not good practice to call this + // when we're not, we shouldn't throw an exception. + return; } else if (returnCode == NSRunContinuesResponse) { diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m index 874a13706..8589ed11d 100644 --- a/Source/NSPasteboard.m +++ b/Source/NSPasteboard.m @@ -959,6 +959,7 @@ static NSString *namePrefix = @"NSTypedFilenamesPboardType:"; NSConnection *connection; connection = [(NSDistantObject*)provider connectionForProxy]; + [connection enableMultipleThreads]; seconds = [finishBy timeIntervalSinceNow]; [connection setRequestTimeout: seconds]; [connection setReplyTimeout: seconds]; @@ -1964,6 +1965,7 @@ static NSMapTable *mimeMap = NULL; NSConnection *conn = [(id)the_server connectionForProxy]; Protocol *p = @protocol(GSPasteboardSvr); + [conn enableMultipleThreads]; [(id)the_server setProtocolForProxy: p]; [[NSNotificationCenter defaultCenter] addObserver: self