brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window-actor: Remove meta-screen property

Browse Source 
This can be inferred from the window. Don't allow anybody to set it.

https://bugzilla.gnome.org/show_bug.cgi?id=678989
This commit is contained in:
Jasper St. Pierre 2013-12-06 17:18:56 -05:00
parent 422648e2eb
commit 98dbba1e17
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,6 @@ struct _FrameData
enum enum
{ {
PROP_META_WINDOW = 1, PROP_META_WINDOW = 1,
PROP_META_SCREEN,
PROP_NO_SHADOW, PROP_NO_SHADOW,
PROP_SHADOW_CLASS PROP_SHADOW_CLASS
}; };
@ -233,15 +232,6 @@ meta_window_actor_class_init (MetaWindowActorClass *klass)
PROP_META_WINDOW, PROP_META_WINDOW,
pspec); 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", pspec = g_param_spec_boolean ("no-shadow",
"No shadow", "No shadow",
"Do not add shaddow to this window", "Do not add shaddow to this window",
@ -353,12 +343,14 @@ meta_window_actor_constructed (GObject *object)
{ {
MetaWindowActor *self = META_WINDOW_ACTOR (object); MetaWindowActor *self = META_WINDOW_ACTOR (object);
MetaWindowActorPrivate *priv = self->priv; MetaWindowActorPrivate *priv = self->priv;
MetaScreen *screen = priv->screen;
MetaDisplay *display = meta_screen_get_display (screen);
MetaWindow *window = priv->window; MetaWindow *window = priv->window;
Window xwindow = meta_window_get_toplevel_xwindow (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); Display *xdisplay = meta_display_get_xdisplay (display);
priv->screen = screen;
if (!meta_is_wayland_compositor ()) if (!meta_is_wayland_compositor ())
priv->damage = XDamageCreate (xdisplay, xwindow, priv->damage = XDamageCreate (xdisplay, xwindow,
XDamageReportBoundingBox); XDamageReportBoundingBox);
@ -502,9 +494,6 @@ meta_window_actor_set_property (GObject *object,
priv->window = g_value_dup_object (value); priv->window = g_value_dup_object (value);
} }
break; break;
case PROP_META_SCREEN:
priv->screen = g_value_get_pointer (value);
break;
case PROP_NO_SHADOW: case PROP_NO_SHADOW:
{ {
gboolean newv = g_value_get_boolean (value); gboolean newv = g_value_get_boolean (value);
@ -549,9 +538,6 @@ meta_window_actor_get_property (GObject *object,
case PROP_META_WINDOW: case PROP_META_WINDOW:
g_value_set_object (value, priv->window); g_value_set_object (value, priv->window);
break; break;
case PROP_META_SCREEN:
g_value_set_pointer (value, priv->screen);
break;
case PROP_NO_SHADOW: case PROP_NO_SHADOW:
g_value_set_boolean (value, priv->no_shadow); g_value_set_boolean (value, priv->no_shadow);
break; break;
@ -1638,7 +1624,6 @@ meta_window_actor_new (MetaWindow *window)
self = g_object_new (META_TYPE_WINDOW_ACTOR, self = g_object_new (META_TYPE_WINDOW_ACTOR,
"meta-window", window, "meta-window", window,
"meta-screen", screen,
NULL); NULL);
priv = self->priv; priv = self->priv;