brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Use g_warning() instead of meta_warning()

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4005>
This commit is contained in:
Jonas Ådahl 2024-12-30 16:03:15 +01:00 committed by Marge Bot
parent 8b9dbc58f8
commit 3a7e75e8b3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compositor/meta-background.c
View File

@ -597,7 +597,7 @@ ensure_color_texture (MetaBackground *self)
if (error != NULL) 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); g_error_free (error);
} }
} }

8
src/compositor/meta-sync-ring.c
View File

@ -491,7 +491,7 @@ meta_sync_ring_reboot (CoglContext *ctx,
if (!meta_sync_ring_get ()) if (!meta_sync_ring_get ())
{ {
meta_warning ("MetaSyncRing: Too many reboots -- disabling"); g_warning ("MetaSyncRing: Too many reboots -- disabling");
return FALSE; return FALSE;
} }
@ -516,13 +516,13 @@ meta_sync_ring_after_frame (CoglContext *ctx)
GLenum status = meta_sync_check_update_finished (sync_to_reset, 0); GLenum status = meta_sync_check_update_finished (sync_to_reset, 0);
if (status == GL_TIMEOUT_EXPIRED) 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); status = meta_sync_check_update_finished (sync_to_reset, MAX_SYNC_WAIT_TIME);
} }
if (status != GL_ALREADY_SIGNALED && status != GL_CONDITION_SATISFIED) 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); 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) 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)) if (!meta_sync_ring_reboot (ctx, ring->xdisplay))
return FALSE; return FALSE;
} }