Commit 3fe4b549 authored by Jan Djärv's avatar Jan Djärv

Fix breakage introduced by fixing Bug#8842.

* nsfns.m (Fx_open_connection): Put NSStringPboardType into
ns_return_type.

* nsterm.m (initFrameFromEmacs): Don't use ns_return_types
in registerServicesMenuSendTypes.
(validRequestorForSendType): Don't check ns_return_types.
parent 856b2f11
2011-07-08 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (initFrameFromEmacs): Don't use ns_return_types
in registerServicesMenuSendTypes.
(validRequestorForSendType): Don't check ns_return_types.
* nsfns.m (Fx_open_connection): Put NSStringPboardType into
ns_return_type.
2011-07-08 Jason Rumney <jasonr@gnu.org>
* w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using
......
......@@ -1729,7 +1729,8 @@ and GNUstep implementations ("distributor-specific release
/* Register our external input/output types, used for determining
applicable services and also drag/drop eligibility. */
ns_send_types = [[NSArray arrayWithObjects: NSStringPboardType, nil] retain];
ns_return_types = [[NSArray arrayWithObjects: nil] retain];
ns_return_types = [[NSArray arrayWithObjects: NSStringPboardType, nil]
retain];
ns_drag_types = [[NSArray arrayWithObjects:
NSStringPboardType,
NSTabularTextPboardType,
......
......@@ -5370,7 +5370,7 @@ - (BOOL)isOpaque
[self allocateGState];
[NSApp registerServicesMenuSendTypes: ns_send_types
returnTypes: ns_return_types];
returnTypes: nil];
ns_window_num++;
return self;
......@@ -5748,8 +5748,7 @@ - (id) validRequestorForSendType: (NSString *)typeSent
{
NSTRACE (validRequestorForSendType);
if (typeSent != nil && [ns_send_types indexOfObject: typeSent] != NSNotFound
&& (typeReturned == nil
|| [ns_return_types indexOfObject: typeSent] != NSNotFound))
&& typeReturned == nil)
{
if (! NILP (ns_get_local_selection (QPRIMARY, QUTF8_STRING)))
return self;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment