From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 11 Jun 2023 11:12:52 +0000 (+0000)
Subject: Merge branch 'master' into 'main'
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~157
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=084b4361b62c8d8820093a5410adf6796fa85574;p=gtk4.git

Merge branch 'master' into 'main'

Reset chars_changed_stamp in _gtk_text_btree_unref

Closes #5544

See merge request GNOME/gtk!6087
---

084b4361b62c8d8820093a5410adf6796fa85574
diff --cc gtk/gtktextbtree.c
index 78f07bcffc,a625e86735..4166083967
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@@ -512,8 -512,9 +512,9 @@@ _gtk_text_btree_unref (GtkTextBTree *tr
        tree->insert_mark = NULL;
        g_object_unref (tree->selection_bound_mark);
        tree->selection_bound_mark = NULL;
+       tree->chars_changed_stamp = 0;
  
 -      g_slice_free (GtkTextBTree, tree);
 +      g_free (tree);
      }
  }