summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiep Ha <thiepha@gmail.com>2015-06-09 09:09:44 +0900
committerThiep Ha <thiepha@gmail.com>2015-06-09 09:09:44 +0900
commit2923ae8582a8b86a00cdc09191931a1057049ebc (patch)
tree3778b41d8f481aeaeb3ae929f4e0c960979d17f2
parent55261e144d6815f01175e834effec9a432f0e9cc (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 b059e21ab..221f80b3c 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -1085,7 +1085,7 @@ _x11_notify_handler_text(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify
1085 ddata.data = data->data; 1085 ddata.data = data->data;
1086 ddata.len = data->length; 1086 ddata.len = data->length;
1087 ddata.action = sel->action; 1087 ddata.action = sel->action;
1088 sel->datacb(sel->udata, sel->widget, &ddata); 1088 sel->datacb(sel->udata, sel->requestwidget, &ddata);
1089 } 1089 }
1090 else cnp_debug("Paste request\n"); 1090 else cnp_debug("Paste request\n");
1091 1091
@@ -1285,7 +1285,7 @@ _x11_vcard_receive(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify *notif
1285 ddata.data = data->data; 1285 ddata.data = data->data;
1286 ddata.len = data->length; 1286 ddata.len = data->length;
1287 ddata.action = sel->action; 1287 ddata.action = sel->action;
1288 sel->datacb(sel->udata, sel->widget, &ddata); 1288 sel->datacb(sel->udata, sel->requestwidget, &ddata);
1289 } 1289 }
1290 else cnp_debug("Paste request\n"); 1290 else cnp_debug("Paste request\n");
1291 return 0; 1291 return 0;
@@ -1309,7 +1309,7 @@ _x11_notify_handler_image(X11_Cnp_Selection *sel, Ecore_X_Event_Selection_Notify
1309 ddata.data = data->data; 1309 ddata.data = data->data;
1310 ddata.len = data->length; 1310 ddata.len = data->length;
1311 ddata.action = sel->action; 1311 ddata.action = sel->action;
1312 sel->datacb(sel->udata, sel->widget, &ddata); 1312 sel->datacb(sel->udata, sel->requestwidget, &ddata);
1313 } 1313 }
1314 else cnp_debug("Paste request\n"); 1314 else cnp_debug("Paste request\n");
1315 return 0; 1315 return 0;