From: Руслан Ижбулатов <lrn1986@gmail.com>
Date: Sat, 16 Jun 2018 18:23:56 +0000 (+0000)
Subject: Pass the correct data to gdk_content_register_serializer()
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~133^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6e085b3bf136997e27f69ab7eb45fdf83037f536;p=gtk4.git

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.
---

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",