dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added lots more "GimpFooFunc gui_foo_func" vtable entries to the Gimp 

2003-09-10  Michael Natterer  <mitch@gimp.org>

	* app/core/gimp.[ch]: added lots more "GimpFooFunc gui_foo_func"
	vtable entries to the Gimp struct and wrapper function for them.
	They cover plug-in menu creation and plug-in progress utilities.

	* app/gui/gui.c: fill in the funtion pointers and dispatch
	to the actual functions.

	* app/pdb/Makefile.am (libapppdb_a_LIBADD): removed most hacks
	since the symbols are referenced within libappgui.a now.

	Removed any GTK+ dependency from the plug-ins/ directory:

	* app/plug-in/Makefile.am (INCLUDES): replaces GTK_CFLAGS by
	GDK_PIXBUF_CFLAGS.

	* app/plug-in/plug-in-progress.c
	* app/plug-in/plug-ins.c: replaced gui function calls to create
	menus and progress bars by calls to the wrappers.

	* app/plug-in/plug-in.c (plug_in_close): check dangling PDB
	dialogs using the new wrapper.

	* app/plug-in/plug-in-def.c
	* app/plug-in/plug-in-rc.c
	* app/plug-in/plug-in-run.c: removed trailing whitespace.
This commit is contained in:
Michael Natterer 2003-09-10 22:06:45 +00:00 committed by Michael Natterer
parent eeadbee0bb
commit 268c4fb1ce
17 changed files with 428 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
2003-09-10 Michael Natterer <mitch@gimp.org>
* app/core/gimp.[ch]: added lots more "GimpFooFunc gui_foo_func"
vtable entries to the Gimp struct and wrapper function for them.
They cover plug-in menu creation and plug-in progress utilities.
* app/gui/gui.c: fill in the funtion pointers and dispatch
to the actual functions.
* app/pdb/Makefile.am (libapppdb_a_LIBADD): removed most hacks
since the symbols are referenced within libappgui.a now.
Removed any GTK+ dependency from the plug-ins/ directory:
* app/plug-in/Makefile.am (INCLUDES): replaces GTK_CFLAGS by
GDK_PIXBUF_CFLAGS.
* app/plug-in/plug-in-progress.c
* app/plug-in/plug-ins.c: replaced gui function calls to create
menus and progress bars by calls to the wrappers.
* app/plug-in/plug-in.c (plug_in_close): check dangling PDB
dialogs using the new wrapper.
* app/plug-in/plug-in-def.c
* app/plug-in/plug-in-rc.c
* app/plug-in/plug-in-run.c: removed trailing whitespace.
2003-09-10 Manish Singh <yosh@gimp.org>
* configure.in: AC_SUBST the GDK_PIXBUF vars, to workaround automake

109
app/core/gimp.c
View File

