From 51acc3ee3178754b16b17362bb9b0395ef9a4e9b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 12 Jun 2013 21:45:54 -0400 Subject: [PATCH] window-actor: Remove unused description 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. --- src/compositor/meta-window-actor.c | 25 ------------------------- src/meta/meta-window-actor.h | 1 - 2 files changed, 26 deletions(-) diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index a0c6b52eb..9a48f3f72 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -70,8 +70,6 @@ struct _MetaWindowActorPrivate guint8 opacity; - gchar * desc; - /* A region that matches the shape of the window, including frame bounds */ cairo_region_t *shape_region; /* The opaque region, from _NET_WM_OPAQUE_REGION, intersected with @@ -322,9 +320,6 @@ window_decorated_notify (MetaWindow *mw, priv->damage = None; } - g_free (priv->desc); - priv->desc = NULL; - priv->xwindow = new_xwindow; /* @@ -456,7 +451,6 @@ meta_window_actor_finalize (GObject *object) MetaWindowActorPrivate *priv = self->priv; g_list_free_full (priv->frames, (GDestroyNotify) frame_data_free); - g_free (priv->desc); 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); } -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: * @self: #MetaWindowActor diff --git a/src/meta/meta-window-actor.h b/src/meta/meta-window-actor.h index 40657d4f2..ce6c64022 100644 --- a/src/meta/meta-window-actor.h +++ b/src/meta/meta-window-actor.h @@ -64,7 +64,6 @@ 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); -const char * meta_window_actor_get_description (MetaWindowActor *self); gboolean meta_window_actor_showing_on_its_workspace (MetaWindowActor *self); gboolean meta_window_actor_is_destroyed (MetaWindowActor *self);