gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 21:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweaks and debugging

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17063 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2003-06-28 17:37:03 +00:00
parent 7a468350a5
commit a5399b06c6
5 changed files with 71 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/GSServicesManager.m
View file

@ -1362,11 +1362,14 @@ GSPerformService(NSString *serviceItem, NSPasteboard *pboard, BOOL isFilter)
finishBy = [NSDate dateWithTimeIntervalSinceNow: seconds];
appPath = [service objectForKey: @"ServicePath"];
userData = [service objectForKey: @"NSUserData"];
message = [service objectForKey: @"NSMessage"];
if (isFilter == YES && [message length] == 0)
if (isFilter == YES)
{
message = [service objectForKey: @"NSFilter"];
}
else
{
message = [service objectForKey: @"NSMessage"];
}
selName = [message stringByAppendingString: @":userData:error:"];
/*

15
Source/NSPasteboard.m
View file

@ -209,6 +209,7 @@ static NSString *namePrefix = @"NSTypedFilenamesPboardType:";
{
NSMutableData *m = [NSMutableData dataWithCapacity: 1023];
NSString *filename;
NSString *path;
NSData *d;
NSPipe *p;
NSTask *t;
@ -217,8 +218,8 @@ static NSString *namePrefix = @"NSTypedFilenamesPboardType:";
/*
* The data for an NSUnixStdio filter must be one or more filenames
*/
if ([type isEqualToString: NSFilenamesPboardType] == NO
&& [type hasPrefix: namePrefix] == NO)
if ([fromType isEqualToString: NSFilenamesPboardType] == NO
&& [fromType hasPrefix: namePrefix] == NO)
{
[sender setData: [NSData data] forType: type];
return; // Not the name of a file to filter.
@ -258,7 +259,12 @@ static NSString *namePrefix = @"NSTypedFilenamesPboardType:";
* Set up and launch task to filter the named file.
*/
t = [NSTask new];
[t setLaunchPath: [info objectForKey: @"NSPortName"]];
path = [info objectForKey: @"NSExecutable"];
if ([path length] == 0)
{
path = [info objectForKey: @"NSPortName"];
}
[t setLaunchPath: path];
[t setArguments: [NSArray arrayWithObject: filename]];
p = [NSPipe pipe];
[t setStandardOutput: p];
@ -267,7 +273,8 @@ static NSString *namePrefix = @"NSTypedFilenamesPboardType:";
/*
* Read all the data that the task writes.
*/
while ((d = [[p fileHandleForReading] availableData]) != nil)
while ((d = [[p fileHandleForReading] availableData]) != nil
&& [d length] > 0)
{
[m appendData: d];
}