Don't call x_net_wm_state for scroll bar windows (Bug#24963, Bug#25887)

* src/xterm.c (handle_one_xevent): For ConfigureNotify events
don't call x_net_wm_state when the window is a scroll bar window.
(Bug#24963, Bug#25887)

diff --git a/src/xterm.c b/src/xterm.c
index 52bc8f9eca24cf8a7b576b9355d9d3536c38d81e..c3af28e571dfdbcdd3603ccac95618263daf96a0 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8551,8 +8551,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #endif
       if (f)
         {
-
-          x_net_wm_state (f, configureEvent.xconfigure.window);
+         /* Don't call x_net_wm_state for the scroll bar window.
+            (Bug#24963, Bug#25887)  */
+         if (configureEvent.xconfigure.window == FRAME_X_WINDOW (f))
+           x_net_wm_state (f, configureEvent.xconfigure.window);
 
 #ifdef USE_X_TOOLKIT
           /* Tip frames are pure X window, set size for them.  */