From 059c22c3b28d2298cfcf3cbaebbf5744fbfadaed Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Fri, 23 Oct 2009 01:58:54 +0200 Subject: [PATCH] Add and use internal accessor for accelerables in GtkAccelGroup --- gtk/gtkaccelgroup.c | 8 ++++++++ gtk/gtkaccelgroup.h | 1 + gtk/gtkaccelmap.c | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 2032ac13bf..86f9b91bfd 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -815,6 +815,14 @@ _gtk_accel_group_reconnect (GtkAccelGroup *accel_group, g_object_unref (accel_group); } +GSList* +_gtk_accel_group_get_accelerables (GtkAccelGroup *accel_group) +{ + g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), NULL); + + return accel_group->priv->acceleratables; +} + /** * gtk_accel_group_query: * @accel_group: the accelerator group to query diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h index 0ff4df95ac..b00b039202 100644 --- a/gtk/gtkaccelgroup.h +++ b/gtk/gtkaccelgroup.h @@ -179,6 +179,7 @@ GtkAccelGroupEntry* gtk_accel_group_query (GtkAccelGroup *accel_group, void _gtk_accel_group_reconnect (GtkAccelGroup *accel_group, GQuark accel_path_quark); +GSList* _gtk_accel_group_get_accelerables (GtkAccelGroup *accel_group); struct _GtkAccelGroupEntry { diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c index ac78bf3c7d..31028688f4 100644 --- a/gtk/gtkaccelmap.c +++ b/gtk/gtkaccelmap.c @@ -319,7 +319,7 @@ internal_change_entry (const gchar *accel_path, { GtkAccelGroup *group = slist->data; - for (node = group->acceleratables; node; node = node->next) + for (node = _gtk_accel_group_get_accelerables (group); node; node = node->next) g_hash_table_insert (window_hm, node->data, node->data); } g_slist_free (group_list);