diff --git a/ChangeLog b/ChangeLog
index 6b319cad12..6559a9e0dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug  2 01:02:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed): 
+	(gdk_check_wm_desktop_changed): Add missing error 
+	traps.  (#149011, Thomas Leonard)
+
 Mon Aug  2 00:21:26 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextview.c (blink_cb): Add the same warning
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6b319cad12..6559a9e0dc 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Aug  2 01:02:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed): 
+	(gdk_check_wm_desktop_changed): Add missing error 
+	traps.  (#149011, Thomas Leonard)
+
 Mon Aug  2 00:21:26 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextview.c (blink_cb): Add the same warning
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6b319cad12..6559a9e0dc 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Aug  2 01:02:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed): 
+	(gdk_check_wm_desktop_changed): Add missing error 
+	traps.  (#149011, Thomas Leonard)
+
 Mon Aug  2 00:21:26 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextview.c (blink_cb): Add the same warning
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6b319cad12..6559a9e0dc 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Aug  2 01:02:57 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk/x11/gdkevents-x11.c (gdk_check_wm_state_changed): 
+	(gdk_check_wm_desktop_changed): Add missing error 
+	traps.  (#149011, Thomas Leonard)
+
 Mon Aug  2 00:21:26 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtktextview.c (blink_cb): Add the same warning
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 3ec9ca2bf9..da42d5b310 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -462,12 +462,15 @@ gdk_check_wm_desktop_changed (GdkWindow *window)
     {
       gulong *desktop;
       
+      type = None;
+      gdk_error_trap_push ();
       XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), 
 			  GDK_WINDOW_XID (window),
                           gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_DESKTOP"),
 			  0, G_MAXLONG, False, XA_CARDINAL, &type, 
 			  &format, &nitems,
                           &bytes_after, (guchar **)&desktop);
+      gdk_error_trap_pop ();
 
       if (type != None)
         {
@@ -501,10 +504,13 @@ gdk_check_wm_state_changed (GdkWindow *window)
   toplevel->have_maxhorz = FALSE;
   toplevel->have_fullscreen = FALSE;
 
+  type = None;
+  gdk_error_trap_push ();
   XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
 		      gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE"),
 		      0, G_MAXLONG, False, XA_ATOM, &type, &format, &nitems,
 		      &bytes_after, (guchar **)&atoms);
+  gdk_error_trap_pop ();
 
   if (type != None)
     {