diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-03-19 18:03:16 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-03-19 18:03:16 -0400 |
| commit | 31db61588543a1ba0935ac8ecb2ecac574c0a836 (patch) | |
| tree | a2e2092e086a9c7d618e2c9ae1fc7b5a659e8a7a /gtk/gtkmodelbutton.c | |
| parent | 3ac4c76b18cc89a841ce09f0943539f16988fd21 (diff) | |
| download | gtk+-31db61588543a1ba0935ac8ecb2ecac574c0a836.tar.gz | |
Revert "Merge branch 'disable-window-test' into 'master'"
This reverts commit 3ac4c76b18cc89a841ce09f0943539f16988fd21, reversing
changes made to 6ec96d2e989d029a303b8b20ec72b86f974c0e87.
Diffstat (limited to 'gtk/gtkmodelbutton.c')
| -rw-r--r-- | gtk/gtkmodelbutton.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index 49b69b28e8..25c75087ef 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -727,6 +727,7 @@ update_accel (GtkModelButton *self, { guint key; GdkModifierType mods; + GtkAccelLabelClass *accel_class; char *str; if (!self->accel_label) @@ -738,9 +739,12 @@ update_accel (GtkModelButton *self, } gtk_accelerator_parse (accel, &key, &mods); - str = gtk_accelerator_get_label (key, mods); + + accel_class = g_type_class_ref (GTK_TYPE_ACCEL_LABEL); + str = _gtk_accel_label_class_get_accelerator_label (accel_class, key, mods); gtk_label_set_label (GTK_LABEL (self->accel_label), str); g_free (str); + g_type_class_unref (accel_class); } else { |