isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

window-actor: Remove unused description

Browse Source 
The desc field would never get filled in, as we can't have a window
actor without a MetaWindow, also, so remove the storage for the field.
This commit is contained in:
Jasper St. Pierre 2013-06-12 21:45:54 -04:00
parent a6f206f07c
commit 51acc3ee31
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/compositor/meta-window-actor.c
View File

@ -70,8 +70,6 @@ struct _MetaWindowActorPrivate
guint8 opacity; guint8 opacity;
gchar * desc;
/* A region that matches the shape of the window, including frame bounds */ /* A region that matches the shape of the window, including frame bounds */
cairo_region_t *shape_region; cairo_region_t *shape_region;
/* The opaque region, from _NET_WM_OPAQUE_REGION, intersected with /* The opaque region, from _NET_WM_OPAQUE_REGION, intersected with
@ -322,9 +320,6 @@ window_decorated_notify (MetaWindow *mw,
priv->damage = None; priv->damage = None;
} }
g_free (priv->desc);
priv->desc = NULL;
priv->xwindow = new_xwindow; priv->xwindow = new_xwindow;
/* /*
@ -456,7 +451,6 @@ meta_window_actor_finalize (GObject *object)
MetaWindowActorPrivate *priv = self->priv; MetaWindowActorPrivate *priv = self->priv;
g_list_free_full (priv->frames, (GDestroyNotify) frame_data_free); g_list_free_full (priv->frames, (GDestroyNotify) frame_data_free);
g_free (priv->desc);
G_OBJECT_CLASS (meta_window_actor_parent_class)->finalize (object); G_OBJECT_CLASS (meta_window_actor_parent_class)->finalize (object);
} }
@ -851,25 +845,6 @@ meta_window_actor_is_override_redirect (MetaWindowActor *self)
return meta_window_is_override_redirect (self->priv->window); return meta_window_is_override_redirect (self->priv->window);
} }
const char *meta_window_actor_get_description (MetaWindowActor *self)
{
/*
* For windows managed by the WM, we just defer to the WM for the window
* description. For override-redirect windows, we create the description
* ourselves, but only on demand.
*/
if (self->priv->window)
return meta_window_get_description (self->priv->window);
if (G_UNLIKELY (self->priv->desc == NULL))
{
self->priv->desc = g_strdup_printf ("Override Redirect (0x%x)",
(guint) self->priv->xwindow);
}
return self->priv->desc;
}
/** /**
* meta_window_actor_get_workspace: * meta_window_actor_get_workspace:
* @self: #MetaWindowActor * @self: #MetaWindowActor

1
src/meta/meta-window-actor.h
View File

@ -64,7 +64,6 @@ gint meta_window_actor_get_workspace (MetaWindowActor *self
MetaWindow * meta_window_actor_get_meta_window (MetaWindowActor *self); MetaWindow * meta_window_actor_get_meta_window (MetaWindowActor *self);
ClutterActor * meta_window_actor_get_texture (MetaWindowActor *self); ClutterActor * meta_window_actor_get_texture (MetaWindowActor *self);
gboolean meta_window_actor_is_override_redirect (MetaWindowActor *self); gboolean meta_window_actor_is_override_redirect (MetaWindowActor *self);
const char * meta_window_actor_get_description (MetaWindowActor *self);
gboolean meta_window_actor_showing_on_its_workspace (MetaWindowActor *self); gboolean meta_window_actor_showing_on_its_workspace (MetaWindowActor *self);
gboolean meta_window_actor_is_destroyed (MetaWindowActor *self); gboolean meta_window_actor_is_destroyed (MetaWindowActor *self);