summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-06-21 15:05:55 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-06-24 22:40:29 +0000
commitd9167fc8d630f0a839086d4fc4b33ed8b1ef71dd (patch)
treea13dfd69f766fecf25144e6425c7012b4dc79a9b
parentd000bed15f0e17191364b2a31b015176f87ca713 (diff)
downloadgtk+-d9167fc8d630f0a839086d4fc4b33ed8b1ef71dd.tar.gz
model button: Stop parsing accels
The new shortcuts machinery gives us formatted strings, so just use them as-is without parsing and reformatting.
-rw-r--r--gtk/gtkmodelbutton.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 092b0d6977..5ad75a0d47 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -524,16 +524,7 @@ update_accel (GtkModelButton *button,
{
if (accel)
{
- guint key;
- GdkModifierType mods;
- char *str;
-
- gtk_accelerator_parse (accel, &key, &mods);
-
- str = gtk_accelerator_get_label (key, mods);
- gtk_label_set_label (GTK_LABEL (button->accel_label), str);
- g_free (str);
-
+ gtk_label_set_label (GTK_LABEL (button->accel_label), accel);
gtk_widget_show (button->accel_label);
}
else