callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed action "selection-editor-popup" to "selection-popup". Fixes bug

Browse Source 
2007-07-08  Michael Natterer  <mitch@gimp.org>

	* 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
This commit is contained in:
Michael Natterer
2007-07-08 12:23:44 +00:00
committed by Michael Natterer
parent 7b19c74d10
commit 78be6549f1
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-07-08 Michael Natterer <mitch@gimp.org>
* 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 <sven@gimp.org>
* plug-ins/common/channel_mixer.c: minor layout tweak.

2
app/actions/select-actions.c
View File

@ -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 },

15
app/widgets/gimpdockable.c
View File

@ -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,