From 78be6549f11b31c264337dd548b9f022435588d9 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 8 Jul 2007 12:23:44 +0000 Subject: [PATCH] renamed action "selection-editor-popup" to "selection-popup". Fixes bug 2007-07-08 Michael Natterer * app/actions/select-actions.c (select_actions): renamed action "selection-editor-popup" to "selection-popup". Fixes bug #454364. * app/widgets/gimpdockable.c (gimp_dockable_show_menu): warn when above bug happens instead of failing silently. svn path=/trunk/; revision=22894 --- ChangeLog | 8 ++++++++ app/actions/select-actions.c | 2 +- app/widgets/gimpdockable.c | 15 +++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ea4426c01..6f8e009ac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-07-08 Michael Natterer + + * app/actions/select-actions.c (select_actions): renamed action + "selection-editor-popup" to "selection-popup". Fixes bug #454364. + + * app/widgets/gimpdockable.c (gimp_dockable_show_menu): warn when + above bug happens instead of failing silently. + 2007-07-06 Sven Neumann * plug-ins/common/channel_mixer.c: minor layout tweak. diff --git a/app/actions/select-actions.c b/app/actions/select-actions.c index 606b9fc55a..7b2171da15 100644 --- a/app/actions/select-actions.c +++ b/app/actions/select-actions.c @@ -40,7 +40,7 @@ static const GimpActionEntry select_actions[] = { - { "selection-editor-popup", GIMP_STOCK_TOOL_RECT_SELECT, + { "selection-popup", GIMP_STOCK_TOOL_RECT_SELECT, N_("Selection Editor Menu"), NULL, NULL, NULL, GIMP_HELP_SELECTION_DIALOG }, diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c index d100fa9f3c..96c02e8c0a 100644 --- a/app/widgets/gimpdockable.c +++ b/app/widgets/gimpdockable.c @@ -1005,12 +1005,23 @@ gimp_dockable_show_menu (GimpDockable *dockable) gtk_ui_manager_get_widget (GTK_UI_MANAGER (dialog_ui_manager), dialog_ui_path); + if (! child_menu_widget) + { + g_warning ("%s: UI manager '%s' has now widget at path '%s'", + G_STRFUNC, dialog_ui_manager->name, dialog_ui_path); + return FALSE; + } + child_menu_action = gtk_ui_manager_get_action (GTK_UI_MANAGER (dialog_ui_manager), dialog_ui_path); - if (! child_menu_widget || ! child_menu_action) - return FALSE; + if (! child_menu_action) + { + g_warning ("%s: UI manager '%s' has no action at path '%s'", + G_STRFUNC, dialog_ui_manager->name, dialog_ui_path); + return FALSE; + } g_object_get (child_menu_action, "label", &label,