From b9b40c4516d0118c65b528b06d58ccc379295009 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sat, 14 Dec 2002 14:45:38 +0000 Subject: [PATCH] data is not a Gimp pointer if this function is called from an image 2002-12-14 Sven Neumann * app/gui/plug-in-commands.c (plug_in_repeat_cmd_callback): data is not a Gimp pointer if this function is called from an image menubar. Use the_gimp instead of crashing. --- ChangeLog | 8 +++++++- app/actions/plug-in-commands.c | 2 +- app/gui/plug-in-commands.c | 2 +- devel-docs/libgimp/.cvsignore | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58d34e6b70..dcfb8e82a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-12-14 Sven Neumann + + * app/gui/plug-in-commands.c (plug_in_repeat_cmd_callback): data + is not a Gimp pointer if this function is called from an image + menubar. Use the_gimp instead of crashing. + 2002-12-14 Sven Neumann * app/tools/gimpimagemaptool.c: made it compile after Mitch's @@ -11,7 +17,7 @@ * app/config/gimpdisplayconfig.[ch]: renamed "menu_bar_per_display" to "show_menubar". Removed GIMP_PARAM_RESTART flag. - * app/display/gimpdisplayshell.[ch]: chaged shell->item_factory to + * app/display/gimpdisplayshell.[ch]: changed shell->item_factory to shell->menubar_factory plus shell->popup_factory and always create both of them. Added "gboolean update_popup" to gimp_display_shell_set_menu_sensitivity() and call it recursively diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index 065585562e..7c736c18a4 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -157,7 +157,7 @@ plug_in_repeat_cmd_callback (GtkWidget *widget, interactive = action ? TRUE : FALSE; - plug_in_repeat (GIMP (data), + plug_in_repeat (the_gimp, gimp_display_get_ID (gdisp), gimp_image_get_ID (gdisp->gimage), gimp_item_get_ID (GIMP_ITEM (drawable)), diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index 065585562e..7c736c18a4 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -157,7 +157,7 @@ plug_in_repeat_cmd_callback (GtkWidget *widget, interactive = action ? TRUE : FALSE; - plug_in_repeat (GIMP (data), + plug_in_repeat (the_gimp, gimp_display_get_ID (gdisp), gimp_image_get_ID (gdisp->gimage), gimp_item_get_ID (GIMP_ITEM (drawable)), diff --git a/devel-docs/libgimp/.cvsignore b/devel-docs/libgimp/.cvsignore index 0b69da0543..d39277e884 100644 --- a/devel-docs/libgimp/.cvsignore +++ b/devel-docs/libgimp/.cvsignore @@ -1,5 +1,6 @@ Makefile Makefile.in +deprecated libgimp.args libgimp.hierarchy libgimp.signals