[Xfce4-commits] [xfce/xfwm4] 12/32: Replace gdk_error_trap_pop with gdk_error_trap_pop_ignored

[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 ac2d6a325762959c0f640224ac0c0c07eb812c0c
Author: Viktor Odintsev <zakhams at gmail.com>
Date:   Sun Jul 2 20:04:24 2017 +0300

    Replace gdk_error_trap_pop with gdk_error_trap_pop_ignored
---
 src/client.c               | 16 ++++++++--------
 src/icons.c                |  4 ++--
 src/startup_notification.c |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/client.c b/src/client.c
index e4f58cf..464e987 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1597,7 +1597,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
     {
         g_warning ("Cannot get window attributes for window (0x%lx)", w);
         myDisplayUngrabServer (display_info);
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -1606,7 +1606,7 @@ 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 ();
+        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -1615,7 +1615,7 @@ 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 ();
+        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -1627,7 +1627,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
         {
             sendSystrayReqDock (display_info, w, screen_info->systray);
             myDisplayUngrabServer (display_info);
-            gdk_error_trap_pop ();
+            gdk_error_trap_pop_ignored ();
             return NULL;
         }
         TRACE ("No systray found for this screen");
@@ -1639,7 +1639,7 @@ 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 ();
+        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -1648,7 +1648,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
     {
         TRACE ("Cannot allocate memory for the window structure");
         myDisplayUngrabServer (display_info);
-        gdk_error_trap_pop ();
+        gdk_error_trap_pop_ignored ();
         return NULL;
     }
 
@@ -2017,7 +2017,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
      * on the server
      */
     myDisplayUngrabServer (display_info);
-    gdk_error_trap_pop ();
+    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);
@@ -2108,7 +2108,7 @@ clientUnframe (Client *c, gboolean remap)
     XDestroyWindow (display_info->dpy, c->frame);
 
     myDisplayUngrabServer (display_info);
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
     clientFree (c);
 }
 
diff --git a/src/icons.c b/src/icons.c
index 1238d91..32fa3d8 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -457,7 +457,7 @@ try_pixmap_and_mask (ScreenInfo *screen_info, Pixmap src_pixmap, Pixmap src_mask
         get_pixmap_geometry (myScreenGetXDisplay(screen_info), src_mask, &w, &h);
         mask = get_pixbuf_from_pixmap (screen_info->gscr, src_mask, 0, 0, 0, 0, w, h);
     }
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     if (mask)
     {
@@ -535,7 +535,7 @@ getAppIcon (ScreenInfo *screen_info, Window window, guint width, guint height)
 
     gdk_error_trap_push ();
     hints = XGetWMHints (myScreenGetXDisplay(screen_info), window);
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     if (hints)
     {
diff --git a/src/startup_notification.c b/src/startup_notification.c
index 0798092..c33ee4b 100644
--- a/src/startup_notification.c
+++ b/src/startup_notification.c
@@ -67,7 +67,7 @@ sn_error_trap_push (SnDisplay * d, Display * dpy)
 static void
 sn_error_trap_pop (SnDisplay * d, Display * dpy)
 {
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 }
 
 static void

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