From f760538f17673c5bd7fec792be2f1abf8148fc32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 20 May 2010 02:39:45 +0200 Subject: [PATCH] gtkaccellabel: Remove unused class members Fixes https://bugzilla.gnome.org/show_bug.cgi?id=97414 --- gtk/gtkaccellabel.c | 6 +----- gtk/gtkaccellabel.h | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 9193ea5bf1..716e8d7cd0 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -180,9 +180,6 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class) #endif /* GDK_WINDOWING_QUARTZ */ - class->accel_seperator = g_strdup (" / "); - class->latin1_to_char = TRUE; - g_object_class_install_property (gobject_class, PROP_ACCEL_CLOSURE, g_param_spec_boxed ("accel-closure", @@ -802,8 +799,7 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass, g_string_append (gstring, klass->mod_separator); ch = gdk_keyval_to_unicode (accelerator_key); - if (ch && (g_unichar_isgraph (ch) || ch == ' ') && - (ch < 0x80 || klass->latin1_to_char)) + if (ch && ch < 0x80 && (g_unichar_isgraph (ch) || ch == ' ')) { switch (ch) { diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h index 3ad0a37c7a..872c588e47 100644 --- a/gtk/gtkaccellabel.h +++ b/gtk/gtkaccellabel.h @@ -74,9 +74,7 @@ struct _GtkAccelLabelClass gchar *mod_name_control; gchar *mod_name_alt; gchar *mod_separator; - gchar *accel_seperator; - guint latin1_to_char : 1; - + /* Padding for future expansion */ void (*_gtk_reserved1) (void); void (*_gtk_reserved2) (void);