[gtk+] Revert "gdkwindow-x11: Don't set WM_TAKE_FOCUS if accept_focus is FALSE"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "gdkwindow-x11: Don't set WM_TAKE_FOCUS if accept_focus is FALSE"
- Date: Wed, 4 Dec 2013 16:21:51 +0000 (UTC)
commit e2745794b198b640b61a9a37e240b0d2eeca8472
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 4 11:21:42 2013 -0500
Revert "gdkwindow-x11: Don't set WM_TAKE_FOCUS if accept_focus is FALSE"
This reverts commit 809aab2c8ec88c7b10254a948ba8754a766b1f7c.
gdk/x11/gdkwindow-x11.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index a8e92b6..5b51db3 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -772,11 +772,9 @@ set_wm_protocols (GdkWindow *window)
int n = 0;
protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_DELETE_WINDOW");
+ protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS");
protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_PING");
- if (window->accept_focus)
- protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS");
-
#ifdef HAVE_XSYNC
if (GDK_X11_DISPLAY (display)->use_sync)
protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_SYNC_REQUEST");
@@ -3493,10 +3491,7 @@ gdk_x11_window_set_accept_focus (GdkWindow *window,
if (!GDK_WINDOW_DESTROYED (window) &&
WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
- {
- update_wm_hints (window, FALSE);
- set_wm_protocols (window);
- }
+ update_wm_hints (window, FALSE);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]