From 6e085b3bf136997e27f69ab7eb45fdf83037f536 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Sat, 16 Jun 2018 18:23:56 +0000 Subject: [PATCH] Pass the correct data to gdk_content_register_serializer() The argument is eventually passed to g_conv(), so it should be the charset, not the mime/type. Without this change the contentype converter will fail to convert UTF-8 strings to, say, CP-1251 later on. --- gdk/gdkcontentserializer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdk/gdkcontentserializer.c b/gdk/gdkcontentserializer.c index 92cbb2df6b..7b99690224 100644 --- a/gdk/gdkcontentserializer.c +++ b/gdk/gdkcontentserializer.c @@ -895,8 +895,8 @@ init (void) gdk_content_register_serializer (G_TYPE_STRING, mime, string_serializer, - mime, - g_free); + (gpointer) charset, + NULL); } gdk_content_register_serializer (G_TYPE_STRING, "text/plain", -- 2.30.2