[Xfce4-commits] [xfce/xfce4-panel] 04/05: launcher: Fix deprecated functions

noreply at xfce.org noreply at xfce.org
Sat Dec 22 23:18:46 CET 2018


This is an automated email from the git hooks/post-receive script.

a   j   b       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-panel.

commit bfad53ae9f5abdcaf97e601210ff1a65a6e8104e
Author: Alistair Buxton <a.j.buxton at gmail.com>
Date:   Sun Dec 16 10:09:31 2018 +0000

    launcher: Fix deprecated functions
    
    The replacements are Gtk+3 only. Also, this code seems to be broken
    both before and after this patch. This needs a deeper investigation.
    
    See Xfce bug #14986
---
 plugins/launcher/launcher.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index ef53230..6f5fce8 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -2006,7 +2006,9 @@ launcher_plugin_supported_drop (GdkDragContext *context,
   GdkModifierType  modifiers = 0;
 
   /* do not handle drops if control is pressed */
-  gdk_window_get_pointer (gtk_widget_get_window (widget), NULL, NULL, &modifiers);
+  gdk_window_get_device_position (gtk_widget_get_window (widget),
+                                  gdk_drag_context_get_device(context),
+                                  NULL, NULL, &modifiers);
   if (PANEL_HAS_FLAG (modifiers, GDK_CONTROL_MASK))
     return GDK_NONE;
 
@@ -2250,8 +2252,8 @@ launcher_plugin_arrow_drag_leave_timeout (gpointer user_data)
     return FALSE;
 
   /* get the pointer position */
-  gdk_display_get_pointer (gtk_widget_get_display (menu),
-                           NULL, &pointer_x, &pointer_y, NULL);
+  gdk_device_get_position (gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (menu))),
+                           NULL, &pointer_x, &pointer_y);
 
   /* get the menu position */
   gdk_window_get_root_origin (gtk_widget_get_window (menu), &menu_x, &menu_y);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list