[gtk/wip/baedert/accelmap: 1/2] accelmap: Avoid a confusing goto
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/accelmap: 1/2] accelmap: Avoid a confusing goto
- Date: Thu, 4 Jul 2019 06:36:32 +0000 (UTC)
commit 12ebbd1b24500115ba54850f6bb37f8ca68bc292
Author: Timm Bäder <mail baedert org>
Date: Wed Jul 3 10:02:45 2019 +0200
accelmap: Avoid a confusing goto
gtk/gtkaccelmap.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index bbb2dd2bc8..487018e392 100644
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -821,13 +821,17 @@ gtk_accel_map_foreach (gpointer data,
{
AccelEntry *entry = slist->data;
gboolean changed = entry->accel_key != entry->std_accel_key || entry->accel_mods !=
entry->std_accel_mods;
+ gboolean skip = FALSE;
for (node = accel_filters; node; node = node->next)
- if (g_pattern_match_string (node->data, entry->accel_path))
- goto skip_accel;
- foreach_func (data, entry->accel_path, entry->accel_key, entry->accel_mods, changed);
- skip_accel:
- /* noop */;
+ if (g_pattern_match_string (node->data, entry->accel_path))
+ {
+ skip = TRUE;
+ break;
+ }
+
+ if (!skip)
+ foreach_func (data, entry->accel_path, entry->accel_key, entry->accel_mods, changed);
}
g_slist_free (entries);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]