* Tools/xpbs.m (-pasteboard:provideDataForType:, -availableTypes)

(-xSelectionNotify:): Better handling of plain text data types.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@32694 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2011-03-23 19:44:46 +00:00
parent e6d1827e27
commit f4de37421d
2 changed files with 13 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2011-03-23 Fred Kiefer <FredKiefer@gmx.de>
* Tools/xpbs.m (-pasteboard:provideDataForType:, -availableTypes)
(-xSelectionNotify:): Better handling of plain text data types.
2011-03-18 Fred Kiefer <FredKiefer@gmx.de> 2011-03-18 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerWindow.m: Extract the bitmap conversion into * Source/x11/XGServerWindow.m: Extract the bitmap conversion into

View file

@ -638,6 +638,8 @@ static NSString *xWaitMode = @"XPasteboardWaitMode";
[self requestData: XG_UTF8_STRING]; [self requestData: XG_UTF8_STRING];
if ([self data] == nil) if ([self data] == nil)
[self requestData: XA_STRING]; [self requestData: XA_STRING];
if ([self data] == nil)
[self requestData: XG_TEXT];
} }
else if ([type isEqual: NSFilenamesPboardType]) else if ([type isEqual: NSFilenamesPboardType])
{ {
@ -734,7 +736,9 @@ xErrorHandler(Display *d, XErrorEvent *e)
type = targets[i]; type = targets[i];
if ((type == XG_UTF8_STRING) if ((type == XG_UTF8_STRING)
||(type == XA_STRING)) || (type == XA_STRING)
|| (type == XG_TEXT)
|| (type == XG_MIME_PLAIN))
{ {
[types addObject: NSStringPboardType]; [types addObject: NSStringPboardType];
} }
@ -944,7 +948,9 @@ xErrorHandler(Display *d, XErrorEvent *e)
[self setData: d]; [self setData: d];
} }
} }
else if (actual_type == XA_STRING) else if ((actual_type == XA_STRING)
|| (actual_type == XG_TEXT)
|| (actual_type == XG_MIME_PLAIN))
{ {
NSString *s; NSString *s;
NSData *d; NSData *d;