@ -193,6 +193,14 @@ gimp_init (Gimp *gimp)
gimp->gui_set_busy_func = NULL;
gimp->gui_unset_busy_func = NULL;
gimp->gui_message_func = NULL;
gimp->gui_menus_init_func = NULL;
gimp->gui_menus_create_func = NULL;
gimp->gui_menus_delete_func = NULL;
gimp->gui_progress_start_func = NULL;
gimp->gui_progress_restart_func = NULL;
gimp->gui_progress_update_func = NULL;
gimp->gui_progress_end_func = NULL;
gimp->gui_pdb_dialogs_check_func = NULL;
gimp->busy = 0;
gimp->busy_idle_id = 0;
@ -932,6 +940,107 @@ gimp_message (Gimp *gimp,
g_printerr ("%s: %s\n", domain ? domain : GIMP_OBJECT (gimp)->name, message);
}
void
gimp_menus_init (Gimp *gimp,
GSList *plug_in_defs,
const gchar *std_plugins_domain)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (std_plugins_domain != NULL);
if (gimp->gui_menus_init_func)
gimp->gui_menus_init_func (gimp, plug_in_defs, std_plugins_domain);
}
void
gimp_menus_create_entry (Gimp *gimp,
PlugInProcDef *proc_def,
const gchar *locale_domain,
const gchar *help_domain)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (proc_def != NULL);
if (gimp->gui_menus_create_func)
gimp->gui_menus_create_func (gimp, proc_def, locale_domain, help_domain);
}
void
gimp_menus_delete_entry (Gimp *gimp,
const gchar *menu_path)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (menu_path != NULL);
if (gimp->gui_menus_delete_func)
gimp->gui_menus_delete_func (gimp, menu_path);
}
GimpProgress *
gimp_start_progress (Gimp *gimp,
gint gdisp_ID,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
if (gimp->gui_progress_start_func)
return gimp->gui_progress_start_func (gimp, gdisp_ID, message,
cancel_cb, cancel_data);
return NULL;
}
GimpProgress *
gimp_restart_progress (Gimp *gimp,
GimpProgress *progress,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (progress != NULL, NULL);
if (gimp->gui_progress_restart_func)
return gimp->gui_progress_restart_func (gimp, progress, message,
cancel_cb, cancel_data);
return NULL;
}
void
gimp_update_progress (Gimp *gimp,
GimpProgress *progress,
gdouble percentage)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (progress != NULL);
if (gimp->gui_progress_update_func)
gimp->gui_progress_update_func (gimp, progress, percentage);
}
void
gimp_end_progress (Gimp *gimp,
GimpProgress *progress)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (progress != NULL);
if (gimp->gui_progress_end_func)
gimp->gui_progress_end_func (gimp, progress);
}
void
gimp_pdb_dialogs_check (Gimp *gimp)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
if (gimp->gui_pdb_dialogs_check_func)
gimp->gui_pdb_dialogs_check_func (gimp);
}
GimpImage *
gimp_create_image (Gimp *gimp,
gint width,

58
app/core/gimp.h
View File

@ -32,6 +32,31 @@ typedef void (* GimpUnsetBusyFunc) (Gimp *gimp);
typedef void (* GimpMessageFunc) (Gimp *gimp,
const gchar *domain,
const gchar *message);
typedef void (* GimpMenusInitFunc) (Gimp *gimp,
GSList *plug_in_defs,
const gchar *std_domain);
typedef void (* GimpMenusCreateFunc) (Gimp *gimp,
PlugInProcDef *proc_def,
const gchar *locale_domain,
const gchar *help_domain);
typedef void (* GimpMenusDeleteFunc) (Gimp *gimp,
const gchar *menu_path);
typedef GimpProgress * (* GimpProgressStartFunc) (Gimp *gimp,
gint gdisp_ID,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data);
typedef GimpProgress * (* GimpProgressRestartFunc) (Gimp *gimp,
GimpProgress *progress,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data);
typedef void (* GimpProgressUpdateFunc) (Gimp *gimp,
GimpProgress *progress,
gdouble percentage);
typedef void (* GimpProgressEndFunc) (Gimp *gimp,
GimpProgress *progress);
typedef void (* GimpPDBDialogsCheckFunc) (Gimp *gimp);
#define GIMP_TYPE_GIMP (gimp_get_type ())
@ -66,6 +91,14 @@ struct _Gimp
GimpSetBusyFunc gui_set_busy_func;
GimpUnsetBusyFunc gui_unset_busy_func;
GimpMessageFunc gui_message_func;
GimpMenusInitFunc gui_menus_init_func;
GimpMenusCreateFunc gui_menus_create_func;
GimpMenusDeleteFunc gui_menus_delete_func;
GimpProgressStartFunc gui_progress_start_func;
GimpProgressRestartFunc gui_progress_restart_func;
GimpProgressUpdateFunc gui_progress_update_func;
GimpProgressEndFunc gui_progress_end_func;
GimpPDBDialogsCheckFunc gui_pdb_dialogs_check_func;
gint busy;
guint busy_idle_id;
@ -189,6 +222,31 @@ void gimp_unset_busy (Gimp *gimp);
void gimp_message (Gimp *gimp,
const gchar *domain,
const gchar *message);
void gimp_menus_init (Gimp *gimp,
GSList *plug_in_defs,
const gchar *std_plugins_domain);
void gimp_menus_create_entry (Gimp *gimp,
PlugInProcDef *proc_def,
const gchar *locale_domain,
const gchar *help_domain);
void gimp_menus_delete_entry (Gimp *gimp,
const gchar *menu_path);
GimpProgress *gimp_start_progress (Gimp *gimp,
gint gdisp_ID,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data);
GimpProgress *gimp_restart_progress (Gimp *gimp,
GimpProgress *progress,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data);
void gimp_update_progress (Gimp *gimp,
GimpProgress *progress,
gdouble percentage);
void gimp_end_progress (Gimp *gimp,
GimpProgress *progress);
void gimp_pdb_dialogs_check (Gimp *gimp);
GimpImage * gimp_create_image (Gimp *gimp,
gint width,

114
app/gui/gui.c
View File

@ -42,6 +42,7 @@
#include "display/gimpdisplay-foreach.h"
#include "display/gimpdisplayshell.h"
#include "display/gimpdisplayshell-render.h"
#include "display/gimpprogress.h"
#include "widgets/gimpdevices.h"
#include "widgets/gimpdevicestatus.h"
@ -53,10 +54,16 @@
#include "widgets/gimpmenufactory.h"
#include "widgets/gimpwidgets-utils.h"
#include "brush-select.h"
#include "dialogs.h"
#include "dialogs-commands.h"
#include "font-select.h"
#include "gradient-select.h"
#include "gui.h"
#include "menus.h"
#include "palette-select.h"
#include "pattern-select.h"
#include "plug-in-menus.h"
#include "session.h"
#include "app_procs.h" /* FIXME */
@ -80,6 +87,31 @@ static void gui_message (Gimp *gimp,
const gchar *message);
static GimpObject * gui_display_new (GimpImage *gimage,
guint scale);
static void gui_menus_init (Gimp *gimp,
GSList *plug_in_defs,
const gchar *std_plugins_domain);
static void gui_menus_create_entry (Gimp *gimp,
PlugInProcDef *proc_def,
const gchar *locale_domain,
const gchar *help_domain);
static void gui_menus_delete_entry (Gimp *gimp,
const gchar *menu_path);
static GimpProgress * gui_start_progress (Gimp *gimp,
gint gdisp_ID,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data);
static GimpProgress * gui_restart_progress (Gimp *gimp,
GimpProgress *progress,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data);
static void gui_update_progress (Gimp *gimp,
GimpProgress *progress,
gdouble percentage);
static void gui_end_progress (Gimp *gimp,
GimpProgress *progress);
static void gui_pdb_dialogs_check (Gimp *gimp);
static void gui_themes_dir_foreach_func (const GimpDatafileData *file_data,
gpointer user_data);
@ -270,6 +302,14 @@ gui_init (Gimp *gimp)
gimp->gui_unset_busy_func = gui_unset_busy;
gimp->gui_message_func = gui_message;
gimp->gui_create_display_func = gui_display_new;
gimp->gui_menus_init_func = gui_menus_init;
gimp->gui_menus_create_func = gui_menus_create_entry;
gimp->gui_menus_delete_func = gui_menus_delete_entry;
gimp->gui_progress_start_func = gui_start_progress;
gimp->gui_progress_restart_func = gui_restart_progress;
gimp->gui_progress_update_func = gui_update_progress;
gimp->gui_progress_end_func = gui_end_progress;
gimp->gui_pdb_dialogs_check_func = gui_pdb_dialogs_check;
image_disconnect_handler_id =
gimp_container_add_handler (gimp->images, "disconnect",
@ -473,6 +513,80 @@ gui_display_new (GimpImage *gimage,
return GIMP_OBJECT (gdisp);
}
static void
gui_menus_init (Gimp *gimp,
GSList *plug_in_defs,
const gchar *std_plugins_domain)
{
plug_in_menus_init (gimp, plug_in_defs, std_plugins_domain);
}
static void
gui_menus_create_entry (Gimp *gimp,
PlugInProcDef *proc_def,
const gchar *locale_domain,
const gchar *help_domain)
{
plug_in_menus_create_entry (NULL, proc_def, locale_domain, help_domain);
}
static void
gui_menus_delete_entry (Gimp *gimp,
const gchar *menu_path)
{
plug_in_menus_delete_entry (menu_path);
}
static GimpProgress *
gui_start_progress (Gimp *gimp,
gint gdisp_ID,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data)
{
GimpDisplay *gdisp = NULL;
if (gdisp_ID > 0)
gdisp = gimp_display_get_by_ID (gimp, gdisp_ID);
return gimp_progress_start (gdisp, message, TRUE, cancel_cb, cancel_data);
}
static GimpProgress *
gui_restart_progress (Gimp *gimp,
GimpProgress *progress,
const gchar *message,
GCallback cancel_cb,
gpointer cancel_data)
{
return gimp_progress_restart (progress, message, cancel_cb, cancel_data);
}
static void
gui_update_progress (Gimp *gimp,
GimpProgress *progress,
gdouble percentage)
{
gimp_progress_update (progress, percentage);
}
static void
gui_end_progress (Gimp *gimp,
GimpProgress *progress)
{
gimp_progress_end (progress);
}
static void
gui_pdb_dialogs_check (Gimp *gimp)
{
brush_select_dialogs_check ();
font_select_dialogs_check ();
gradient_select_dialogs_check ();
palette_select_dialogs_check ();
pattern_select_dialogs_check ();
}
static void
gui_themes_dir_foreach_func (const GimpDatafileData *file_data,
gpointer user_data)

2
app/pdb/Makefile.am
View File

@ -49,7 +49,7 @@ libapppdb_a_SOURCES = \
unit_cmds.c
## This is a truly ugly hack
libapppdb_a_LIBADD = ../core/gimpcontainer-filter.o ../gui/pattern-select.o ../gui/brush-select.o ../gui/font-select.o
libapppdb_a_LIBADD = ../core/gimpcontainer-filter.o
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-PDB\" \

2
app/plug-in/Makefile.am
View File

@ -8,7 +8,7 @@ AM_CPPFLAGS = \
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/app \
$(GTK_CFLAGS) \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libappplug-in.a

29
app/plug-in/gimpplugin-progress.c
View File

@ -18,27 +18,21 @@
#include "config.h"
#include <gtk/gtk.h>
#include <glib-object.h>
#include "plug-in-types.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "core/gimp.h"
#include "pdb/procedural_db.h"
#include "display/gimpdisplay.h"
#include "display/gimpprogress.h"
#include "plug-in.h"
#include "plug-in-progress.h"
/* local function prototypes */
static void plug_in_progress_cancel (GtkWidget *widget,
static void plug_in_progress_cancel (gpointer eek,
PlugIn *plug_in);
@ -49,22 +43,19 @@ plug_in_progress_start (PlugIn *plug_in,
const gchar *message,
gint gdisp_ID)
{
GimpDisplay *gdisp = NULL;
g_return_if_fail (plug_in != NULL);
if (! message)
message = plug_in->prog;
if (gdisp_ID > 0)
gdisp = gimp_display_get_by_ID (plug_in->gimp, gdisp_ID);
if (plug_in->progress)
plug_in->progress = gimp_progress_restart (plug_in->progress, message,
plug_in->progress = gimp_restart_progress (plug_in->gimp,
plug_in->progress, message,
G_CALLBACK (plug_in_progress_cancel),
plug_in);
else
plug_in->progress = gimp_progress_start (gdisp, message, TRUE,
plug_in->progress = gimp_start_progress (plug_in->gimp,
gdisp_ID, message,
G_CALLBACK (plug_in_progress_cancel),
plug_in);
}
@ -78,7 +69,7 @@ plug_in_progress_update (PlugIn *plug_in,
if (! plug_in->progress)
plug_in_progress_start (plug_in, NULL, -1);
gimp_progress_update (plug_in->progress, percentage);
gimp_update_progress (plug_in->gimp, plug_in->progress, percentage);
}
void
@ -88,7 +79,7 @@ plug_in_progress_end (PlugIn *plug_in)
if (plug_in->progress)
{
gimp_progress_end (plug_in->progress);
gimp_end_progress (plug_in->gimp, plug_in->progress);
plug_in->progress = NULL;
}
}
@ -97,7 +88,7 @@ plug_in_progress_end (PlugIn *plug_in)
/* private functions */
static void
plug_in_progress_cancel (GtkWidget *widget,
plug_in_progress_cancel (gpointer eek,
PlugIn *plug_in)
{
if (plug_in->recurse_main_loop || plug_in->temp_main_loops)

14
app/plug-in/gimpplugin.c
View File

@ -39,7 +39,7 @@
#include <sys/param.h>
#endif
#include <gtk/gtk.h>
#include <glib-object.h>
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
@ -80,13 +80,6 @@
#include "core/gimp.h"
#include "core/gimpenvirontable.h"
#include "gui/brush-select.h"
#include "gui/gradient-select.h"
#include "gui/palette-select.h"
#include "gui/pattern-select.h"
#include "widgets/gimpwidgets-utils.h"
#include "plug-in.h"
#include "plug-ins.h"
#include "plug-in-debug.h"
@ -655,10 +648,7 @@ plug_in_close (PlugIn *plug_in,
}
/* Close any dialogs that this plugin might have opened */
brush_select_dialogs_check ();
gradient_select_dialogs_check ();
palette_select_dialogs_check ();
pattern_select_dialogs_check ();
gimp_pdb_dialogs_check (plug_in->gimp);
gimp->open_plug_ins = g_slist_remove (gimp->open_plug_ins, plug_in);
}

15
app/plug-in/gimppluginmanager.c
View File

@ -20,7 +20,7 @@
#include "string.h"
#include <gtk/gtk.h>
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpbase/gimpprotocol.h"
@ -36,13 +36,6 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "gui/plug-in-menus.h"
#include "plug-in.h"
#include "plug-ins.h"
#include "plug-in-def.h"
@ -277,7 +270,7 @@ plug_ins_init (Gimp *gimp,
}
if (! gimp->no_interface)
plug_in_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN);
gimp_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN);
/* initial the plug-ins */
(* status_callback) (_("Initializing Plug-ins"), "", 0);
@ -575,7 +568,7 @@ plug_ins_temp_proc_def_add (Gimp *gimp,
locale_domain = plug_ins_locale_domain (gimp, progname, NULL);
help_domain = plug_ins_help_domain (gimp, progname, NULL);
plug_in_menus_create_entry (NULL, proc_def,
gimp_menus_create_entry (gimp, proc_def,
locale_domain, help_domain);
}
}
@ -597,7 +590,7 @@ plug_ins_temp_proc_def_remove (Gimp *gimp,
if (! gimp->no_interface)
{
if (proc_def->menu_path)
plug_in_menus_delete_entry (proc_def->menu_path);
gimp_menus_delete_entry (gimp, proc_def->menu_path);
}
/* Unregister the procedural database entry */

29
app/plug-in/plug-in-progress.c
View File

@ -18,27 +18,21 @@
#include "config.h"
#include <gtk/gtk.h>
#include <glib-object.h>
#include "plug-in-types.h"
#ifdef __GNUC__
#warning FIXME #include "display/display-types.h"
#endif
#include "display/display-types.h"
#include "core/gimp.h"
#include "pdb/procedural_db.h"
#include "display/gimpdisplay.h"
#include "display/gimpprogress.h"
#include "plug-in.h"
#include "plug-in-progress.h"
/* local function prototypes */
static void plug_in_progress_cancel (GtkWidget *widget,
static void plug_in_progress_cancel (gpointer eek,
PlugIn *plug_in);
@ -49,22 +43,19 @@ plug_in_progress_start (PlugIn *plug_in,
const gchar *message,
gint gdisp_ID)
{
GimpDisplay *gdisp = NULL;
g_return_if_fail (plug_in != NULL);
if (! message)
message = plug_in->prog;
if (gdisp_ID > 0)
gdisp = gimp_display_get_by_ID (plug_in->gimp, gdisp_ID);
if (plug_in->progress)
plug_in->progress = gimp_progress_restart (plug_in->progress, message,
plug_in->progress = gimp_restart_progress (plug_in->gimp,
plug_in->progress, message,
G_CALLBACK (plug_in_progress_cancel),
plug_in);
else
plug_in->progress = gimp_progress_start (gdisp, message, TRUE,
plug_in->progress = gimp_start_progress (plug_in->gimp,
gdisp_ID, message,
G_CALLBACK (plug_in_progress_cancel),
plug_in);
}
@ -78,7 +69,7 @@ plug_in_progress_update (PlugIn *plug_in,
if (! plug_in->progress)
plug_in_progress_start (plug_in, NULL, -1);
gimp_progress_update (plug_in->progress, percentage);
gimp_update_progress (plug_in->gimp, plug_in->progress, percentage);
}
void
@ -88,7 +79,7 @@ plug_in_progress_end (PlugIn *plug_in)
if (plug_in->progress)
{
gimp_progress_end (plug_in->progress);
gimp_end_progress (plug_in->gimp, plug_in->progress);
plug_in->progress = NULL;
}
}
@ -97,7 +88,7 @@ plug_in_progress_end (PlugIn *plug_in)
/* private functions */
static void
plug_in_progress_cancel (GtkWidget *widget,
plug_in_progress_cancel (gpointer eek,
PlugIn *plug_in)
{
if (plug_in->recurse_main_loop || plug_in->temp_main_loops)

14
app/plug-in/plug-in.c
View File

@ -39,7 +39,7 @@
#include <sys/param.h>
#endif
#include <gtk/gtk.h>
#include <glib-object.h>
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
@ -80,13 +80,6 @@
#include "core/gimp.h"
#include "core/gimpenvirontable.h"
#include "gui/brush-select.h"
#include "gui/gradient-select.h"
#include "gui/palette-select.h"
#include "gui/pattern-select.h"
#include "widgets/gimpwidgets-utils.h"
#include "plug-in.h"
#include "plug-ins.h"
#include "plug-in-debug.h"
@ -655,10 +648,7 @@ plug_in_close (PlugIn *plug_in,
}
/* Close any dialogs that this plugin might have opened */
brush_select_dialogs_check ();
gradient_select_dialogs_check ();
palette_select_dialogs_check ();
pattern_select_dialogs_check ();
gimp_pdb_dialogs_check (plug_in->gimp);
gimp->open_plug_ins = g_slist_remove (gimp->open_plug_ins, plug_in);
}

15
app/plug-in/plug-ins.c
View File

@ -20,7 +20,7 @@
#include "string.h"
#include <gtk/gtk.h>
#include <glib-object.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpbase/gimpprotocol.h"
@ -36,13 +36,6 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "gui/plug-in-menus.h"
#include "plug-in.h"
#include "plug-ins.h"
#include "plug-in-def.h"
@ -277,7 +270,7 @@ plug_ins_init (Gimp *gimp,
}
if (! gimp->no_interface)
plug_in_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN);
gimp_menus_init (gimp, gimp->plug_in_defs, STD_PLUGINS_DOMAIN);
/* initial the plug-ins */
(* status_callback) (_("Initializing Plug-ins"), "", 0);
@ -575,7 +568,7 @@ plug_ins_temp_proc_def_add (Gimp *gimp,
locale_domain = plug_ins_locale_domain (gimp, progname, NULL);
help_domain = plug_ins_help_domain (gimp, progname, NULL);
plug_in_menus_create_entry (NULL, proc_def,
gimp_menus_create_entry (gimp, proc_def,
locale_domain, help_domain);
}
}
@ -597,7 +590,7 @@ plug_ins_temp_proc_def_remove (Gimp *gimp,
if (! gimp->no_interface)
{
if (proc_def->menu_path)
plug_in_menus_delete_entry (proc_def->menu_path);
gimp_menus_delete_entry (gimp, proc_def->menu_path);
}
/* Unregister the procedural database entry */