diff options
| author | Thomas Thurman <tthurman@gnome.org> | 2008-06-29 03:23:08 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-06-29 03:23:08 +0000 |
| commit | b3549979c6100d960c3fef6d50d001386b4f2b55 (patch) | |
| tree | 4dbab7c0db225e84a1d7dd5dfada8056e16ac985 /src | |
| parent | 6039694effc408f00fe580f4439aa79645dab147 (diff) | |
| download | metacity-b3549979c6100d960c3fef6d50d001386b4f2b55.tar.gz | |
add checks for HAVE_SHAPE where appropriate. fix type error which was
2008-06-28 Thomas Thurman <tthurman@gnome.org>
* src/core/display.c, src/compositor/compositor-xrender.c: add checks
for HAVE_SHAPE where appropriate.
* src/core/xprops.c: fix type error which was causing warnings.
svn path=/trunk/; revision=3772
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/compositor-xrender.c | 2 | ||||
| -rw-r--r-- | src/core/display.c | 2 | ||||
| -rw-r--r-- | src/core/xprops.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c index b128daf7..a85448db 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/compositor-xrender.c @@ -2802,8 +2802,10 @@ xrender_process_event (MetaCompositor *compositor, default: if (event->type == meta_display_get_damage_event_base (xrc->display) + XDamageNotify) process_damage (xrc, (XDamageNotifyEvent *) event); +#ifdef HAVE_SHAPE else if (event->type == meta_display_get_shape_event_base (xrc->display) + ShapeNotify) process_shape (xrc, (XShapeEvent *) event); +#endif /* HAVE_SHAPE */ else { meta_error_trap_pop (xrc->display, FALSE); diff --git a/src/core/display.c b/src/core/display.c index 5b9d76b3..613230ff 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -5166,9 +5166,11 @@ meta_display_get_damage_event_base (MetaDisplay *display) #endif #ifdef HAVE_COMPOSITE_EXTENSIONS +#ifdef HAVE_SHAPE int meta_display_get_shape_event_base (MetaDisplay *display) { return display->shape_event_base; } #endif +#endif diff --git a/src/core/xprops.c b/src/core/xprops.c index a3d7fcc0..d2edc55c 100644 --- a/src/core/xprops.c +++ b/src/core/xprops.c @@ -1051,7 +1051,7 @@ meta_prop_get_values (MetaDisplay *display, &results.type, &results.format, &results.n_items, &results.bytes_after, - (gchar **)&results.prop) != Success || + (unsigned char **)(&results.prop)) != Success || results.type == None) { values[i].type = META_PROP_VALUE_INVALID; |