Revert "gdkwindow-x11: Don't set WM_TAKE_FOCUS if accept_focus is FALSE"

This reverts commit 76f585e086.
This commit is contained in:
Matthias Clasen
2013-12-04 11:17:19 -05:00
parent 3b25efffce
commit 6e90eba712

View File

@@ -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);
}
}