diff options
author | Havoc Pennington <hp@pobox.com> | 2002-06-09 00:09:01 +0000 |
---|---|---|
committer | Havoc Pennington <hp@src.gnome.org> | 2002-06-09 00:09:01 +0000 |
commit | 459d8f9c9de631d3c9ad0012109969ca61473bb6 (patch) | |
tree | 966216a77942c22b38c2ddf50c457664aa8cd7ac | |
parent | 1efd5432ef48be1f9bf2c38887c99b91517b043e (diff) | |
download | metacity-459d8f9c9de631d3c9ad0012109969ca61473bb6.tar.gz |
set net_supporting_wm_check in addition to win_supporting_wm_check, patch
2002-06-08 Havoc Pennington <hp@pobox.com>
* src/display.c (meta_display_open): set net_supporting_wm_check
in addition to win_supporting_wm_check, patch from
JeyaSudha for #83365
* src/screen.c (set_wm_check_hint): remove setting
win_supporting_wm_check on leader window here, done already in
display.c
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | src/display.c | 6 | ||||
-rw-r--r-- | src/keybindings.c | 2 | ||||
-rw-r--r-- | src/screen.c | 6 |
4 files changed, 18 insertions, 6 deletions
@@ -1,5 +1,15 @@ 2002-06-08 Havoc Pennington <hp@pobox.com> + * src/display.c (meta_display_open): set net_supporting_wm_check + in addition to win_supporting_wm_check, patch from + JeyaSudha for #83365 + + * src/screen.c (set_wm_check_hint): remove setting + win_supporting_wm_check on leader window here, done already in + display.c + +2002-06-08 Havoc Pennington <hp@pobox.com> + * src/keybindings.c (meta_window_ungrab_keys): set keys_grabbed to FALSE, patch from Jayaraj for #81857 diff --git a/src/display.c b/src/display.c index 1dcdb948..f7144e8a 100644 --- a/src/display.c +++ b/src/display.c @@ -457,6 +457,12 @@ meta_display_open (const char *name) display->atom_win_supporting_wm_check, XA_CARDINAL, 32, PropModeReplace, (guchar*) data, 1); + + XChangeProperty (display->xdisplay, + display->leader_window, + display->atom_net_supporting_wm_check, + XA_CARDINAL, + 32, PropModeReplace, (guchar*) data, 1); } /* Now manage all existing windows */ diff --git a/src/keybindings.c b/src/keybindings.c index 482ad883..79ddafe5 100644 --- a/src/keybindings.c +++ b/src/keybindings.c @@ -748,6 +748,8 @@ meta_window_ungrab_keys (MetaWindow *window) else if (!window->grab_on_frame) ungrab_all_keys (window->display, window->xwindow); + + window->keys_grabbed = FALSE; } } diff --git a/src/screen.c b/src/screen.c index e5b68ca1..20aa302e 100644 --- a/src/screen.c +++ b/src/screen.c @@ -67,12 +67,6 @@ set_wm_check_hint (MetaScreen *screen) /* Legacy GNOME hint (uses cardinal, dunno why) */ - /* legacy hint window should have property containing self */ - XChangeProperty (screen->display->xdisplay, screen->display->leader_window, - screen->display->atom_win_supporting_wm_check, - XA_CARDINAL, - 32, PropModeReplace, (guchar*) data, 1); - /* do this after setting up window fully, to avoid races * with clients listening to property notify on root. */ |