From 3a7e75e8b39d351806199765afb1287516869df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Mon, 30 Dec 2024 16:03:15 +0100 Subject: [PATCH] compositor: Use g_warning() instead of meta_warning() Part-of: --- src/compositor/meta-background.c | 2 +- src/compositor/meta-sync-ring.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c index 37e61e4f9..34c6f3a11 100644 --- a/src/compositor/meta-background.c +++ b/src/compositor/meta-background.c @@ -597,7 +597,7 @@ ensure_color_texture (MetaBackground *self) if (error != NULL) { - meta_warning ("Failed to allocate color texture: %s", error->message); + g_warning ("Failed to allocate color texture: %s", error->message); g_error_free (error); } } diff --git a/src/compositor/meta-sync-ring.c b/src/compositor/meta-sync-ring.c index 2cd929edd..056471887 100644 --- a/src/compositor/meta-sync-ring.c +++ b/src/compositor/meta-sync-ring.c @@ -491,7 +491,7 @@ meta_sync_ring_reboot (CoglContext *ctx, if (!meta_sync_ring_get ()) { - meta_warning ("MetaSyncRing: Too many reboots -- disabling"); + g_warning ("MetaSyncRing: Too many reboots -- disabling"); return FALSE; } @@ -516,13 +516,13 @@ meta_sync_ring_after_frame (CoglContext *ctx) GLenum status = meta_sync_check_update_finished (sync_to_reset, 0); if (status == GL_TIMEOUT_EXPIRED) { - meta_warning ("MetaSyncRing: We should never wait for a sync -- add more syncs?"); + g_warning ("MetaSyncRing: We should never wait for a sync -- add more syncs?"); status = meta_sync_check_update_finished (sync_to_reset, MAX_SYNC_WAIT_TIME); } if (status != GL_ALREADY_SIGNALED && status != GL_CONDITION_SATISFIED) { - meta_warning ("MetaSyncRing: Timed out waiting for sync object."); + g_warning ("MetaSyncRing: Timed out waiting for sync object."); return meta_sync_ring_reboot (ctx, ring->xdisplay); } @@ -562,7 +562,7 @@ meta_sync_ring_insert_wait (CoglContext *ctx) } else if (sync->state != META_SYNC_STATE_READY) { - meta_warning ("MetaSyncRing: Sync object is not ready -- were events handled properly?"); + g_warning ("MetaSyncRing: Sync object is not ready -- were events handled properly?"); if (!meta_sync_ring_reboot (ctx, ring->xdisplay)) return FALSE; }