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

Use paint volumes unconditionally

Browse Source 
As we depend on clutter 1.7.x we no longer need to the 1.5.2
version check for paint volumes so just remove it.

https://bugzilla.gnome.org/show_bug.cgi?id=654730
This commit is contained in:
Adel Gadllah 2011-07-16 13:32:12 +02:00
parent a6d08fcd71
commit 3da2f876bd
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compositor/meta-background-actor.c
View File

@ -233,7 +233,6 @@ meta_background_actor_paint (ClutterActor *actor)
} }
} }
#if CLUTTER_CHECK_VERSION(1, 5, 2)
static gboolean static gboolean
meta_background_actor_get_paint_volume (ClutterActor *actor, meta_background_actor_get_paint_volume (ClutterActor *actor,
ClutterPaintVolume *volume) ClutterPaintVolume *volume)
@ -248,7 +247,6 @@ meta_background_actor_get_paint_volume (ClutterActor *actor,
return TRUE; return TRUE;
} }
#endif
static void static void
meta_background_actor_class_init (MetaBackgroundActorClass *klass) meta_background_actor_class_init (MetaBackgroundActorClass *klass)
@ -261,9 +259,7 @@ meta_background_actor_class_init (MetaBackgroundActorClass *klass)
actor_class->get_preferred_width = meta_background_actor_get_preferred_width; actor_class->get_preferred_width = meta_background_actor_get_preferred_width;
actor_class->get_preferred_height = meta_background_actor_get_preferred_height; actor_class->get_preferred_height = meta_background_actor_get_preferred_height;
actor_class->paint = meta_background_actor_paint; actor_class->paint = meta_background_actor_paint;
#if CLUTTER_CHECK_VERSION(1, 5, 2)
actor_class->get_paint_volume = meta_background_actor_get_paint_volume; actor_class->get_paint_volume = meta_background_actor_get_paint_volume;
#endif
} }
static void static void

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

@ -142,10 +142,10 @@ static void meta_window_actor_get_property (GObject *object,
GParamSpec *pspec); GParamSpec *pspec);
static void meta_window_actor_paint (ClutterActor *actor); static void meta_window_actor_paint (ClutterActor *actor);
#if CLUTTER_CHECK_VERSION(1, 5, 2)
static gboolean meta_window_actor_get_paint_volume (ClutterActor *actor, static gboolean meta_window_actor_get_paint_volume (ClutterActor *actor,
ClutterPaintVolume *volume); ClutterPaintVolume *volume);
#endif
static void meta_window_actor_detach (MetaWindowActor *self); static void meta_window_actor_detach (MetaWindowActor *self);
static gboolean meta_window_actor_has_shadow (MetaWindowActor *self); static gboolean meta_window_actor_has_shadow (MetaWindowActor *self);
@ -220,9 +220,7 @@ meta_window_actor_class_init (MetaWindowActorClass *klass)
object_class->constructed = meta_window_actor_constructed; object_class->constructed = meta_window_actor_constructed;
actor_class->paint = meta_window_actor_paint; actor_class->paint = meta_window_actor_paint;
#if CLUTTER_CHECK_VERSION(1, 5, 2)
actor_class->get_paint_volume = meta_window_actor_get_paint_volume; actor_class->get_paint_volume = meta_window_actor_get_paint_volume;
#endif
pspec = g_param_spec_object ("meta-window", pspec = g_param_spec_object ("meta-window",
"MetaWindow", "MetaWindow",
@ -679,7 +677,6 @@ meta_window_actor_get_shape_bounds (MetaWindowActor *self,
bounds->x = bounds->y = bounds->width = bounds->height = 0; bounds->x = bounds->y = bounds->width = bounds->height = 0;
} }
#if CLUTTER_CHECK_VERSION(1, 5, 2)
static void static void
meta_window_actor_get_shadow_bounds (MetaWindowActor *self, meta_window_actor_get_shadow_bounds (MetaWindowActor *self,
gboolean appears_focused, gboolean appears_focused,
@ -700,7 +697,6 @@ meta_window_actor_get_shadow_bounds (MetaWindowActor *self,
shape_bounds.height, shape_bounds.height,
bounds); bounds);
} }
#endif
/* If we have an ARGB32 window that we decorate with a frame, it's /* If we have an ARGB32 window that we decorate with a frame, it's
* probably something like a translucent terminal - something where * probably something like a translucent terminal - something where
@ -769,7 +765,6 @@ meta_window_actor_paint (ClutterActor *actor)
CLUTTER_ACTOR_CLASS (meta_window_actor_parent_class)->paint (actor); CLUTTER_ACTOR_CLASS (meta_window_actor_parent_class)->paint (actor);
} }
#if CLUTTER_CHECK_VERSION(1, 5, 2)
static gboolean static gboolean
meta_window_actor_get_paint_volume (ClutterActor *actor, meta_window_actor_get_paint_volume (ClutterActor *actor,
ClutterPaintVolume *volume) ClutterPaintVolume *volume)
@ -811,7 +806,6 @@ meta_window_actor_get_paint_volume (ClutterActor *actor,
return TRUE; return TRUE;
} }
#endif /* CLUTTER_CHECK_VERSION */
static gboolean static gboolean
is_shaped (MetaDisplay *display, Window xwindow) is_shaped (MetaDisplay *display, Window xwindow)