From 61bb9bb935519fb9383289ff81ee9375fd3edaa8 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 8 May 2022 05:49:40 +0200 Subject: [PATCH 1/2] listitemmanager: Clarify warning Lars doesn't have an opinion on this problem anymore. And when people see this warning, they should know what to do. --- gtk/gtklistitemmanager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtklistitemmanager.c b/gtk/gtklistitemmanager.c index bfc6860293..004b09cf56 100644 --- a/gtk/gtklistitemmanager.c +++ b/gtk/gtklistitemmanager.c @@ -1074,7 +1074,7 @@ gtk_list_item_manager_release_list_item (GtkListItemManager *self, { if (!g_hash_table_replace (change, gtk_list_item_widget_get_item (GTK_LIST_ITEM_WIDGET (item)), item)) { - g_warning ("FIXME: Handle the same item multiple times in the list.\nLars says this totally should not happen, but here we are."); + g_warning ("Duplicate item detected in list. Picking one randomly."); } return; From 926eb161f804607cc658932492492914861f103b Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 14 May 2022 16:53:22 +0200 Subject: [PATCH 2/2] broadway: Fix gcc 12 complaining --- gdk/broadway/broadway-protocol.h | 1 + gdk/broadway/broadwayd.c | 32 ++++++++++++++------------------ 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/gdk/broadway/broadway-protocol.h b/gdk/broadway/broadway-protocol.h index 9b56dff6df..23a253aadf 100644 --- a/gdk/broadway/broadway-protocol.h +++ b/gdk/broadway/broadway-protocol.h @@ -354,6 +354,7 @@ typedef struct { typedef union { BroadwayReplyBase base; + BroadwayReplySync sync; BroadwayReplyEvent event; BroadwayReplyQueryMouse query_mouse; BroadwayReplyNewSurface new_surface; diff --git a/gdk/broadway/broadwayd.c b/gdk/broadway/broadwayd.c index 9cfa48f138..3d8c69d09c 100644 --- a/gdk/broadway/broadwayd.c +++ b/gdk/broadway/broadwayd.c @@ -219,11 +219,7 @@ static void client_handle_request (BroadwayClient *client, BroadwayRequest *request) { - BroadwayReplyNewSurface reply_new_surface; - BroadwayReplySync reply_sync; - BroadwayReplyQueryMouse reply_query_mouse; - BroadwayReplyGrabPointer reply_grab_pointer; - BroadwayReplyUngrabPointer reply_ungrab_pointer; + BroadwayReply reply; guint32 before_serial, now_serial; guint32 global_id; int fd; @@ -233,7 +229,7 @@ client_handle_request (BroadwayClient *client, switch (request->base.type) { case BROADWAY_REQUEST_NEW_SURFACE: - reply_new_surface.id = + reply.new_surface.id = broadway_server_new_surface (server, client->id, request->new_surface.x, request->new_surface.y, @@ -241,9 +237,9 @@ client_handle_request (BroadwayClient *client, request->new_surface.height); client->surfaces = g_list_prepend (client->surfaces, - GUINT_TO_POINTER (reply_new_surface.id)); + GUINT_TO_POINTER (reply.new_surface.id)); - send_reply (client, request, (BroadwayReply *)&reply_new_surface, sizeof (reply_new_surface), + send_reply (client, request, &reply, sizeof (reply.new_surface), BROADWAY_REPLY_NEW_SURFACE); break; case BROADWAY_REQUEST_FLUSH: @@ -251,7 +247,7 @@ client_handle_request (BroadwayClient *client, break; case BROADWAY_REQUEST_SYNC: broadway_server_flush (server); - send_reply (client, request, (BroadwayReply *)&reply_sync, sizeof (reply_sync), + send_reply (client, request, &reply, sizeof (reply.sync), BROADWAY_REPLY_SYNC); break; case BROADWAY_REQUEST_ROUNDTRIP: @@ -261,11 +257,11 @@ client_handle_request (BroadwayClient *client, break; case BROADWAY_REQUEST_QUERY_MOUSE: broadway_server_query_mouse (server, - &reply_query_mouse.surface, - &reply_query_mouse.root_x, - &reply_query_mouse.root_y, - &reply_query_mouse.mask); - send_reply (client, request, (BroadwayReply *)&reply_query_mouse, sizeof (reply_query_mouse), + &reply.query_mouse.surface, + &reply.query_mouse.root_x, + &reply.query_mouse.root_y, + &reply.query_mouse.mask); + send_reply (client, request, &reply, sizeof (reply.query_mouse), BROADWAY_REPLY_QUERY_MOUSE); break; case BROADWAY_REQUEST_DESTROY_SURFACE: @@ -361,21 +357,21 @@ client_handle_request (BroadwayClient *client, request->move_resize.height); break; case BROADWAY_REQUEST_GRAB_POINTER: - reply_grab_pointer.status = + reply.grab_pointer.status = broadway_server_grab_pointer (server, client->id, request->grab_pointer.id, request->grab_pointer.owner_events, request->grab_pointer.event_mask, request->grab_pointer.time_); - send_reply (client, request, (BroadwayReply *)&reply_grab_pointer, sizeof (reply_grab_pointer), + send_reply (client, request, &reply, sizeof (reply.grab_pointer), BROADWAY_REPLY_GRAB_POINTER); break; case BROADWAY_REQUEST_UNGRAB_POINTER: - reply_ungrab_pointer.status = + reply.ungrab_pointer.status = broadway_server_ungrab_pointer (server, request->ungrab_pointer.time_); - send_reply (client, request, (BroadwayReply *)&reply_ungrab_pointer, sizeof (reply_ungrab_pointer), + send_reply (client, request, &reply, sizeof (reply.ungrab_pointer), BROADWAY_REPLY_UNGRAB_POINTER); break; case BROADWAY_REQUEST_FOCUS_SURFACE: