From a05ab38af08cd8b601f4d5e49eabf6b545910391 Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 24 Apr 2012 16:54:53 +0000
Subject: [PATCH] * Source/NSPasteboard.m (NSURL-writeToPasteboard:): Revert
 the last change. * Source/NSWorkspace.m (-openURL:): Declare the URL
 pasteboard type here.

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

diff --git a/ChangeLog b/ChangeLog
index a582eec5b..9dccfae6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 2012-04-24 Fred Kiefer <FredKiefer@gmx.de>
 
-	* Source/NSPasteboard.m (NSURL-writeToPasteboard:): Declare the	type.
+	* Source/NSPasteboard.m (NSURL-writeToPasteboard:): Revert the
+	last change.
+	* Source/NSWorkspace.m (-openURL:): Declare the URL pasteboard
+	type here.
+	Change suggested by Wolfgang Lux  <wolfgang.lux@gmail.com>.
+
+2012-04-24 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSPasteboard.m (NSURL-writeToPasteboard:): Declare the type.
 	Patch by Andreas Schik <andreas.schik@web.de>.
 
 2012-04-19 Riccardo Mottola <rm@gnu.org>
diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m
index ca81d5a4c..3c0bde37f 100644
--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@@ -2292,8 +2292,6 @@ description, [cmd stringByDeletingLastPathComponent]);
  */
 - (void) writeToPasteboard: (NSPasteboard *)pasteBoard
 {
-  [pasteBoard declareTypes: [NSArray arrayWithObject: NSURLPboardType]
-                     owner: nil];
   [pasteBoard setString: [self absoluteString]
 		forType: NSURLPboardType];
 }
diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m
index 3bdce1bab..aa1adc853 100644
--- a/Source/NSWorkspace.m
+++ b/Source/NSWorkspace.m
@@ -953,7 +953,9 @@ static NSString			*_rootPath = @"/";
        * Try any OpenURL service available.
        */
       pb = [NSPasteboard pasteboardWithUniqueName];
-      [url writeToPasteboard: pb];
+      [pb declareTypes: [NSArray arrayWithObject: NSURLPboardType]
+                         owner: nil];
+     [url writeToPasteboard: pb];
       return NSPerformService(@"OpenURL", pb);
     }
 }