diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-02-16 03:43:38 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-02-16 03:43:38 +0000 |
| commit | 34418c4e8eeae411fa2f38f41d48ae5f53c88445 (patch) | |
| tree | 3c474be8abf58a6061b64c802f19b7152e461ac3 | |
| parent | ca36ffc2afdac582d19467182ad863ada5cd0b68 (diff) | |
| download | gtk+-34418c4e8eeae411fa2f38f41d48ae5f53c88445.tar.gz | |
Warn on duplicate action group names. (#501746, Christian Persch)
2008-02-15 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_insert_action_group):
Warn on duplicate action group names. (#501746, Christian
Persch)
svn path=/trunk/; revision=19592
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gtk/gtkuimanager.c | 21 |
2 files changed, 27 insertions, 0 deletions
@@ -1,5 +1,11 @@ 2008-02-15 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkuimanager.c (gtk_ui_manager_insert_action_group): + Warn on duplicate action group names. (#501746, Christian + Persch) + +2008-02-15 Matthias Clasen <mclasen@redhat.com> + * gtk/Makefile.am: * modules/other/gail/tests/Makefile.am: * modules/other/gail/libgail-util/Makefile.am: diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index fa95be1151..1db9e9bfe7 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -696,11 +696,32 @@ gtk_ui_manager_insert_action_group (GtkUIManager *self, GtkActionGroup *action_group, gint pos) { +#ifdef G_ENABLE_DEBUG + GList *l; + const char *group_name; +#endif + g_return_if_fail (GTK_IS_UI_MANAGER (self)); g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); g_return_if_fail (g_list_find (self->private_data->action_groups, action_group) == NULL); +#ifdef G_ENABLE_DEBUG + group_name = gtk_action_group_get_name (action_group); + + for (l = self->private_data->action_groups; l; l = l->next) + { + GtkActionGroup *group = l->data; + + if (strcmp (gtk_action_group_get_name (group), group_name) == 0) + { + g_warning ("Inserting action group '%s' into UI manager which " + "already has a group with this name\n", group_name); + break; + } + } +#endif /* G_ENABLE_DEBUG */ + g_object_ref (action_group); self->private_data->action_groups = g_list_insert (self->private_data->action_groups, action_group, pos); |