summaryrefslogtreecommitdiff
path: root/gtk/gtkbindings.h
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-01-28 19:36:24 -0500
committerMatthias Clasen <mclasen@redhat.com>2011-01-30 21:27:56 -0500
commit8bb0d552f1be1313cbb9e37607b21d8274ae5ff1 (patch)
tree7f43977c117d49df61479dbbec135a9e27d27921 /gtk/gtkbindings.h
parenta04e721473a6afc45dba8bc9f95256375968edb4 (diff)
downloadgtk+-8bb0d552f1be1313cbb9e37607b21d8274ae5ff1.tar.gz
Improve binding-set parser
Make gtk_binding_entry_add_signal_from_string() return the expected token in case of parsing error, so that we can return a GError instead of spewing. Also, add a separate scope for binding-set, since allowing {} in identifiers in SCOPE_VALUE breaks the fact that the ; after the last assignment in a rule is optional.
Diffstat (limited to 'gtk/gtkbindings.h')
-rw-r--r--gtk/gtkbindings.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h
index 4529567a6c..cf7f6bfb14 100644
--- a/gtk/gtkbindings.h
+++ b/gtk/gtkbindings.h
@@ -125,8 +125,8 @@ void gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
const gchar *signal_name,
GSList *binding_args);
-void gtk_binding_entry_add_signal_from_string (GtkBindingSet *binding_set,
- const gchar *signal_desc);
+GTokenType gtk_binding_entry_add_signal_from_string (GtkBindingSet *binding_set,
+ const gchar *signal_desc);
void gtk_binding_entry_remove (GtkBindingSet *binding_set,
guint keyval,