diff options
| author | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2007-01-16 17:02:39 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2007-01-16 17:02:39 +0000 |
| commit | 5d9ccfac375f9b6d75a53bfb0b0c11c4dd9796b5 (patch) | |
| tree | 3246daf453ea399c1778c854d62bcec7fa4dbd19 | |
| parent | 031b03513a73fd129227bc6d1ae87bc1b19a1f99 (diff) | |
| download | metacity-5d9ccfac375f9b6d75a53bfb0b0c11c4dd9796b5.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/compositor.c | 10 |
2 files changed, 11 insertions, 5 deletions
@@ -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 diff --git a/src/compositor.c b/src/compositor.c index fda6dcbf..26f2425c 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -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 */ |