summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2017-08-31 09:36:46 +0200
committerMartin Rudalics <rudalics@gmx.at>2017-08-31 09:36:46 +0200
commitf44184f1c34fed8e6e1db93de37d3ea76419c5ac (patch)
tree0bc16198a89219c2a8063864174432c26b968ea0 /src
parenta4f6b1097fb5d3f27d42b722b7f31fb35fe9da53 (diff)
downloademacs-f44184f1c34fed8e6e1db93de37d3ea76419c5ac.tar.gz
Restrict fix of Bug#24963 and Bug#25887 to GTK builds
* src/xterm.c (handle_one_xevent): Restrict earlier fix of Bug#24963 and Bug#25887 to avoid that a non-GTK Emacs won't react to state changes received via ConfigureNotify.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 64e89708b2e..b7dc884fa69 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8723,9 +8723,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
#endif
if (f)
{
- /* Don't call x_net_wm_state for the scroll bar window.
- (Bug#24963, Bug#25887) */
+#ifdef USE_GTK
+ /* For GTK+ don't call x_net_wm_state for the scroll bar
+ window. (Bug#24963, Bug#25887) */
if (configureEvent.xconfigure.window == FRAME_X_WINDOW (f))
+#endif
x_net_wm_state (f, configureEvent.xconfigure.window);
#ifdef USE_X_TOOLKIT