[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 909ad0d7ae0de04eb562446384ad4d2449c29868
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 30 09:13:21 2017 +0000

    Resolves: rhbz#1417480 stray bare XWarpPointer call in gtk3 code
    
    which blows up under wayland naturally
    
    can get here from tools->options->mouse positioning->"dialog center"
    table->insert table
    
    Change-Id: Id81b06a63cc3a2a1073d236e2f36dc65e533e598
    (cherry picked from commit b4b989b59cc5841fdf4635b19b975cae3a88430f)
    Reviewed-on: https://gerrit.libreoffice.org/33689
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 00438ea..1c2486e 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2140,9 +2140,9 @@ void GtkSalFrame::SetPointerPos( long nX, long nY )
     unsigned int nWindowLeft = maGeometry.nX + nX;
     unsigned int nWindowTop  = maGeometry.nY + nY;
 
-    XWarpPointer( GDK_DISPLAY_XDISPLAY (pDisplay), None,
-                  GDK_WINDOW_XID (gdk_screen_get_root_window( pScreen ) ),
-                  0, 0, 0, 0, nWindowLeft, nWindowTop);
+    GdkDeviceManager* pManager = gdk_display_get_device_manager(pDisplay);
+    gdk_device_warp(gdk_device_manager_get_client_pointer(pManager), pScreen, nWindowLeft, nWindowTop);
+
     // #i38648# ask for the next motion hint
     gint x, y;
     GdkModifierType mask;