From 1a1db9ef8dcb635c3e9863edc03d9e5d018310df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 30 Nov 2017 22:17:02 -0500 Subject: [PATCH] window-actor: rename destroy function in queue_destroy Since this might delay the destruction after animation has succeeded, it's just better to rename this accordingly. https://bugzilla.gnome.org/show_bug.cgi?id=791006 --- src/compositor/compositor.c | 2 +- src/compositor/meta-window-actor-private.h | 2 +- src/compositor/meta-window-actor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index ff919e6de..51d22bc17 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -674,7 +674,7 @@ meta_compositor_remove_window (MetaCompositor *compositor, if (compositor->unredirected_window == window) set_unredirected_window (compositor, NULL); - meta_window_actor_destroy (window_actor); + meta_window_actor_queue_destroy (window_actor); } void diff --git a/src/compositor/meta-window-actor-private.h b/src/compositor/meta-window-actor-private.h index 72dcd1451..6b52ef5b5 100644 --- a/src/compositor/meta-window-actor-private.h +++ b/src/compositor/meta-window-actor-private.h @@ -12,7 +12,7 @@ MetaWindowActor *meta_window_actor_new (MetaWindow *window); -void meta_window_actor_destroy (MetaWindowActor *self); +void meta_window_actor_queue_destroy (MetaWindowActor *self); void meta_window_actor_show (MetaWindowActor *self, MetaCompEffect effect); diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index 2a89a7fc8..c67b2b7b0 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -1238,7 +1238,7 @@ meta_window_actor_set_unredirected (MetaWindowActor *self, } void -meta_window_actor_destroy (MetaWindowActor *self) +meta_window_actor_queue_destroy (MetaWindowActor *self) { MetaWindowActorPrivate *priv = self->priv; MetaWindow *window = priv->window;