summaryrefslogtreecommitdiff
path: root/gtk/gtkcellrendereraccel.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2009-04-11 01:53:32 -0400
committerMatthias Clasen <mclasen@redhat.com>2009-04-11 01:53:32 -0400
commitdb7d72c82fb33debd200c2ce2576048473e6f3bf (patch)
tree94944a741690030c510001847e6fc0df602d7777 /gtk/gtkcellrendereraccel.c
parentf07613bb121ee57717ea106b1d0bbba0a6a1242a (diff)
downloadgtk+-db7d72c82fb33debd200c2ce2576048473e6f3bf.tar.gz
Display localised accelerator keys also in OTHER mode
This fixes bug 572797.
Diffstat (limited to 'gtk/gtkcellrendereraccel.c')
-rw-r--r--gtk/gtkcellrendereraccel.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index 9b10d86035..306bc5e247 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -249,7 +249,10 @@ convert_keysym_state_to_string (GtkCellRendererAccel *accel,
{
gchar *name;
- name = gtk_accelerator_name (keysym, mask);
+ name = gtk_accelerator_get_label (keysym, mask);
+ if (name == NULL)
+ name = gtk_accelerator_name (keysym, mask);
+
if (keysym == 0)
{
gchar *tmp;