summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Wilmet <swilmet@gnome.org>2016-04-10 12:41:09 +0200
committerMatthias Clasen <mclasen@redhat.com>2016-04-19 10:28:52 -0400
commita2a3de7861f3b58d8b8893ccbf1adba860c9c09e (patch)
tree247d6ac343af693673a798af2d93d46129c2457f
parent69c902a14673baae49adcae3e8d4e5b94c0dbc2a (diff)
downloadgtk+-a2a3de7861f3b58d8b8893ccbf1adba860c9c09e.tar.gz
app: improve code of extract_accels_from_menu()
sub_model is clearer than "m". And we don't use the key, so we can pass NULL instead. https://bugzilla.gnome.org/show_bug.cgi?id=764846
-rw-r--r--gtk/gtkapplication.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 8da35b6301..8bd0f0a4c8 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -829,19 +829,19 @@ extract_accels_from_menu (GMenuModel *model,
GtkApplication *app)
{
gint i;
- GMenuLinkIter *iter;
- const gchar *key;
- GMenuModel *m;
for (i = 0; i < g_menu_model_get_n_items (model); i++)
{
+ GMenuLinkIter *iter;
+ GMenuModel *sub_model;
+
extract_accel_from_menu_item (model, i, app);
iter = g_menu_model_iterate_item_links (model, i);
- while (g_menu_link_iter_get_next (iter, &key, &m))
+ while (g_menu_link_iter_get_next (iter, NULL, &sub_model))
{
- extract_accels_from_menu (m, app);
- g_object_unref (m);
+ extract_accels_from_menu (sub_model, app);
+ g_object_unref (sub_model);
}
g_object_unref (iter);
}