diff options
author | Carsten Haitzler <raster@rasterman.com> | 2012-07-16 11:01:44 +0000 |
---|---|---|
committer | Carsten Haitzler <raster@rasterman.com> | 2012-07-16 11:01:44 +0000 |
commit | 6a509fe506a7c4a1dccfb19ccfb16a5bcde46f7b (patch) | |
tree | 9b1fe79cc75fc6c7c015ec666b88bdf78284f1fd /legacy/ecore/src/lib | |
parent | 48cd6930f1bdca7ec4293e9cef99efc597ad682d (diff) |
fix e17->elm cnp.
SVN revision: 73924
Diffstat (limited to 'legacy/ecore/src/lib')
-rw-r--r-- | legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c | 10 | ||||
-rw-r--r-- | legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c | 11 |
2 files changed, 19 insertions, 2 deletions
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c index 5b7d974..272071f 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c | |||
@@ -1333,7 +1333,15 @@ _ecore_xcb_event_handle_selection_notify(xcb_generic_event_t *event) | |||
1333 | format = | 1333 | format = |
1334 | ecore_x_window_prop_property_get(ev->requestor, ev->property, | 1334 | ecore_x_window_prop_property_get(ev->requestor, ev->property, |
1335 | XCB_ATOM_ATOM, 32, &data, &num); | 1335 | XCB_ATOM_ATOM, 32, &data, &num); |
1336 | if (!format) return; | 1336 | if (!format) |
1337 | { | ||
1338 | /* fallback if targets handling is not working and try get the | ||
1339 | * selection directly */ | ||
1340 | xcb_convert_selection(_ecore_xcb_conn, ev->requestor, | ||
1341 | selection, selection, | ||
1342 | ECORE_X_ATOM_UTF8_STRING, XCB_CURRENT_TIME); | ||
1343 | return; | ||
1344 | } | ||
1337 | } | 1345 | } |
1338 | else | 1346 | else |
1339 | { | 1347 | { |
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c index 30a3924..034a1f1 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c | |||
@@ -1403,7 +1403,16 @@ _ecore_x_event_handle_selection_notify(XEvent *xevent) | |||
1403 | xevent->xselection.property, | 1403 | xevent->xselection.property, |
1404 | XA_ATOM, 32, &data, &num_ret); | 1404 | XA_ATOM, 32, &data, &num_ret); |
1405 | if (!format) | 1405 | if (!format) |
1406 | return; | 1406 | { |
1407 | /* fallback if targets handling is not working and try get the | ||
1408 | * selection directly */ | ||
1409 | XConvertSelection(_ecore_x_disp, selection, | ||
1410 | ECORE_X_ATOM_UTF8_STRING, | ||
1411 | selection, | ||
1412 | xevent->xselection.requestor, | ||
1413 | CurrentTime); | ||
1414 | return; | ||
1415 | } | ||
1407 | } | 1416 | } |
1408 | else | 1417 | else |
1409 | { | 1418 | { |