diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index d19234cf3..db44798f6 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -858,59 +858,6 @@ meta_window_actor_is_destroyed (MetaWindowActor *self) return self->priv->disposed; } -gboolean -meta_window_actor_is_override_redirect (MetaWindowActor *self) -{ - return meta_window_is_override_redirect (self->priv->window); -} - -/** - * meta_window_actor_get_workspace: - * @self: #MetaWindowActor - * - * Returns the index of workspace on which this window is located; if the - * window is sticky, or is not currently located on any workspace, returns -1. - * This function is deprecated and should not be used in newly written code; - * meta_window_get_workspace() instead. - * - * Return value: (transfer none): index of workspace on which this window is - * located. - */ -gint -meta_window_actor_get_workspace (MetaWindowActor *self) -{ - MetaWindowActorPrivate *priv; - MetaWorkspace *workspace; - - if (!self) - return -1; - - priv = self->priv; - - if (!priv->window || meta_window_is_on_all_workspaces (priv->window)) - return -1; - - workspace = meta_window_get_workspace (priv->window); - - if (!workspace) - return -1; - - return meta_workspace_index (workspace); -} - -gboolean -meta_window_actor_showing_on_its_workspace (MetaWindowActor *self) -{ - if (!self) - return FALSE; - - /* If override redirect: */ - if (!self->priv->window) - return TRUE; - - return meta_window_showing_on_its_workspace (self->priv->window); -} - static void meta_window_actor_freeze (MetaWindowActor *self) { diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c index 91b30c039..892854b33 100644 --- a/src/compositor/plugins/default.c +++ b/src/compositor/plugins/default.c @@ -409,7 +409,7 @@ switch_workspace (MetaPlugin *plugin, ClutterActor *actor = CLUTTER_ACTOR (window_actor); gint win_workspace; - win_workspace = meta_window_actor_get_workspace (window_actor); + win_workspace = meta_window_get_workspace (meta_window_actor_get_meta_window (window_actor)); if (win_workspace == to || win_workspace == from) { diff --git a/src/meta/meta-window-actor.h b/src/meta/meta-window-actor.h index 9f808a9ac..2055ca8fc 100644 --- a/src/meta/meta-window-actor.h +++ b/src/meta/meta-window-actor.h @@ -58,11 +58,8 @@ struct _MetaWindowActor GType meta_window_actor_get_type (void); Window meta_window_actor_get_x_window (MetaWindowActor *self); -gint meta_window_actor_get_workspace (MetaWindowActor *self); MetaWindow * meta_window_actor_get_meta_window (MetaWindowActor *self); ClutterActor * meta_window_actor_get_texture (MetaWindowActor *self); -gboolean meta_window_actor_is_override_redirect (MetaWindowActor *self); -gboolean meta_window_actor_showing_on_its_workspace (MetaWindowActor *self); gboolean meta_window_actor_is_destroyed (MetaWindowActor *self); #endif /* META_WINDOW_ACTOR_H */