[EGIT] [core/elementary] master 03/04: Cnp/X11: correct object parameter in datacb

[Thiep Ha]

jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=855ef0dbd4cc7ca53580594df36b50131122bb02

commit 855ef0dbd4cc7ca53580594df36b50131122bb02
Author: Thiep Ha <thie...@gmail.com>
Date:   Tue Jun 9 17:06:45 2015 +0900

    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
---
 src/lib/elm_cnp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index c38dbf5..88cdffc 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
         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;

--