diff options
| author | Michael Natterer <mitch@imendio.com> | 2008-08-04 11:08:33 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2008-08-04 11:08:33 +0000 |
| commit | 888c3a72b5f7d21cab3d5b14980e9f5b4d12f2f2 (patch) | |
| tree | 3ecfec90887b6b696797f562f9069458d08a6808 /gtk/gtkbindings.c | |
| parent | 5a3691352d723852da210b3e9cfd2e4c6da72a18 (diff) | |
| download | gtk+-888c3a72b5f7d21cab3d5b14980e9f5b4d12f2f2.tar.gz | |
move the code of the deprecated gtk_binding_entry_clear() to a new private
2008-08-04 Michael Natterer <mitch@imendio.com>
* gtk/gtkbindings.c: move the code of the deprecated
gtk_binding_entry_clear() to a new private function
gtk_binding_entry_clear_internal() and call it from
gtk_binding_entry_clear().
(_gtk_binding_entry_add_signall)
(gtk_binding_parse_bind): use the new internal function in order
to avoid our own deprecated public API.
svn path=/trunk/; revision=20963
Diffstat (limited to 'gtk/gtkbindings.c')
| -rw-r--r-- | gtk/gtkbindings.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index 662dcf17de..63b48e29b0 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -689,6 +689,23 @@ gtk_binding_set_activate (GtkBindingSet *binding_set, return FALSE; } +static void +gtk_binding_entry_clear_internal (GtkBindingSet *binding_set, + guint keyval, + GdkModifierType modifiers) +{ + GtkBindingEntry *entry; + + keyval = gdk_keyval_to_lower (keyval); + modifiers = modifiers & BINDING_MOD_MASK (); + + entry = binding_ht_lookup_entry (binding_set, keyval, modifiers); + if (entry) + binding_entry_destroy (entry); + + entry = binding_entry_new (binding_set, keyval, modifiers); +} + /** * gtk_binding_entry_clear: * @binding_set: @@ -702,18 +719,9 @@ gtk_binding_entry_clear (GtkBindingSet *binding_set, guint keyval, GdkModifierType modifiers) { - GtkBindingEntry *entry; - g_return_if_fail (binding_set != NULL); - - keyval = gdk_keyval_to_lower (keyval); - modifiers = modifiers & BINDING_MOD_MASK (); - - entry = binding_ht_lookup_entry (binding_set, keyval, modifiers); - if (entry) - binding_entry_destroy (entry); - entry = binding_entry_new (binding_set, keyval, modifiers); + gtk_binding_entry_clear_internal (binding_set, keyval, modifiers); } /** @@ -865,7 +873,7 @@ _gtk_binding_entry_add_signall (GtkBindingSet *binding_set, entry = binding_ht_lookup_entry (binding_set, keyval, modifiers); if (!entry) { - gtk_binding_entry_clear (binding_set, keyval, modifiers); + gtk_binding_entry_clear_internal (binding_set, keyval, modifiers); entry = binding_ht_lookup_entry (binding_set, keyval, modifiers); } signal_p = &entry->signals; @@ -1536,8 +1544,8 @@ gtk_binding_parse_bind (GScanner *scanner, if (scanner->token != '{') return '{'; - gtk_binding_entry_clear (binding_set, keyval, modifiers); - + gtk_binding_entry_clear_internal (binding_set, keyval, modifiers); + g_scanner_peek_next_token (scanner); while (scanner->next_token != '}') { |