Replace wm_state_modal usage with META_WINDOW_TYPE_DIALOG

This commit is contained in:
Jasper St. Pierre 2014-03-18 10:58:26 -04:00
parent cdb7947dd1
commit 7504f16e59
2 changed files with 2 additions and 2 deletions

View File

@ -344,7 +344,7 @@ avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
/* denied_focus_and_not_transient is only set when focus_window != NULL */ /* denied_focus_and_not_transient is only set when focus_window != NULL */
if (window->denied_focus_and_not_transient && if (window->denied_focus_and_not_transient &&
window->wm_state_modal && /* FIXME: Maybe do this for all transients? */ window->type == META_WINDOW_MODAL_DIALOG &&
meta_window_same_application (window, focus_window) && meta_window_same_application (window, focus_window) &&
window_overlaps_focus_window (window)) window_overlaps_focus_window (window))
{ {

View File

@ -5687,7 +5687,7 @@ get_modal_transient (MetaWindow *window)
MetaWindow *transient = tmp->data; MetaWindow *transient = tmp->data;
if (transient->transient_for == modal_transient && if (transient->transient_for == modal_transient &&
transient->wm_state_modal) transient->type == META_WINDOW_MODAL_DIALOG)
{ {
modal_transient = transient; modal_transient = transient;
tmp = windows; tmp = windows;