[Xfce4-commits] [xfce/xfwm4] 26/32: client: remove X error traps

[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 e0ce131a862f149ea31b3a607ac1ea9907312fa4
Author: Viktor Odintsev <ninetls at xfce.org>
Date:   Tue Aug 1 21:22:56 2017 +0300

    client: remove X error traps
    
    Xfwm error handler will cover all errors itself, there is no
    necessity to use error traps for client.
    
    GDK X error traps were changed in GDK 3 so using these traps
    caused unwanted SIGTRAPs within GDK X error handler.
---
 src/client.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/client.c b/src/client.c
index 54c14b6..db61862 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1588,14 +1588,12 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
     TRACE ("entering clientFrame");
     TRACE ("framing client (0x%lx)", w);
 
-    gdk_error_trap_push ();
     myDisplayGrabServer (display_info);
 
     if (!XGetWindowAttributes (display_info->dpy, w, &attr))
     {
         g_warning ("Cannot get window attributes for window (0x%lx)", w);
         myDisplayUngrabServer (display_info);
-        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -1604,7 +1602,6 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
     {
         g_warning ("Cannot determine screen info from window (0x%lx)", w);
         myDisplayUngrabServer (display_info);
-        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -1613,7 +1610,6 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
         TRACE ("Not managing our own event window");
         compositorAddWindow (display_info, w, NULL);
         myDisplayUngrabServer (display_info);
-        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -1625,7 +1621,6 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
         {
             sendSystrayReqDock (display_info, w, screen_info->systray);
             myDisplayUngrabServer (display_info);
-            gdk_error_trap_pop_ignored ();
             return NULL;
         }
         TRACE ("No systray found for this screen");
@@ -1637,7 +1632,6 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
         TRACE ("Override redirect window 0x%lx", w);
         compositorAddWindow (display_info, w, NULL);
         myDisplayUngrabServer (display_info);
-        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -1646,7 +1640,6 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
     {
         TRACE ("Cannot allocate memory for the window structure");
         myDisplayUngrabServer (display_info);
-        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -2015,7 +2008,6 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
      * on the server
      */
     myDisplayUngrabServer (display_info);
-    gdk_error_trap_pop_ignored ();
 
     DBG ("client \"%s\" (0x%lx) is now managed", c->name, c->window);
     DBG ("client_count=%d", screen_info->client_count);
@@ -2045,7 +2037,6 @@ clientUnframe (Client *c, gboolean remap)
     compositorSetClient (display_info, c->frame, NULL);
 
     myDisplayGrabServer (display_info);
-    gdk_error_trap_push ();
     clientRemoveUserTimeWin (c);
     clientUngrabButtons (c);
     XUnmapWindow (display_info->dpy, c->frame);
@@ -2106,7 +2097,6 @@ clientUnframe (Client *c, gboolean remap)
     XDestroyWindow (display_info->dpy, c->frame);
 
     myDisplayUngrabServer (display_info);
-    gdk_error_trap_pop_ignored ();
     clientFree (c);
 }
 

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