From d4317ba1e4a16bbdb9182afff42d47fd9612cec8 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 3 Sep 2014 11:03:17 -0700 Subject: [PATCH] background: Fix build These warnings weren't properly working on Owen's machine, so they went unchecked. --- src/compositor/meta-background-image.c | 4 ++-- src/compositor/meta-background.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/compositor/meta-background-image.c b/src/compositor/meta-background-image.c index dff315404..1f32f98e2 100644 --- a/src/compositor/meta-background-image.c +++ b/src/compositor/meta-background-image.c @@ -246,8 +246,8 @@ meta_background_image_cache_purge (MetaBackgroundImageCache *cache, { MetaBackgroundImage *image; - g_return_val_if_fail (META_IS_BACKGROUND_IMAGE_CACHE (cache), NULL); - g_return_val_if_fail (filename != NULL, NULL); + g_return_if_fail (META_IS_BACKGROUND_IMAGE_CACHE (cache)); + g_return_if_fail (filename != NULL); image = g_hash_table_lookup (cache->images, filename); if (image == NULL) diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c index bc1a0f978..938ef6a66 100644 --- a/src/compositor/meta-background.c +++ b/src/compositor/meta-background.c @@ -677,9 +677,9 @@ meta_background_get_texture (MetaBackground *self, cairo_rectangle_int_t monitor_area; CoglTexture *texture1, *texture2; - g_return_if_fail (META_IS_BACKGROUND (self)); + g_return_val_if_fail (META_IS_BACKGROUND (self), NULL); priv = self->priv; - g_return_if_fail (monitor_index <= 0 && monitor_index < priv->n_monitors); + g_return_val_if_fail (monitor_index <= 0 && monitor_index < priv->n_monitors, NULL); monitor = &priv->monitors[monitor_index];