summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiep Ha <thiepha@gmail.com>2015-06-09 17:06:45 +0900
committerDaniel Zaoui <daniel.zaoui@yahoo.com>2015-06-12 11:53:55 +0300
commit855ef0dbd4cc7ca53580594df36b50131122bb02 (patch)
treeb2ed5657da465106e5c753b387b5205639a78155
parent5e468afa0d5b26cb6628460d3392b4d7aefa12c6 (diff)
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
-rw-r--r--src/lib/elm_cnp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index c38dbf57a..88cdffc7e 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -982,7 +982,7 @@ _x11_notify_handler_text(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify
982 ddata.data = data->data; 982 ddata.data = data->data;
983 ddata.len = data->length; 983 ddata.len = data->length;
984 ddata.action = sel->action; 984 ddata.action = sel->action;
985 sel->datacb(sel->udata, sel->widget, &ddata); 985 sel->datacb(sel->udata, sel->requestwidget, &ddata);
986 } 986 }
987 else cnp_debug("Paste request\n"); 987 else cnp_debug("Paste request\n");
988 988
@@ -1210,7 +1210,7 @@ _x11_vcard_receive(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notif
1210 ddata.data = data->data; 1210 ddata.data = data->data;
1211 ddata.len = data->length; 1211 ddata.len = data->length;
1212 ddata.action = sel->action; 1212 ddata.action = sel->action;
1213 sel->datacb(sel->udata, sel->widget, &ddata); 1213 sel->datacb(sel->udata, sel->requestwidget, &ddata);
1214 } 1214 }
1215 else cnp_debug("Paste request\n"); 1215 else cnp_debug("Paste request\n");
1216 return 0; 1216 return 0;
@@ -1272,7 +1272,7 @@ _x11_notify_handler_image(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify
1272 ddata.data = data->data; 1272 ddata.data = data->data;
1273 ddata.len = data->length; 1273 ddata.len = data->length;
1274 ddata.action = sel->action; 1274 ddata.action = sel->action;
1275 sel->datacb(sel->udata, sel->widget, &ddata); 1275 sel->datacb(sel->udata, sel->requestwidget, &ddata);
1276 } 1276 }
1277 else cnp_debug("Paste request\n"); 1277 else cnp_debug("Paste request\n");
1278 return 0; 1278 return 0;