diff options
| author | Iain Holmes <iain@src.gnome.org> | 2007-12-18 11:23:53 +0000 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2007-12-18 11:23:53 +0000 |
| commit | 2c1a45ff1df55cb0454d59702c585b793e2c80db (patch) | |
| tree | 23516fab36cf7b13305b7a3d1bee2c89f4cb81d9 | |
| parent | fb081a65c5c9a32e696319e4e0a47014f2d658de (diff) | |
| download | metacity-2c1a45ff1df55cb0454d59702c585b793e2c80db.tar.gz | |
Fix a typo in the display macros
Apply patch from michael to check for required extensions before
enabling the compositor
svn path=/branches/iains-blingtastic-bucket-o-bling/; revision=3478
| -rw-r--r-- | src/display.c | 12 | ||||
| -rw-r--r-- | src/display.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/display.c b/src/display.c index e0a9af3e..3cd9065a 100644 --- a/src/display.c +++ b/src/display.c @@ -196,6 +196,18 @@ enable_compositor (MetaDisplay *display, { GSList *list; + if (!META_DISPLAY_HAS_COMPOSITE (display) || + !META_DISPLAY_HAS_DAMAGE (display) || + !META_DISPLAY_HAS_XFIXES (display) || + !META_DISPLAY_HAS_RENDER (display)) + { + meta_warning (_("Missing %s extension required for compositing"), + !META_DISPLAY_HAS_COMPOSITE (display) ? "composite" : + !META_DISPLAY_HAS_DAMAGE (display) ? "damage" : + !META_DISPLAY_HAS_XFIXES (display) ? "xfixes" : "render"); + return; + } + if (!display->compositor) display->compositor = meta_compositor_new (display); diff --git a/src/display.h b/src/display.h index 24af571f..ed889923 100644 --- a/src/display.h +++ b/src/display.h @@ -386,7 +386,7 @@ struct _MetaDisplay unsigned int have_xfixes : 1; #define META_DISPLAY_HAS_COMPOSITE(display) ((display)->have_composite) #define META_DISPLAY_HAS_DAMAGE(display) ((display)->have_damage) -#define META_DISPLAY_HAS_XFIXES(display) ((display)->have_fixes) +#define META_DISPLAY_HAS_XFIXES(display) ((display)->have_xfixes) #else #define META_DISPLAY_HAS_COMPOSITE(display) FALSE #define META_DISPLAY_HAS_DAMAGE(display) FALSE |