From 45d076fcc2ae6f03a34d9b2018fcd53e9d2bddfe Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 8 Apr 2009 19:18:44 +0200 Subject: [PATCH] Display invalid accelerators as "Invalid" in GTK mode. When in GTK_CELL_RENDERER_ACCEL_MODE_GTK, display accelerator key combinations that don't pass gtk_accelerator_valid() as "Invalid". Bug #572799. --- gtk/gtkcellrendereraccel.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c index 306bc5e247..f3e229688b 100644 --- a/gtk/gtkcellrendereraccel.c +++ b/gtk/gtkcellrendereraccel.c @@ -244,7 +244,16 @@ convert_keysym_state_to_string (GtkCellRendererAccel *accel, else { if (accel->accel_mode == GTK_CELL_RENDERER_ACCEL_MODE_GTK) - return gtk_accelerator_get_label (keysym, mask); + { + if (!gtk_accelerator_valid (keysym, mask)) + /* This label is displayed in a treeview cell displaying + * an accelerator key combination that is not valid according + * to gtk_accelerator_valid(). + */ + return g_strdup (C_("Accelerator", "Invalid")); + + return gtk_accelerator_get_label (keysym, mask); + } else { gchar *name;