From 47bcd510bb8c95c3dd37a80af67ba473614a1ebc Mon Sep 17 00:00:00 2001
From: Richard Frith-Macdonald <rfm@gnu.org>
Date: Fri, 27 Jun 2003 14:53:25 +0000
Subject: [PATCH] More pasteboard work

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17049 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                                | 2 ++
 Headers/gnustep/gui/GSPasteboardServer.h | 8 --------
 Source/NSPasteboard.m                    | 8 ++++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7d985f84..420da1d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* Source/NSPasteboard.m: Documented all methods, fixed minor bugs
 	writing fiels to pastebaords, implemented ([+typesFilterableTo:])
 	wrote (partial implementation ...) the unimplemented filters stuff.
+	* Source/GSServicesManager.m: helpers for filters.
+	* Headers/AppKit/GSPasteboard.h: Removed unused methods.
 
 2003-06-26  Ludovic Marcotte <ludovic@Sophos.ca>
 
diff --git a/Headers/gnustep/gui/GSPasteboardServer.h b/Headers/gnustep/gui/GSPasteboardServer.h
index d47262861..f1f0a43af 100644
--- a/Headers/gnustep/gui/GSPasteboardServer.h
+++ b/Headers/gnustep/gui/GSPasteboardServer.h
@@ -73,15 +73,7 @@
  *	and controlling general server behaviour.
  */
 @protocol GSPasteboardSvr
-// Use this next to implement [+pasteboardByFilteringData:ofType:] and
-// [+pasteboardByFilteringFile:] methods.
-- (id<GSPasteboardObj>) pasteboardByFilteringData: (in bycopy NSData*)data
-					    ofType: (in bycopy NSString*)type
-				            isFile: (BOOL)flag;
-- (id<GSPasteboardObj>) pasteboardByFilteringTypesInPasteboard: pb;
 - (id<GSPasteboardObj>) pasteboardWithName: (in bycopy NSString*)name;
-- (id<GSPasteboardObj>) pasteboardWithUniqueName;
-- (bycopy NSArray*) typesFilterableTo: (in bycopy NSString*)type;
 @end
 
 /*
diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m
index d33af45eb..f52bfd7bb 100644
--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@@ -188,9 +188,9 @@
 	      NSArray	*sendTypes = [info objectForKey: @"NSSendTypes"];
 	      unsigned 	i;
 
-	      for (i = 0; i < [types count]; i++)
+	      for (i = 0; i < [originalTypes count]; i++)
 		{
-		  fromType = [types objectAtIndex: i];
+		  fromType = [originalTypes objectAtIndex: i];
 		  if ([sendTypes containsObject: fromType] == YES)
 		    {
 		      break;
@@ -258,7 +258,7 @@
       /*
        * Now get the service provider to do the job.
        */
-      GSPerformService(filterName, tmp, YES)
+      GSPerformService(filterName, tmp, YES);
 
       /*
        * Finally, make it available.
@@ -551,7 +551,7 @@ static  NSMapTable              *mimeMap = NULL;
     {
       id<GSPasteboardObj>	anObj;
 
-      anObj = [[self _pbs] pasteboardWithUniqueName];
+      anObj = [[self _pbs] pasteboardWithName: nil];
       if (anObj)
 	{
 	  NSString	*aName;