From 27d6276212e3eef5c235c100d81f22a1ab2abb07 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 31 Jul 2018 07:49:36 +0200 Subject: [PATCH] bindings: Make gtk_binding_entry_add_signall() private This function needs a replacement and that will appear after refactorings. --- docs/reference/gtk/gtk4-sections.txt | 1 - gtk/gtkbindings.c | 28 ++++++++-------------------- gtk/gtkbindings.h | 6 ------ gtk/gtkbindingsprivate.h | 5 ----- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index a7d0d15787..12f15559c3 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -5203,7 +5203,6 @@ GtkBindingSet GtkBindingEntry GtkBindingSignal GtkBindingArg -gtk_binding_entry_add_signall gtk_binding_set_new gtk_binding_set_by_class gtk_binding_set_find diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index 5efa63a33c..db9d6bd2a7 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -858,7 +858,7 @@ gtk_binding_entry_remove (GtkBindingSet *binding_set, binding_entry_destroy (entry); } -/** +/* * gtk_binding_entry_add_signall: * @binding_set: a #GtkBindingSet to add a signal to * @keyval: key value @@ -870,24 +870,12 @@ gtk_binding_entry_remove (GtkBindingSet *binding_set, * Override or install a new key binding for @keyval with @modifiers on * @binding_set. */ -void +static void gtk_binding_entry_add_signall (GtkBindingSet *binding_set, guint keyval, GdkModifierType modifiers, const gchar *signal_name, GSList *binding_args) -{ - _gtk_binding_entry_add_signall (binding_set, - keyval, modifiers, - signal_name, binding_args); -} - -void -_gtk_binding_entry_add_signall (GtkBindingSet *binding_set, - guint keyval, - GdkModifierType modifiers, - const gchar *signal_name, - GSList *binding_args) { GtkBindingEntry *entry; GtkBindingSignal *signal, **signal_p; @@ -1060,7 +1048,7 @@ gtk_binding_entry_add_signal (GtkBindingSet *binding_set, if (i == n_args || i == 0) { slist = g_slist_reverse (slist); - _gtk_binding_entry_add_signall (binding_set, keyval, modifiers, signal_name, slist); + gtk_binding_entry_add_signall (binding_set, keyval, modifiers, signal_name, slist); } free_slist = slist; @@ -1212,11 +1200,11 @@ gtk_binding_parse_signal (GScanner *scanner, if (!(need_arg && seen_comma) && !negate) { args = g_slist_reverse (args); - _gtk_binding_entry_add_signall (binding_set, - keyval, - modifiers, - signal, - args); + gtk_binding_entry_add_signall (binding_set, + keyval, + modifiers, + signal, + args); expected_token = G_TOKEN_NONE; } diff --git a/gtk/gtkbindings.h b/gtk/gtkbindings.h index 9f7acf8b14..887869f981 100644 --- a/gtk/gtkbindings.h +++ b/gtk/gtkbindings.h @@ -71,12 +71,6 @@ void gtk_binding_entry_add_signal (GtkBindingSet *binding_set, const gchar *signal_name, guint n_args, ...); -GDK_AVAILABLE_IN_ALL -void gtk_binding_entry_add_signall (GtkBindingSet *binding_set, - guint keyval, - GdkModifierType modifiers, - const gchar *signal_name, - GSList *binding_args); GDK_AVAILABLE_IN_ALL GTokenType gtk_binding_entry_add_signal_from_string diff --git a/gtk/gtkbindingsprivate.h b/gtk/gtkbindingsprivate.h index dfacd5b763..b99126119b 100644 --- a/gtk/gtkbindingsprivate.h +++ b/gtk/gtkbindingsprivate.h @@ -24,11 +24,6 @@ G_BEGIN_DECLS guint _gtk_binding_parse_binding (GScanner *scanner); void _gtk_binding_reset_parsed (void); -void _gtk_binding_entry_add_signall (GtkBindingSet *binding_set, - guint keyval, - GdkModifierType modifiers, - const gchar *signal_name, - GSList *binding_args); G_END_DECLS