hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix e17->elm cnp. 

SVN revision: 73924
This commit is contained in:
Carsten Haitzler 2012-07-16 11:01:44 +00:00
parent 48cd6930f1
commit 6a509fe506
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/ecore/ChangeLog
View File

@ -813,3 +813,9 @@
* Fix ecore-fb string lookup table to include ctrl+keys
* Fix ecore-fb to trap sigint (ctrl+c) so it doesnt exit your fb app
* Fix ecore-fb mouse to swap button 2 and 3 ro work right.
2012-07-16 Carsten Haitzler (The Rasterman)
* Fix ecore-x selection handling to fall back to getting
selection directly if getting targets fails. This fixes e17 to
elm cnp.

10
legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c
View File

@ -1333,7 +1333,15 @@ _ecore_xcb_event_handle_selection_notify(xcb_generic_event_t *event)
format =
ecore_x_window_prop_property_get(ev->requestor, ev->property,
XCB_ATOM_ATOM, 32, &data, &num);
if (!format) return;
if (!format)
{
/* fallback if targets handling is not working and try get the
* selection directly */
xcb_convert_selection(_ecore_xcb_conn, ev->requestor,
selection, selection,
ECORE_X_ATOM_UTF8_STRING, XCB_CURRENT_TIME);
return;
}
}
else
{

11
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
View File

@ -1403,7 +1403,16 @@ _ecore_x_event_handle_selection_notify(XEvent *xevent)
xevent->xselection.property,
XA_ATOM, 32, &data, &num_ret);
if (!format)
return;
{
/* fallback if targets handling is not working and try get the
* selection directly */
XConvertSelection(_ecore_x_disp, selection,
ECORE_X_ATOM_UTF8_STRING,
selection,
xevent->xselection.requestor,
CurrentTime);
return;
}
}
else
{