From 7bbcc69815cfb0a1b78ec695a77c470fceec66b8 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 27 Nov 2005 14:10:19 +0000 Subject: [PATCH] use gtk_accelerator_name() instead of serializing the accelerator 2005-11-27 Michael Natterer * app/widgets/gimpdeviceinfo.c (gimp_device_info_get_property): use gtk_accelerator_name() instead of serializing the accelerator manually. --- ChangeLog | 6 ++++++ app/widgets/gimpdeviceinfo.c | 19 ++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2aa9e5f476..9692f6f587 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-27 Michael Natterer + + * app/widgets/gimpdeviceinfo.c (gimp_device_info_get_property): + use gtk_accelerator_name() instead of serializing the accelerator + manually. + 2005-11-27 Michael Natterer Apparently, there was a reason for implementing the window actions diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c index 67d4a4b441..e41b10b377 100644 --- a/app/widgets/gimpdeviceinfo.c +++ b/app/widgets/gimpdeviceinfo.c @@ -389,24 +389,13 @@ gimp_device_info_get_property (GObject *object, if (keyval) { - /* FIXME: integrate this back with menus_install_accelerator */ - gchar accel[64]; - gchar t2[2]; + gchar *accel; gchar *escaped; - accel[0] = '\0'; - if (modifiers & GDK_CONTROL_MASK) - strcat (accel, ""); - if (modifiers & GDK_SHIFT_MASK) - strcat (accel, ""); - if (modifiers & GDK_MOD1_MASK) - strcat (accel, ""); - - t2[0] = keyval; - t2[1] = '\0'; - strcat (accel, t2); - + accel = gtk_accelerator_name (keyval, modifiers); escaped = g_strescape (accel, NULL); + g_free (accel); + g_value_set_string (&string_value, escaped); g_free (escaped); }