From c0e44107767ea366053ef6391d8574a5f6ab6a00 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Sun, 29 Oct 2023 10:28:27 +0100
Subject: Update libdecor to commit c6c780c1 dated 2023-10-10

---
 libdecor/src/plugins/gtk/libdecor-gtk.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'libdecor/src')

diff --git a/libdecor/src/plugins/gtk/libdecor-gtk.c b/libdecor/src/plugins/gtk/libdecor-gtk.c
index bc8290f14..c510bc595 100644
--- a/libdecor/src/plugins/gtk/libdecor-gtk.c
+++ b/libdecor/src/plugins/gtk/libdecor-gtk.c
@@ -2548,15 +2548,12 @@ init_wl_seat(struct libdecor_plugin_gtk *plugin_gtk,
 	struct seat *seat;
 
 	if (version < 3) {
-		char *err_msg;
-		asprintf(&err_msg,
-			 "%s version 3 required but only version %i is available\n",
-			 wl_seat_interface.name, version);
 		libdecor_notify_plugin_error(
 				plugin_gtk->context,
 				LIBDECOR_ERROR_COMPOSITOR_INCOMPATIBLE,
-				err_msg);
-		free(err_msg);
+				"%s version 3 required but only version %i is available\n",
+				wl_seat_interface.name,
+				version);
 	}
 
 	seat = zalloc(sizeof *seat);
@@ -2640,15 +2637,12 @@ init_wl_output(struct libdecor_plugin_gtk *plugin_gtk,
 	struct output *output;
 
 	if (version < 2) {
-		char *err_msg;
-		asprintf(&err_msg,
-			 "%s version 2 required but only version %i is available\n",
-			 wl_output_interface.name, version);
 		libdecor_notify_plugin_error(
 				plugin_gtk->context,
 				LIBDECOR_ERROR_COMPOSITOR_INCOMPATIBLE,
-				err_msg);
-		free(err_msg);
+				"%s version 2 required but only version %i is available\n",
+				wl_output_interface.name,
+				version);
 	}
 
 	output = zalloc(sizeof *output);
@@ -2814,6 +2808,8 @@ libdecor_plugin_new(struct libdecor *context)
 
 	/* setup GTK context */
 	gdk_set_allowed_backends("wayland");
+	gtk_disable_setlocale();
+
 	if (!gtk_init_check(NULL, NULL)) {
 		libdecor_notify_plugin_error(
 				plugin_gtk->context,
-- 
cgit v1.2.3