[mutter/wip/surface-content: 7/18] window-actor: Remove old unused APIs
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/surface-content: 7/18] window-actor: Remove old unused APIs
- Date: Fri, 6 Dec 2013 22:47:39 +0000 (UTC)
commit b6b850e736c11cf59bd588419b528085f952ceb7
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Nov 4 21:17:48 2013 -0500
window-actor: Remove old unused APIs
src/compositor/meta-window-actor.c | 53 ------------------------------------
src/compositor/plugins/default.c | 2 +-
src/meta/meta-window-actor.h | 3 --
3 files changed, 1 insertions(+), 57 deletions(-)
---
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index b178ab1..fe8bf89 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -929,59 +929,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 b6cccf1..3dedda3 100644
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -411,7 +411,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 ce6c640..ca213b5 100644
--- a/src/meta/meta-window-actor.h
+++ b/src/meta/meta-window-actor.h
@@ -60,11 +60,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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]