isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 11:00:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix crash when grab failed due to another operation in progress

Browse Source 
2002-01-15  Havoc Pennington  <hp@redhat.com>
	* src/keybindings.c (handle_tab_backward): fix crash
	when grab failed due to another operation in progress
	(handle_tab_forward): fix crash when grab failed
This commit is contained in:
Havoc Pennington 2002-01-15 23:19:06 +00:00 committed by Havoc Pennington
parent e532a300b0
commit 3194faaa9c
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-01-15 Havoc Pennington <hp@redhat.com>
* src/keybindings.c (handle_tab_backward): fix crash
when grab failed due to another operation in progress
(handle_tab_forward): fix crash when grab failed
2002-01-10 Havoc Pennington <hp@pobox.com> 2002-01-10 Havoc Pennington <hp@pobox.com>
* src/frame.c (meta_window_destroy_frame): only bump * src/frame.c (meta_window_destroy_frame): only bump

58
src/keybindings.c
View File

@ -980,20 +980,21 @@ handle_tab_forward (MetaDisplay *display,
{ {
meta_verbose ("Starting tab forward, showing popup\n"); meta_verbose ("Starting tab forward, showing popup\n");
meta_display_begin_grab_op (window->display, if (meta_display_begin_grab_op (window->display,
display->focus_window ? display->focus_window ?
display->focus_window : window, display->focus_window : window,
META_GRAB_OP_KEYBOARD_TABBING, META_GRAB_OP_KEYBOARD_TABBING,
FALSE, FALSE,
0, 0, 0, 0,
event->xkey.time, event->xkey.time,
0, 0); 0, 0))
{
meta_ui_tab_popup_select (window->screen->tab_popup, meta_ui_tab_popup_select (window->screen->tab_popup,
window->xwindow); window->xwindow);
/* only after selecting proper window */ /* only after selecting proper window */
meta_ui_tab_popup_set_showing (window->screen->tab_popup, meta_ui_tab_popup_set_showing (window->screen->tab_popup,
TRUE); TRUE);
}
} }
} }
@ -1040,20 +1041,21 @@ handle_tab_backward (MetaDisplay *display,
{ {
meta_verbose ("Starting tab backward, showing popup\n"); meta_verbose ("Starting tab backward, showing popup\n");
meta_display_begin_grab_op (window->display, if (meta_display_begin_grab_op (window->display,
display->focus_window ? display->focus_window ?
display->focus_window : window, display->focus_window : window,
META_GRAB_OP_KEYBOARD_TABBING, META_GRAB_OP_KEYBOARD_TABBING,
FALSE, FALSE,
0, 0, 0, 0,
event->xkey.time, event->xkey.time,
0, 0); 0, 0))
{
meta_ui_tab_popup_select (window->screen->tab_popup, meta_ui_tab_popup_select (window->screen->tab_popup,
window->xwindow); window->xwindow);
/* only after selecting proper window */ /* only after selecting proper window */
meta_ui_tab_popup_set_showing (window->screen->tab_popup, meta_ui_tab_popup_set_showing (window->screen->tab_popup,
TRUE); TRUE);
}
} }
} }