AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-10 12:40:10 +00:00
Code Issues Projects Releases Wiki Activity

contentdeserializer: Don't initialize needlessly

Browse Source 
Avoid initalizing the deserializers for an empty content formats.

This is relevant under X11, where we for some reason claim the
clipboard with no formats during display opening.
This commit is contained in:
Matthias Clasen 2024-11-20 16:35:34 -05:00
parent 608ef5ddf0
commit 6cadd81503
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gdk/gdkcontentdeserializer.c
View File

@ -462,17 +462,20 @@ gdk_content_formats_union_deserialize_gtypes (GdkContentFormats *formats)
g_return_val_if_fail (formats != NULL, NULL);
init ();
builder = gdk_content_formats_builder_new ();
gdk_content_formats_builder_add_formats (builder, formats);
for (l = g_queue_peek_head_link (&deserializers); l; l = l->next)
if (!gdk_content_formats_is_empty (formats))
{
Deserializer *deserializer = l->data;
init ();
if (gdk_content_formats_contain_mime_type (formats, deserializer->mime_type))
gdk_content_formats_builder_add_gtype (builder, deserializer->type);
for (l = g_queue_peek_head_link (&deserializers); l; l = l->next)
{
Deserializer *deserializer = l->data;
if (gdk_content_formats_contain_mime_type (formats, deserializer->mime_type))
gdk_content_formats_builder_add_gtype (builder, deserializer->type);
}
}
gdk_content_formats_unref (formats);
@ -497,17 +500,20 @@ gdk_content_formats_union_deserialize_mime_types (GdkContentFormats *formats)
g_return_val_if_fail (formats != NULL, NULL);
init ();
builder = gdk_content_formats_builder_new ();
gdk_content_formats_builder_add_formats (builder, formats);
for (l = g_queue_peek_head_link (&deserializers); l; l = l->next)
if (!gdk_content_formats_is_empty (formats))
{
Deserializer *deserializer = l->data;
init ();
if (gdk_content_formats_contain_gtype (formats, deserializer->type))
gdk_content_formats_builder_add_mime_type (builder, deserializer->mime_type);
for (l = g_queue_peek_head_link (&deserializers); l; l = l->next)
{
Deserializer *deserializer = l->data;
if (gdk_content_formats_contain_gtype (formats, deserializer->type))
gdk_content_formats_builder_add_mime_type (builder, deserializer->mime_type);
}
}
gdk_content_formats_unref (formats);