metacity r3748 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Mon Jun  2 22:27:54 2008
New Revision: 3748
URL: http://svn.gnome.org/viewvc/metacity?rev=3748&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/src/core/display.c

Modified: trunk/src/core/display.c
==============================================================================
--- trunk/src/core/display.c	(original)
+++ trunk/src/core/display.c	Mon Jun  2 22:27:54 2008
@@ -5116,6 +5116,7 @@
     }
 }
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
 void
 meta_display_get_compositor_version (MetaDisplay *display,
                                      int         *major,
@@ -5124,6 +5125,7 @@
   *major = display->composite_major_version;
   *minor = display->composite_minor_version;
 }
+#endif
 
 Display *
 meta_display_get_xdisplay (MetaDisplay *display)
@@ -5155,14 +5157,18 @@
   return display->focus_window;
 }
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
 int 
 meta_display_get_damage_event_base (MetaDisplay *display)
 {
   return display->damage_event_base;
 }
+#endif
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
 int
 meta_display_get_shape_event_base (MetaDisplay *display)
 {
   return display->shape_event_base;
 }
+#endif