Fix failure to locate tools

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27215 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,11 @@
+2008-12-06 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSSound.m:
+	* Source/NSWorkspace.m:
+	* Source/NSPasteboard.m:
+	* Source/GNUmakefile.preamble:
+	Remove code which would not locate tools properly and fixup.
+
 2008-12-03 22:38-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/GSNibLoading.m: Check to make sure the menu has more than

Headers/AppKit/NSApplication.h

@@ -608,7 +608,7 @@ APPKIT_EXPORT NSString	*NSEventTrackingRunLoopMode;
  * method).  <em>Not sent yet under GNUstep.</em>
  */
 - (BOOL) applicationShouldHandleReopen: (NSApplication*)theApplication 
-		   hasVisibleWindows: (BOOL)flag;
+		     hasVisibleWindows: (BOOL)flag;
 
 /**
  * Called on OS X when the resolution or other characteristics of the display

Source/GNUmakefile.preamble

@@ -36,16 +36,8 @@
 # Flags dealing with compiling and linking
 #
 
-# This GNUSTEP_TOOLS_NO_DESTDIR is used to somehow locate the gui
-# Tools when we are not using gnustep-base (currently, that's mostly a
-# hypothetical case!).  It should be the same as GNUSTEP_TOOLS, except
-# that DESTDIR is not included.  It's not used if we are using
-# gnustep-base.
-GNUSTEP_TOOLS_NO_DESTDIR = $(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_TOOLS)
-
 # Additional flags to pass to the preprocessor
 ADDITIONAL_CPPFLAGS =  \
-	-DGNUSTEP_TOOLS_NO_DESTDIR=\"$(GNUSTEP_TOOLS_NO_DESTDIR)\" \
 	-DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
 	-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
 	-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \

Source/NSApplication.m

@@ -3215,8 +3215,8 @@ struct _DelegateWrapper
  * it returns <code>NSTerminateNow</code> will termination be
  * carried out.<br />
  * The old version of -applicationShouldTerminate: returned a BOOL, and this
- * behavior is handled for backward compatibility with YES being
- * equivalent to <code>NSTerminateNow</code> and NO being
+ * should still work as YES is
+ * equivalent to <code>NSTerminateNow</code> and NO is
  * equivalent to <code>NSTerminateCancel</code>.
  */
 - (void) terminate: (id)sender
@@ -3232,14 +3232,7 @@ struct _DelegateWrapper
        * and BOOL are integers, and NSTerminateNow is defined as YES
        * and NSTerminateCancel as NO.
        */
-
-      /* We need to do double coercion here since some version of the 
-       * compiler will get confused due to the differences in how 
-       * enum is implemented on various platforms.  This ensures 
-       * that the return type is handled properly in all cases. 
-       */
-      termination = (NSApplicationTerminateReply)(BOOL) 
-                [_delegate applicationShouldTerminate: self];
+      termination = [_delegate applicationShouldTerminate: self];
     }
   else
     {
@@ -3693,9 +3686,10 @@ struct _DelegateWrapper
       if (wasMain && count == 0)
         {
           if ([_delegate respondsToSelector:
-                             @selector(applicationShouldTerminateAfterLastWindowClosed:)])
+	    @selector(applicationShouldTerminateAfterLastWindowClosed:)])
             {
-              if ([_delegate applicationShouldTerminateAfterLastWindowClosed: self])
+              if ([_delegate
+		applicationShouldTerminateAfterLastWindowClosed: self])
                 {
                   [self terminate: self];
                 }

Source/NSPasteboard.m

@@ -1977,7 +1977,6 @@ static  NSMapTable              *mimeMap = NULL;
 
 	  if (cmd == nil && recursion ==NO)
 	    {
-#ifdef GNUSTEP_BASE_LIBRARY
 	      NSEnumerator	*enumerator;
 	      NSString		*path;
 	      NSFileManager	*mgr;
@@ -1994,10 +1993,6 @@ static  NSMapTable              *mimeMap = NULL;
 		      break;
 		    }
 		}
-#else
-	      path = RETAIN([@GNUSTEP_TOOLS_NO_DESTDIR
-			      stringByAppendingPathComponent: @"gpbs"]);
-#endif
 	    }
 	  if (recursion == YES || cmd == nil)
 	    {

Source/NSSound.m

@@ -173,7 +173,6 @@ static id<GSSoundSvr> the_server = nil;
 	  
 	  if (cmd == nil && recursion == NO) 
 	    {
-#ifdef GNUSTEP_BASE_LIBRARY
 	      NSEnumerator	*enumerator;
 	      NSString		*path;
 	      NSFileManager	*mgr;
@@ -190,16 +189,13 @@ static id<GSSoundSvr> the_server = nil;
 		      break;
 		    }
 		}
-#else
-	      cmd = RETAIN([@GNUSTEP_TOOLS_NO_DESTDIR
-			     stringByAppendingPathComponent: @"gnustep_sndd"]);
-#endif
 	    }
 
 	  if (recursion == YES || cmd == nil) 
 	    {
 	      NSLog(@"Unable to contact sound server - "
-		    @"please ensure that gnustep_sndd is running for %@.", description);
+		@"please ensure that gnustep_sndd is running for %@.",
+		description);
 	      return nil;
 	    } 
 	  else 

Source/NSWorkspace.m

@@ -1273,9 +1273,7 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
    */
   if (path == nil)
     {
-#ifdef GNUSTEP_BASE_LIBRARY
       NSEnumerator	*enumerator;
-      NSString		*path;
 
       enumerator = [NSSearchPathForDirectoriesInDomains(
 	GSToolsDirectory, NSAllDomainsMask, YES) objectEnumerator];
@@ -1288,10 +1286,6 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
 	      break;
 	    }
 	}
-#else
-      path = RETAIN([@GNUSTEP_TOOLS_NO_DESTDIR
-		      stringByAppendingPathComponent: @"make_services"]);
-#endif
     }
   task = [NSTask launchedTaskWithLaunchPath: path
 				  arguments: nil];