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

make sure compositor things don't get compiled when we're not using the

Browse Source 
2008-06-02  Thomas Thurman  <tthurman@gnome.org>

        * src/core/display.c: make sure compositor things don't get
        compiled when we're not using the compositor.


svn path=/trunk/; revision=3748
This commit is contained in:
Thomas Thurman 2008-06-02 22:27:54 +00:00 committed by Thomas James Alexander Thurman
parent 327e3cb6b5
commit a8c5c002fb
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-02 Thomas Thurman <tthurman@gnome.org>
* src/core/display.c: make sure compositor things don't get
compiled when we're not using the compositor.
2008-06-02 Thomas Thurman <tthurman@gnome.org> 2008-06-02 Thomas Thurman <tthurman@gnome.org>
* test/metacity-test: new test script, imported from * test/metacity-test: new test script, imported from

6
src/core/display.c
View File

@ -5116,6 +5116,7 @@ meta_display_remove_autoraise_callback (MetaDisplay *display)
} }
} }
#ifdef HAVE_COMPOSITE_EXTENSIONS
void void
meta_display_get_compositor_version (MetaDisplay *display, meta_display_get_compositor_version (MetaDisplay *display,
int *major, int *major,
@ -5124,6 +5125,7 @@ meta_display_get_compositor_version (MetaDisplay *display,
*major = display->composite_major_version; *major = display->composite_major_version;
*minor = display->composite_minor_version; *minor = display->composite_minor_version;
} }
#endif
Display * Display *
meta_display_get_xdisplay (MetaDisplay *display) meta_display_get_xdisplay (MetaDisplay *display)
@ -5155,14 +5157,18 @@ meta_display_get_focus_window (MetaDisplay *display)
return display->focus_window; return display->focus_window;
} }
#ifdef HAVE_COMPOSITE_EXTENSIONS
int int
meta_display_get_damage_event_base (MetaDisplay *display) meta_display_get_damage_event_base (MetaDisplay *display)
{ {
return display->damage_event_base; return display->damage_event_base;
} }
#endif
#ifdef HAVE_COMPOSITE_EXTENSIONS
int int
meta_display_get_shape_event_base (MetaDisplay *display) meta_display_get_shape_event_base (MetaDisplay *display)
{ {
return display->shape_event_base; return display->shape_event_base;
} }
#endif