]> Pileus Git - ~andy/gtk/commitdiff
Display localised accelerator keys also in OTHER mode
authorChristian Persch <chpe@gnome.org>
Sat, 11 Apr 2009 05:53:32 +0000 (01:53 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 11 Apr 2009 05:53:32 +0000 (01:53 -0400)
This fixes bug 572797.

gtk/gtkcellrendereraccel.c

index 9b10d8603515107e81c779a48a35c8262ee37957..306bc5e247bfa952f326eb7745b1906c4307b986 100644 (file)
@@ -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;