diff options
| author | Sébastien Wilmet <swilmet@gnome.org> | 2016-04-09 12:50:43 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-04-19 10:27:19 -0400 |
| commit | dc96266e66c9c4eb6d76c629373b22bda842113a (patch) | |
| tree | 8ccb5ef1ac6d4f8d89c57e6b7fb2a794e98b824b | |
| parent | b51455712f870c69c40d934742647f49cc8560a9 (diff) | |
| download | gtk+-dc96266e66c9c4eb6d76c629373b22bda842113a.tar.gz | |
app: avoid code duplication for setting accels
The implementation of the deprecated functions is now based on the
non-deprecated gtk_application_set_accels_for_action().
https://bugzilla.gnome.org/show_bug.cgi?id=764846
| -rw-r--r-- | gtk/gtkapplication.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index fde1b2340b..bb90db5cda 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -1250,17 +1250,15 @@ gtk_application_add_accelerator (GtkApplication *application, GVariant *parameter) { const gchar *accelerators[2] = { accelerator, NULL }; - gchar *action_and_target; + gchar *detailed_action_name; g_return_if_fail (GTK_IS_APPLICATION (application)); g_return_if_fail (action_name != NULL); g_return_if_fail (accelerator != NULL); - action_and_target = gtk_print_action_and_target (NULL, action_name, parameter); - accels_set_accels_for_action (&application->priv->accels, action_and_target, accelerators); - gtk_action_muxer_set_primary_accel (application->priv->muxer, action_and_target, accelerator); - gtk_application_update_accels (application); - g_free (action_and_target); + detailed_action_name = g_action_print_detailed_name (action_name, parameter); + gtk_application_set_accels_for_action (application, detailed_action_name, accelerators); + g_free (detailed_action_name); } /** @@ -1282,16 +1280,15 @@ gtk_application_remove_accelerator (GtkApplication *application, const gchar *action_name, GVariant *parameter) { - gchar *action_and_target; + const gchar *accelerators[1] = { NULL }; + gchar *detailed_action_name; g_return_if_fail (GTK_IS_APPLICATION (application)); g_return_if_fail (action_name != NULL); - action_and_target = gtk_print_action_and_target (NULL, action_name, parameter); - accels_set_accels_for_action (&application->priv->accels, action_and_target, NULL); - gtk_action_muxer_set_primary_accel (application->priv->muxer, action_and_target, NULL); - gtk_application_update_accels (application); - g_free (action_and_target); + detailed_action_name = g_action_print_detailed_name (action_name, parameter); + gtk_application_set_accels_for_action (application, detailed_action_name, accelerators); + g_free (detailed_action_name); } /** |