summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Keller <skeller@gnome.org>2023-01-14 17:48:33 +0100
committerFlorian Müllner <fmuellner@gnome.org>2023-03-19 23:25:04 +0100
commite0a9bab97037ec547aa6a53c846c45cd4f83d4c7 (patch)
tree7f9b6e715f6f93521e68beaa08ed1e1c8a0cc077
parentdac79fdceddb56293be39c087c68a36cf8cd6f37 (diff)
downloadmutter-e0a9bab97037ec547aa6a53c846c45cd4f83d4c7.tar.gz
clutter/text: Don't call clutter_text_set_buffer() on finalize
clutter_text_set_buffer() tries to freeze/thaw notify, which is not allowed during finalize and recent glib versions started warning about this. This call can simply be removed, because the buffer is already set to NULL on dispose, making the call in finalize redundant. Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2566 Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2790> (cherry picked from commit cff631cb39b1b9d66b791fb51a6f2c3db8e60917)
-rw-r--r--clutter/clutter/clutter-text.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/clutter/clutter/clutter-text.c b/clutter/clutter/clutter-text.c
index a294c4b73..ded041bd9 100644
--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -1826,7 +1826,6 @@ clutter_text_finalize (GObject *gobject)
clutter_text_free_paint_volume (self);
- clutter_text_set_buffer (self, NULL);
g_free (priv->font_name);
g_clear_object (&priv->input_focus);