Pass the correct data to gdk_content_register_serializer()
authorРуслан Ижбулатов <lrn1986@gmail.com>
Sat, 16 Jun 2018 18:23:56 +0000 (18:23 +0000)
committerРуслан Ижбулатов <lrn1986@gmail.com>
Sat, 16 Jun 2018 18:23:56 +0000 (18:23 +0000)
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

index 92cbb2df6b68c0e7d3a011bc134dca3ebb50e518..7b99690224b456a482d32946fe271d4486670e80 100644 (file)
@@ -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",