diff options
| author | rcaridade145 <[email protected]> | 2020-02-29 13:01:36 +0000 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2020-05-27 11:25:49 -0400 |
| commit | c0549f97732dd57080c15bdd2b64c4162b1a856a (patch) | |
| tree | f7a0b6f8d20166093e607efddc38748f54ca1d96 /src/core | |
| parent | 7e767379251734c6efeef9cc22b326c950470c30 (diff) | |
| download | marco-c0549f97732dd57080c15bdd2b64c4162b1a856a.tar.bz2 marco-c0549f97732dd57080c15bdd2b64c4162b1a856a.tar.xz | |
compositor: fix possible crash closing/destroying window . Fixes to previous commit.
Partially restore call to destroy_win in compositor when calling
meta_window_free. This is needed to ensure that we never call
meta_window_get_frame_bounds while windows is destroying.
https://bugzilla.gnome.org/show_bug.cgi?id=751833
Based on commit https://gitlab.gnome.org/GNOME/metacity/-/commit/a9f28dbc26f5211ef08889109db3dc8c7ba76aca
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/window-private.h | 3 | ||||
| -rw-r--r-- | src/core/window.c | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/core/window-private.h b/src/core/window-private.h index 5abef1e1..ca631966 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -618,6 +618,9 @@ void meta_window_set_gravity (MetaWindow *window, void meta_window_handle_mouse_grab_op_event (MetaWindow *window, XEvent *event); +MetaWorkspace * +meta_window_get_workspace (MetaWindow *window); + GList* meta_window_get_workspaces (MetaWindow *window); gboolean meta_window_located_on_workspace (MetaWindow *window, diff --git a/src/core/window.c b/src/core/window.c index 21d605e2..603bedf3 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -6214,6 +6214,17 @@ idle_update_icon (gpointer data) return FALSE; } + +MetaWorkspace * +meta_window_get_workspace (MetaWindow *window) +{ + if (window->on_all_workspaces) + return window->screen->active_workspace; + else + return window->workspace; +} + + GList* meta_window_get_workspaces (MetaWindow *window) { |