diff -u -r cappuccino/AppKit/Cib/CPCib.j cappuccino-borked/AppKit/Cib/CPCib.j --- cappuccino/AppKit/Cib/CPCib.j 2009-04-28 12:23:15.000000000 +0200 +++ cappuccino-borked/AppKit/Cib/CPCib.j 2009-04-23 15:06:04.000000000 +0200 @@ -60,7 +60,10 @@ - (id)initWithCibNamed:(CPString)aName bundle:(CPBundle)aBundle { - self = [self initWithContentsOfURL:aName]; + if ( ! [aName hasSuffix:@".cib"]) + aName = [aName stringByAppendingString:@".cib"]; + + self = [self initWithContentsOfURL:[aBundle pathForResource:aName]]; if (self) { @@ -122,8 +125,8 @@ - (BOOL)instantiateCibWithOwner:(id)anOwner topLevelObjects:(CPArray)topLevelObjects { - [CPDictionary dictionaryWithObjectsAndKeys:anOwner, CPCibOwner, topLevelObjects, CPCibTopLevelObjects]; - return [self instantiate]; + var nameTable = [CPDictionary dictionaryWithObjectsAndKeys:anOwner, CPCibOwner, topLevelObjects, CPCibTopLevelObjects]; + return [self instantiateCibWithExternalNameTable:nameTable]; } @end