isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed #ifdef SPIFFY_COMPOSITOR throughout the file. Replaced with check

Browse Source 
* 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:
Thomas James Alexander Thurman 2007-01-16 17:02:39 +00:00
parent 031b03513a
commit 5d9ccfac37
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2007-01-13 Bruno Boaventura <brunobol@gnome.org>
* src/frames.c (meta_frames_motion_notify_event): Unmaximize * src/frames.c (meta_frames_motion_notify_event): Unmaximize

8
src/compositor.c
View File

@ -112,7 +112,6 @@ get_xid (MetaWindow *window)
#ifdef HAVE_COMPOSITE_EXTENSIONS #ifdef HAVE_COMPOSITE_EXTENSIONS
#ifdef SPIFFY_COMPOSITOR
/* This is called by Metacity's effect code when an effect needs to happen. /* This is called by Metacity's effect code when an effect needs to happen.
* In compositor-less Metacity, this includes things like the wireframe * In compositor-less Metacity, this includes things like the wireframe
* zoom when a window is minimised. We have a rather larger box of tricks. * zoom when a window is minimised. We have a rather larger box of tricks.
@ -168,7 +167,6 @@ do_effect (MetaEffect *effect,
break; break;
} }
} }
#endif /* SPIFFY_COMPOSITOR */
#endif /* HAVE_COMPOSITE_EXTENSIONS */ #endif /* HAVE_COMPOSITE_EXTENSIONS */
@ -219,9 +217,11 @@ meta_compositor_new (MetaDisplay *display)
compositor->enabled = TRUE; compositor->enabled = TRUE;
#ifdef SPIFFY_COMPOSITOR /* 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); meta_push_effect_handler (do_effect, compositor);
#endif
return compositor; return compositor;
#else /* HAVE_COMPOSITE_EXTENSIONS */ #else /* HAVE_COMPOSITE_EXTENSIONS */