mirror of
https://github.com/brl/mutter.git
synced 2024-11-21 15:40:41 -05:00
Removed #ifdef SPIFFY_COMPOSITOR throughout the file. Replaced with check
* src/compositor.c (meta_compositor_new): Removed #ifdef SPIFFY_COMPOSITOR throughout the file. Replaced with check for environment variable METACITY_BLING, which may be temporary. svn path=/trunk/; revision=3042
This commit is contained in:
parent
031b03513a
commit
5d9ccfac37
@ -1,3 +1,9 @@
|
||||
2007-01-16 Thomas Thurman <thomas@thurman.org.uk>
|
||||
|
||||
* src/compositor.c (meta_compositor_new): Removed
|
||||
#ifdef SPIFFY_COMPOSITOR throughout the file. Replaced with check
|
||||
for environment variable METACITY_BLING, which may be temporary.
|
||||
|
||||
2007-01-13 Bruno Boaventura <brunobol@gnome.org>
|
||||
|
||||
* src/frames.c (meta_frames_motion_notify_event): Unmaximize
|
||||
|
@ -112,7 +112,6 @@ get_xid (MetaWindow *window)
|
||||
|
||||
#ifdef HAVE_COMPOSITE_EXTENSIONS
|
||||
|
||||
#ifdef SPIFFY_COMPOSITOR
|
||||
/* This is called by Metacity's effect code when an effect needs to happen.
|
||||
* In compositor-less Metacity, this includes things like the wireframe
|
||||
* zoom when a window is minimised. We have a rather larger box of tricks.
|
||||
@ -168,7 +167,6 @@ do_effect (MetaEffect *effect,
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif /* SPIFFY_COMPOSITOR */
|
||||
|
||||
#endif /* HAVE_COMPOSITE_EXTENSIONS */
|
||||
|
||||
@ -219,9 +217,11 @@ meta_compositor_new (MetaDisplay *display)
|
||||
|
||||
compositor->enabled = TRUE;
|
||||
|
||||
#ifdef SPIFFY_COMPOSITOR
|
||||
meta_push_effect_handler (do_effect, compositor);
|
||||
#endif
|
||||
/* Compositor without bling is the default, but leave the bling
|
||||
* accessible for now.
|
||||
*/
|
||||
if (getenv("METACITY_BLING")!=NULL)
|
||||
meta_push_effect_handler (do_effect, compositor);
|
||||
|
||||
return compositor;
|
||||
#else /* HAVE_COMPOSITE_EXTENSIONS */
|
||||
|
Loading…
Reference in New Issue
Block a user