From 98dbba1e17a93d4cd0fc2f6ca5a36aab08677c7d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 6 Dec 2013 17:18:56 -0500 Subject: window-actor: Remove meta-screen property This can be inferred from the window. Don't allow anybody to set it. https://bugzilla.gnome.org/show_bug.cgi?id=678989 --- src/compositor/meta-window-actor.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index c32afacc5..a2984311d 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -158,7 +158,6 @@ struct _FrameData enum { PROP_META_WINDOW = 1, - PROP_META_SCREEN, PROP_NO_SHADOW, PROP_SHADOW_CLASS }; @@ -233,15 +232,6 @@ meta_window_actor_class_init (MetaWindowActorClass *klass) PROP_META_WINDOW, pspec); - pspec = g_param_spec_pointer ("meta-screen", - "MetaScreen", - "MetaScreen", - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); - - g_object_class_install_property (object_class, - PROP_META_SCREEN, - pspec); - pspec = g_param_spec_boolean ("no-shadow", "No shadow", "Do not add shaddow to this window", @@ -353,12 +343,14 @@ meta_window_actor_constructed (GObject *object) { MetaWindowActor *self = META_WINDOW_ACTOR (object); MetaWindowActorPrivate *priv = self->priv; - MetaScreen *screen = priv->screen; - MetaDisplay *display = meta_screen_get_display (screen); MetaWindow *window = priv->window; Window xwindow = meta_window_get_toplevel_xwindow (window); + MetaScreen *screen = meta_window_get_screen (window); + MetaDisplay *display = meta_screen_get_display (screen); Display *xdisplay = meta_display_get_xdisplay (display); + priv->screen = screen; + if (!meta_is_wayland_compositor ()) priv->damage = XDamageCreate (xdisplay, xwindow, XDamageReportBoundingBox); @@ -502,9 +494,6 @@ meta_window_actor_set_property (GObject *object, priv->window = g_value_dup_object (value); } break; - case PROP_META_SCREEN: - priv->screen = g_value_get_pointer (value); - break; case PROP_NO_SHADOW: { gboolean newv = g_value_get_boolean (value); @@ -549,9 +538,6 @@ meta_window_actor_get_property (GObject *object, case PROP_META_WINDOW: g_value_set_object (value, priv->window); break; - case PROP_META_SCREEN: - g_value_set_pointer (value, priv->screen); - break; case PROP_NO_SHADOW: g_value_set_boolean (value, priv->no_shadow); break; @@ -1638,7 +1624,6 @@ meta_window_actor_new (MetaWindow *window) self = g_object_new (META_TYPE_WINDOW_ACTOR, "meta-window", window, - "meta-screen", screen, NULL); priv = self->priv; -- cgit v1.2.1