summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorrcaridade145 <[email protected]>2020-02-29 13:01:36 +0000
committerVictor Kareh <[email protected]>2020-05-27 11:26:47 -0400
commitc7d07c2f4d00bb0e7252b773ef2e1d0559f733fd (patch)
tree29e22666188acd6f5f7879b2fadb0301f7e5f684 /src/core
parent071e7a7b4743aa360df037fd0c02a0300910a4a6 (diff)
downloadmarco-c7d07c2f4d00bb0e7252b773ef2e1d0559f733fd.tar.bz2
marco-c7d07c2f4d00bb0e7252b773ef2e1d0559f733fd.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.h3
-rw-r--r--src/core/window.c11
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)
{