diff options
| author | Sébastien Wilmet <swilmet@gnome.org> | 2016-04-10 12:28:14 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-04-19 10:28:39 -0400 |
| commit | 0bb1991afb28d98e5157acb5d30166c4007f78d3 (patch) | |
| tree | 7390d2963ee1febb94f8cff3f00e942a7bea85e6 | |
| parent | 5cc3b265be9d1b39124e446295d3683a90007c87 (diff) | |
| download | gtk+-0bb1991afb28d98e5157acb5d30166c4007f78d3.tar.gz | |
app: don't use deprecated function
gtk_application_add_accelerator() is deprecated, but was still used
inside IGNORE_DEPRECATIONS's.
https://bugzilla.gnome.org/show_bug.cgi?id=764846
| -rw-r--r-- | gtk/gtkapplication.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index 34b76afa67..d8a9685b05 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -810,10 +810,15 @@ extract_accel_from_menu_item (GMenuModel *model, } g_object_unref (iter); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (accel && action) - gtk_application_add_accelerator (app, accel, action, target); - G_GNUC_END_IGNORE_DEPRECATIONS + { + const gchar *accels[2] = { accel, NULL }; + gchar *detailed_action_name; + + detailed_action_name = g_action_print_detailed_name (action, target); + gtk_application_set_accels_for_action (app, detailed_action_name, accels); + g_free (detailed_action_name); + } if (target) g_variant_unref (target); |