diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-04-29 01:15:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-04-29 01:15:58 +0000 |
| commit | d1a25178fdda26946441cbc733bdd51d431a5c39 (patch) | |
| tree | 03aa64d3ec35d2310e4ba6365b448dddb01c8526 | |
| parent | 0da4a92298148fe2614758e5aabee58b1c1b1534 (diff) | |
| parent | 092745161c701e054b60e1c15893ea5240c87155 (diff) | |
| download | gtk+-d1a25178fdda26946441cbc733bdd51d431a5c39.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
shortcutswindow: Avoid criticals
See merge request GNOME/gtk!5885
| -rw-r--r-- | gtk/gtkshortcutlabel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c index 87bb504823..405dbe1fdc 100644 --- a/gtk/gtkshortcutlabel.c +++ b/gtk/gtkshortcutlabel.c @@ -362,9 +362,6 @@ parse_range (GtkShortcutLabel *self, static void clear_children (GtkShortcutLabel *self) { - gtk_accessible_reset_relation (GTK_ACCESSIBLE (self), - GTK_ACCESSIBLE_RELATION_LABELLED_BY); - GtkWidget *child; child = gtk_widget_get_first_child (GTK_WIDGET (self)); @@ -389,6 +386,8 @@ gtk_shortcut_label_rebuild (GtkShortcutLabel *self) GList *parts = NULL; GtkWidget *child; + gtk_accessible_reset_relation (GTK_ACCESSIBLE (self), GTK_ACCESSIBLE_RELATION_LABELLED_BY); + clear_children (self); if (self->accelerator == NULL || self->accelerator[0] == '\0') |