From 551074c5f2a15a4827e6b98b192c4031f0994171 Mon Sep 17 00:00:00 2001 From: Thiep Ha Date: Tue, 9 Jun 2015 17:06:45 +0900 Subject: [PATCH] Cnp/X11: correct object parameter in datacb The object parameter in datacb must be the selection request object, not the selection owner object. This patch corrects that. Test case: open two windows with entry, copy text from one entry in first window, paste to entry in other window. @fix --- legacy/elementary/src/lib/elm_cnp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_cnp.c b/legacy/elementary/src/lib/elm_cnp.c index c38dbf57a4..88cdffc7e0 100644 --- a/legacy/elementary/src/lib/elm_cnp.c +++ b/legacy/elementary/src/lib/elm_cnp.c @@ -982,7 +982,7 @@ _x11_notify_handler_text(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify ddata.data = data->data; ddata.len = data->length; ddata.action = sel->action; - sel->datacb(sel->udata, sel->widget, &ddata); + sel->datacb(sel->udata, sel->requestwidget, &ddata); } else cnp_debug("Paste request\n"); @@ -1210,7 +1210,7 @@ _x11_vcard_receive(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notif ddata.data = data->data; ddata.len = data->length; ddata.action = sel->action; - sel->datacb(sel->udata, sel->widget, &ddata); + sel->datacb(sel->udata, sel->requestwidget, &ddata); } else cnp_debug("Paste request\n"); return 0; @@ -1272,7 +1272,7 @@ _x11_notify_handler_image(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify ddata.data = data->data; ddata.len = data->length; ddata.action = sel->action; - sel->datacb(sel->udata, sel->widget, &ddata); + sel->datacb(sel->udata, sel->requestwidget, &ddata); } else cnp_debug("Paste request\n"); return 0;