Backport changes from trunk

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/stable@27075 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2008-11-17 00:58:13 +00:00
parent fc639dae72
commit dd8bb04d93
5 changed files with 74 additions and 34 deletions

View file

@ -1,3 +1,36 @@
2008-10-19 Riccardo Mottola <rmottola@users.sf.net>>
* Source/GSServicesManager.m: dont unreigster non existent named port
2008-10-18 19:06-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSWindow.m: Remove code in stringWithSavedFrame which was causing a
crash due to issues in NSToolbar described in bug#24601.
2008-10-18 Riccardo Mottola <rmottola@users.sf.net>>
* Source/NSWorkspace.m: Removed c99-ism
2008-10-17 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSWindow.m (+initialize, -startBackendWindow:): Move the
initialization of windowmaps to initialize.
2008-09-17 18:15-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/GSInfoPanel.m: Minor correction in initWithDictionary to
display url properly, if it is not specified in the dictionary passed
or if the dictionary is nil.
2008-09-17 17:52-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSWorkspace.m: Exclude list of reserved mount names from
the results returned by -mountedLocalVolumePaths.
2008-09-14 13:18-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* install.sh: Adding install script for use by compile-all.
2008-09-08 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSInfoPanel.m (-keyDown:, -copy:): Added functionality to

View file

@ -142,7 +142,7 @@ NSRegisterServicesProvider(id provider, NSString *name)
ns = [NSPortNameServer systemDefaultPortNameServer];
namedPort = [ns portForName: name];
if ([listenerConnection receivePort] == namedPort)
if (namedPort && [listenerConnection receivePort] == namedPort)
{
[ns removePortForName: name];
namedPort = nil;

View file

@ -631,6 +631,8 @@ static NSNotificationCenter *nc = nil;
responderClass = [NSResponder class];
viewClass = [NSView class];
autosaveNames = [NSMutableSet new];
windowmaps = NSCreateMapTable(NSIntMapKeyCallBacks,
NSNonRetainedObjectMapValueCallBacks, 20);
nc = [NSNotificationCenter defaultCenter];
}
}
@ -812,10 +814,6 @@ many times.
{
NSDictionary *info;
if (!windowmaps)
windowmaps = NSCreateMapTable(NSIntMapKeyCallBacks,
NSNonRetainedObjectMapValueCallBacks, 20);
NSMapInsert(windowmaps, (void*)(intptr_t)_windowNum, self);
// Make sure not to create an autoreleased object,
@ -4540,28 +4538,6 @@ current key view.<br />
fRect = _frame;
/*
* FIXME: This may not be such an elegant solution, but it works.
* I need to find a better way to handle this, maybe in the window
* decoration view could handle these calculations.
*/
if([self toolbar] != nil)
{
NSView *tbview = [[self toolbar] _toolbarView];
NSRect tbframe = [tbview frame];
if([tbview superview] != nil)
{
NSRect r = [[self contentViewWithoutToolbar] frame];
r = [NSWindow frameRectForContentRect: r
styleMask: _styleMask];
// copy w/h
fRect.size.width = r.size.width;
fRect.size.height = r.size.height;
fRect.origin.y += tbframe.size.height;
}
}
/*
* The screen rectangle should gives the area of the screen in which
* the window could be placed (ie a rectangle excluding the dock).

View file

@ -1609,6 +1609,7 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
FILE *fptr = fopen("/etc/mtab", "r");
struct mntent *m;
names = [NSMutableArray arrayWithCapacity: 8];
while ((m = getmntent(fptr)) != 0)
{
@ -1619,12 +1620,35 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
[names addObject: path];
}
#else
// FIXME This is system specific
NSString *mtab = [NSString stringWithContentsOfFile: @"/etc/mtab"];
NSArray *mounts = [mtab componentsSeparatedByString: @"\n"];
NSString *mtabPath;
NSString *mtab;
NSArray *mounts, *reservedMountNames;
unsigned int i;
// get mount table...
mtabPath = [[NSUserDefaults standardUserDefaults] objectForKey:@"GSMtabPath"];
if (mtabPath == nil)
{
mtabPath = @"/etc/mtab";
}
// get reserved names....
reservedMountNames = [[NSUserDefaults standardUserDefaults] objectForKey: @"GSReservedMountNames"];
if(reservedMountNames == nil)
{
reservedMountNames = [NSArray arrayWithObjects:
@"proc",@"devpts",
@"shm",@"usbdevfs",
@"devpts",@"sysfs",
@"tmpfs",@"procbususb",
@"udev",nil];
[[NSUserDefaults standardUserDefaults] setObject: reservedMountNames
forKey: @"GSReservedMountNames"];
}
mtab = [NSString stringWithContentsOfFile:mtabPath];
mounts = [mtab componentsSeparatedByString: @"\n"];
names = [NSMutableArray arrayWithCapacity: [mounts count]];
for (i = 0; i < [mounts count]; i++)
{
@ -1638,9 +1662,7 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
{
NSString *type = [parts objectAtIndex: 2];
if ([type isEqualToString: @"proc"] == NO
&& [type isEqualToString: @"devpts"] == NO
&& [type isEqualToString: @"shm"] == NO)
if ([reservedMountNames containsObject: type] == NO)
{
[names addObject: [parts objectAtIndex: 1]];
}

9
install.sh Normal file
View file

@ -0,0 +1,9 @@
#/bin/sh
PREFIX=$1
MAKE=$2
. $PREFIX/System/Library/Makefiles/GNUstep.sh
$MAKE install
exit 0