[Xfce4-commits] [xfce/xfwm4] 03/03: menu: Avoid XError with gtk

[noreply at xfce.org]

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

o   l   i   v   i   e   r       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/xfwm4.

commit cca240fc76faf6bceb3dd5f0ecd5a76818262089
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Apr 24 21:40:07 2019 +0200

    menu: Avoid XError with gtk
    
    When closing a window from the menu, an XError with XInput may occur,
    within gtk, causing an abort of xfwm4.
    
    From the look of the calltrace, it seems quite similar to GNOME bug
    https://bugzilla.gnome.org/show_bug.cgi?id=751739.
    
    Protect the window menu within an error trap to avoid the issue.
---
 src/menu.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/menu.c b/src/menu.c
index d6e5da8..af99d97 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -173,6 +173,8 @@ menu_closed (GtkMenu * widget, gpointer data)
 
     eventFilterPop (menu->filter_setup);
     (*menu->func) (menu, 0, menu->xid, menu->data, NULL);
+    myDisplayErrorTrapPopIgnored (myDisplayGetDefault ());
+
     return (FALSE);
 }
 
@@ -557,6 +559,8 @@ menu_popup (Menu *menu, gint root_x, gint root_y, guint button, guint32 timestam
             return FALSE;
         }
     }
+    myDisplayErrorTrapPush (myDisplayGetDefault ());
+
     return TRUE;
 }
 

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