From d267b8e028003134c4f7c19545b01a9fefbd2d08 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 20 Nov 2015 20:34:03 -0500 Subject: [PATCH] Rename the gtk-key-bindings property This is not a standard CSS property, so rename it to -gtk-key-bindings. We still support the old name, with a deprecation warning. --- gtk/gtkbindings.c | 2 +- gtk/gtkcssstylepropertyimpl.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index 2a1ec437f0..2edfec0c0c 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -1445,7 +1445,7 @@ gtk_bindings_activate_list (GObject *object, state = gtk_widget_get_state_flags (GTK_WIDGET (object)); gtk_style_context_get (context, state, - "gtk-key-bindings", &array, + "-gtk-key-bindings", &array, NULL); if (array) { diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 793c6d9d07..c42ff5d1d8 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -1743,7 +1743,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS G_GNUC_END_IGNORE_DEPRECATIONS /* Private property holding the binding sets */ - gtk_css_style_property_register ("gtk-key-bindings", + gtk_css_style_property_register ("-gtk-key-bindings", GTK_CSS_PROPERTY_GTK_KEY_BINDINGS, G_TYPE_PTR_ARRAY, 0, @@ -1752,5 +1752,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS bindings_value_query, bindings_value_assign, _gtk_css_array_value_new (_gtk_css_string_value_new (NULL))); + _gtk_style_property_add_alias ("-gtk-key-bindings", "gtk-key-bindings"); }