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

[_pbs] use hardcoded @GNUSTEP_INSTALL_PREFIX only for

Browse source 
non-GNUstep foundation library.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11599 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
FredKiefer 2001-12-02 11:44:34 +00:00
parent 2cf38b74c4
commit 26d29992fe
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/NSPasteboard.m
View file

@ -41,6 +41,7 @@
#include <Foundation/NSNotification.h> #include <Foundation/NSNotification.h>
#include <Foundation/NSException.h> #include <Foundation/NSException.h>
#include <Foundation/NSLock.h> #include <Foundation/NSLock.h>
#include <Foundation/NSPathUtilities.h>
#include <Foundation/NSPortNameServer.h> #include <Foundation/NSPortNameServer.h>
#include <Foundation/NSProcessInfo.h> #include <Foundation/NSProcessInfo.h>
#include <Foundation/NSSerialization.h> #include <Foundation/NSSerialization.h>
@ -52,9 +53,6 @@
#include <gnustep/gui/GSPasteboardServer.h> #include <gnustep/gui/GSPasteboardServer.h>
#define stringify_it(X) #X
#define prog_path(X) stringify_it(X) "/Tools/gpbs"
@interface NSPasteboard (Private) @interface NSPasteboard (Private)
+ (id<GSPasteboardSvr>) _pbs; + (id<GSPasteboardSvr>) _pbs;
+ (NSPasteboard*) _pasteboardWithTarget: (id<GSPasteboardObj>)aTarget + (NSPasteboard*) _pasteboardWithTarget: (id<GSPasteboardObj>)aTarget
@ -143,8 +141,17 @@ static NSMapTable *mimeMap = NULL;
static NSString *cmd = nil; static NSString *cmd = nil;
if (cmd == nil) if (cmd == nil)
cmd = [NSString stringWithCString: {
prog_path(GNUSTEP_INSTALL_PREFIX)]; #ifdef GNUSTEP_BASE_LIBRARY
cmd = RETAIN([[NSSearchPathForDirectoriesInDomains(
GSToolsDirectory, NSSystemDomainMask, YES) objectAtIndex: 0]
stringByAppendingPathComponent: @"gpbs"]);
#else
cmd = RETAIN([[@GNUSTEP_INSTALL_PREFIX
stringByAppendingPathComponent: @"Tools"]
stringByAppendingPathComponent: @"gpbs"]);
#endif
}
[NSTask launchedTaskWithLaunchPath: cmd arguments: nil]; [NSTask launchedTaskWithLaunchPath: cmd arguments: nil];
[NSTimer scheduledTimerWithTimeInterval: 5.0 [NSTimer scheduledTimerWithTimeInterval: 5.0
invocation: nil invocation: nil