[Xfce4-commits] [apps/xfce4-terminal] 01/01: Fix drop-down terminal hotkey

noreply at xfce.org noreply at xfce.org
Mon Mar 19 14:25:34 CET 2018


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

f   2   4   0   4       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 apps/xfce4-terminal.

commit 2f6db7f83c6db2e12e76ebb4a75ff1bd3eea38cf
Author: Igor <f2404 at yandex.ru>
Date:   Mon Mar 19 09:17:52 2018 -0400

    Fix drop-down terminal hotkey
    
    This reverts commit 386e42995d71149d05f232e95d175a853a2f0bf2.
    Resolving deprecation warnings has apparently broken the functionality.
    
    Fixes bug #14289
---
 terminal/terminal-window-dropdown.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/terminal/terminal-window-dropdown.c b/terminal/terminal-window-dropdown.c
index fde9350..2e6391c 100644
--- a/terminal/terminal-window-dropdown.c
+++ b/terminal/terminal-window-dropdown.c
@@ -579,26 +579,12 @@ static gboolean
 terminal_window_dropdown_can_grab (gpointer data)
 {
   GdkWindow    *window = gtk_widget_get_window (GTK_WIDGET (data));
-  GdkGrabStatus status;
-#if GTK_CHECK_VERSION (3, 20, 0)
-  GdkDisplay   *display = gdk_window_get_display (window);
-  GdkSeat      *seat = gdk_display_get_default_seat (display);
-
-  status = gdk_seat_grab (seat, window,
-                          GDK_SEAT_CAPABILITY_POINTER | GDK_SEAT_CAPABILITY_KEYBOARD,
-                          FALSE, NULL, NULL, NULL, NULL);
-#else
-  status = gdk_keyboard_grab (window, FALSE, GDK_CURRENT_TIME);
-#endif
+  GdkGrabStatus status = gdk_keyboard_grab (window, FALSE, GDK_CURRENT_TIME);
 
   if (status == GDK_GRAB_SUCCESS)
     {
       /* drop the grab */
-#if GTK_CHECK_VERSION (3, 20, 0)
-      gdk_seat_ungrab (seat);
-#else
       gdk_keyboard_ungrab (GDK_CURRENT_TIME);
-#endif
       return FALSE;
     }
 

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


More information about the Xfce4-commits mailing list