summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2014-01-20 22:15:33 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-01-20 22:15:33 +0900
commit4432cd2e8e8f21262f50ed8c0d569837131bcf73 (patch)
tree7e538ccadc91c811bede9191bb92f894e95580ee /src
parentd9ef5e143cf8aadd7800a3210a83cb93579d6a1e (diff)
[ecore_x] Fix to handle paste null data case.
Summary: Do nothing when null data is pasted. Reviewers: Hermet, raster Reviewed By: raster CC: seoz, raster, cedric Differential Revision: https://phab.enlightenment.org/D473
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_events.c9
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_events.c11
2 files changed, 13 insertions, 7 deletions
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c b/src/lib/ecore_x/xcb/ecore_xcb_events.c
index adee7ce0ba..45142cfe1e 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_events.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c
@@ -1354,9 +1354,12 @@ _ecore_xcb_event_handle_selection_notify(xcb_generic_event_t *event)
1354 } 1354 }
1355 } 1355 }
1356 else 1356 else
1357 format = ecore_x_window_prop_property_get(ev->requestor, ev->property, 1357 {
1358 XCB_GET_PROPERTY_TYPE_ANY, 8, 1358 format = ecore_x_window_prop_property_get(ev->requestor, ev->property,
1359 &data, &num); 1359 XCB_GET_PROPERTY_TYPE_ANY, 8,
1360 &data, &num);
1361 if (!format) return;
1362 }
1360 1363
1361 e = calloc(1, sizeof(Ecore_X_Event_Selection_Notify)); 1364 e = calloc(1, sizeof(Ecore_X_Event_Selection_Notify));
1362 if (!e) return; 1365 if (!e) return;
diff --git a/src/lib/ecore_x/xlib/ecore_x_events.c b/src/lib/ecore_x/xlib/ecore_x_events.c
index 467cbcd1a7..bbb353403a 100644
--- a/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/src/lib/ecore_x/xlib/ecore_x_events.c
@@ -1426,10 +1426,13 @@ _ecore_x_event_handle_selection_notify(XEvent *xevent)
1426 } 1426 }
1427 } 1427 }
1428 else 1428 else
1429 format = ecore_x_window_prop_property_get(xevent->xselection.requestor, 1429 {
1430 xevent->xselection.property, 1430 format = ecore_x_window_prop_property_get(xevent->xselection.requestor,
1431 AnyPropertyType, 8, &data, 1431 xevent->xselection.property,
1432 &num_ret); 1432 AnyPropertyType, 8, &data,
1433 &num_ret);
1434 if (!format) return;
1435 }
1433 1436
1434 e = calloc(1, sizeof(Ecore_X_Event_Selection_Notify)); 1437 e = calloc(1, sizeof(Ecore_X_Event_Selection_Notify));
1435 if (!e) 1438 if (!e)