Merge branch 'matthiasc/for-main' into 'main'

Use pango api better See merge request GNOME/gtk!4412
2022-01-23 15:19:39 +00:00 · 2022-01-23 15:19:39 +00:00 · 7b02498963
commit 7b02498963
parent fefc8b5a82 6fd53f28f3
1 changed files with 3 additions and 1 deletions
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@ -50,7 +50,9 @@ append_n_lines (GString *str, const char *text, GSList *lines, int n_lines)
  for (i = 0; i < n_lines; i++)
    {
      line = lines->data;
-      g_string_append_len (str, &text[line->start_index], line->length);
+      g_string_append_len (str,
+                           &text[pango_layout_line_get_start_index (line)],
+                           pango_layout_line_get_length (line));
      lines = lines->next;
    }
 }