Commit af330e96 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

added lots of members for the complete state of the plug-ins.

2003-02-11  Michael Natterer  <mitch@gimp.org>

	* app/core/gimp.h: added lots of members for the complete
	state of the plug-ins.

	* app/plug-in/plug-in-types.h: added PlugInShm typedef.

	* app/plug-in/plug-in-message.c
	* app/plug-in/plug-in-rc.[ch]
	* app/plug-in/plug-in-run.[ch]
	* app/plug-in/plug-in-shm.c
	* app/plug-in/plug-in.[ch]
	* app/plug-in/plug-ins.[ch]: removed all global & static variables
	and pass around more "Gimp" pointers.

	* app/plug-in/plug-in-debug.c: use G_N_ELEMENTS().

	* app/gui/image-menu.c
	* app/gui/plug-in-commands.c
	* app/gui/plug-in-menus.c
	* app/gui/toolbox-menu.c
	* app/xcf/xcf.c
	* tools/pdbgen/pdb/fileops.pdb
	* tools/pdbgen/pdb/plug_in.pdb: changed accordingly.

	* app/pdb/fileops_cmds.c
	* app/pdb/plug_in_cmds.c: regenerated.
parent 3768c9b3
2003-02-11 Michael Natterer <mitch@gimp.org>
* app/core/gimp.h: added lots of members for the complete
state of the plug-ins.
* app/plug-in/plug-in-types.h: added PlugInShm typedef.
* app/plug-in/plug-in-message.c
* app/plug-in/plug-in-rc.[ch]
* app/plug-in/plug-in-run.[ch]
* app/plug-in/plug-in-shm.c
* app/plug-in/plug-in.[ch]
* app/plug-in/plug-ins.[ch]: removed all global & static variables
and pass around more "Gimp" pointers.
* app/plug-in/plug-in-debug.c: use G_N_ELEMENTS().
* app/gui/image-menu.c
* app/gui/plug-in-commands.c
* app/gui/plug-in-menus.c
* app/gui/toolbox-menu.c
* app/xcf/xcf.c
* tools/pdbgen/pdb/fileops.pdb
* tools/pdbgen/pdb/plug_in.pdb: changed accordingly.
* app/pdb/fileops_cmds.c
* app/pdb/plug_in_cmds.c: regenerated.
2003-02-11 Sven Neumann <sven@gimp.org>
* plug-ins/common/uniteditor.c: more code cleanup.
......
......@@ -141,7 +141,7 @@ plug_in_run_cmd_callback (GtkWidget *widget,
plug_in_run (gimp, proc_rec, args, argc, FALSE, TRUE, gdisp_ID);
if (proc_rec->proc_type == GIMP_PLUGIN)
last_plug_in = proc_rec;
gimp->last_plug_in = proc_rec;
g_free (args);
}
......
......@@ -78,8 +78,20 @@ struct _Gimp
GimpModuleDB *module_db;
gboolean write_modulerc;
GimpEnvironTable *environ_table;
GSList *plug_in_defs;
gboolean write_pluginrc;
GSList *plug_in_proc_defs;
GSList *plug_in_locale_domains;
GSList *plug_in_help_paths;
PlugIn *current_plug_in;
GSList *open_plug_ins;
GSList *plug_in_stack;
ProcRecord *last_plug_in;
PlugInShm *plug_in_shm;
GimpEnvironTable *environ_table;
GimpPlugInDebug *plug_in_debug;
GimpContainer *images;
......
......@@ -907,7 +907,7 @@ image_menu_setup (GimpItemFactory *factory)
image_menu_background_changed (user_context, &bg, factory);
}
plug_in_menus_create (factory, proc_defs);
plug_in_menus_create (factory, factory->gimp->plug_in_proc_defs);
{
static gchar *rotate_plugins[] = { "Rotate 90 degrees",
......
......@@ -141,7 +141,7 @@ plug_in_run_cmd_callback (GtkWidget *widget,
plug_in_run (gimp, proc_rec, args, argc, FALSE, TRUE, gdisp_ID);
if (proc_rec->proc_type == GIMP_PLUGIN)
last_plug_in = proc_rec;
gimp->last_plug_in = proc_rec;
g_free (args);
}
......
......@@ -26,6 +26,8 @@
#include "gui-types.h"
#include "core/gimp.h"
#include "plug-in/plug-ins.h"
#include "plug-in/plug-in-def.h"
#include "plug-in/plug-in-proc.h"
......@@ -284,7 +286,9 @@ plug_in_menus_update (GimpItemFactory *item_factory,
if (! strcmp (factory_path, "<Image>"))
is_image_factory = TRUE;
for (tmp = proc_defs; tmp; tmp = g_slist_next (tmp))
for (tmp = item_factory->gimp->plug_in_proc_defs;
tmp;
tmp = g_slist_next (tmp))
{
proc_def = tmp->data;
......@@ -325,8 +329,9 @@ plug_in_menus_update (GimpItemFactory *item_factory,
sensitive);
}
if (is_image_factory &&
last_plug_in && (last_plug_in == &proc_def->db_info))
if (is_image_factory &&
item_factory->gimp->last_plug_in &&
item_factory->gimp->last_plug_in == &proc_def->db_info)
{
gchar *basename;
gchar *ellipses;
......@@ -363,7 +368,7 @@ plug_in_menus_update (GimpItemFactory *item_factory,
}
}
if (is_image_factory && ! last_plug_in)
if (is_image_factory && ! item_factory->gimp->last_plug_in)
{
gimp_item_factory_set_label (GTK_ITEM_FACTORY (item_factory),
"/Filters/Repeat Last",
......
......@@ -24,6 +24,8 @@
#include "gui-types.h"
#include "core/gimp.h"
#include "plug-in/plug-ins.h"
#include "widgets/gimpitemfactory.h"
......@@ -256,7 +258,7 @@ toolbox_menu_setup (GimpItemFactory *factory)
menus_last_opened_add (factory, factory->gimp);
plug_in_menus_create (factory, proc_defs);
plug_in_menus_create (factory, factory->gimp->plug_in_proc_defs);
/* Move all menu items under "<Toolbox>/Xtns" which are not submenus or
* separators to the top of the menu
......
......@@ -907,7 +907,7 @@ image_menu_setup (GimpItemFactory *factory)
image_menu_background_changed (user_context, &bg, factory);
}
plug_in_menus_create (factory, proc_defs);
plug_in_menus_create (factory, factory->gimp->plug_in_proc_defs);
{
static gchar *rotate_plugins[] = { "Rotate 90 degrees",
......
......@@ -26,6 +26,8 @@
#include "gui-types.h"
#include "core/gimp.h"
#include "plug-in/plug-ins.h"
#include "plug-in/plug-in-def.h"
#include "plug-in/plug-in-proc.h"
......@@ -284,7 +286,9 @@ plug_in_menus_update (GimpItemFactory *item_factory,
if (! strcmp (factory_path, "<Image>"))
is_image_factory = TRUE;
for (tmp = proc_defs; tmp; tmp = g_slist_next (tmp))
for (tmp = item_factory->gimp->plug_in_proc_defs;
tmp;
tmp = g_slist_next (tmp))
{
proc_def = tmp->data;
......@@ -325,8 +329,9 @@ plug_in_menus_update (GimpItemFactory *item_factory,
sensitive);
}
if (is_image_factory &&
last_plug_in && (last_plug_in == &proc_def->db_info))
if (is_image_factory &&
item_factory->gimp->last_plug_in &&
item_factory->gimp->last_plug_in == &proc_def->db_info)
{
gchar *basename;
gchar *ellipses;
......@@ -363,7 +368,7 @@ plug_in_menus_update (GimpItemFactory *item_factory,
}
}
if (is_image_factory && ! last_plug_in)
if (is_image_factory && ! item_factory->gimp->last_plug_in)
{
gimp_item_factory_set_label (GTK_ITEM_FACTORY (item_factory),
"/Filters/Repeat Last",
......
......@@ -24,6 +24,8 @@
#include "gui-types.h"
#include "core/gimp.h"
#include "plug-in/plug-ins.h"
#include "widgets/gimpitemfactory.h"
......@@ -256,7 +258,7 @@ toolbox_menu_setup (GimpItemFactory *factory)
menus_last_opened_add (factory, factory->gimp);
plug_in_menus_create (factory, proc_defs);
plug_in_menus_create (factory, factory->gimp->plug_in_proc_defs);
/* Move all menu items under "<Toolbox>/Xtns" which are not submenus or
* separators to the top of the menu
......
......@@ -522,7 +522,7 @@ register_magic_load_handler_invoker (Gimp *gimp,
goto done;
}
file_proc = plug_ins_file_handler (name, extensions, prefixes, magics);
file_proc = plug_ins_file_handler (gimp, name, extensions, prefixes, magics);
if (! file_proc)
{
......@@ -670,7 +670,7 @@ register_save_handler_invoker (Gimp *gimp,
goto done;
}
file_proc = plug_ins_file_handler (name, extensions, prefixes, NULL);
file_proc = plug_ins_file_handler (gimp, name, extensions, prefixes, NULL);
if (! file_proc)
{
......
......@@ -81,12 +81,12 @@ progress_init_invoker (Gimp *gimp,
gdisplay = args[1].value.pdb_int;
if (current_plug_in && current_plug_in->open)
if (gimp->current_plug_in && gimp->current_plug_in->open)
{
success = TRUE;
if (! gimp->no_interface)
plug_in_progress_start (current_plug_in, message, gdisplay);
plug_in_progress_start (gimp->current_plug_in, message, gdisplay);
}
return procedural_db_return_args (&progress_init_proc, success);
......@@ -131,12 +131,12 @@ progress_update_invoker (Gimp *gimp,
percentage = args[0].value.pdb_float;
if (current_plug_in && current_plug_in->open)
if (gimp->current_plug_in && gimp->current_plug_in->open)
{
success = TRUE;
if (! gimp->no_interface)
plug_in_progress_update (current_plug_in, percentage);
plug_in_progress_update (gimp->current_plug_in, percentage);
}
return procedural_db_return_args (&progress_update_proc, success);
......@@ -237,11 +237,9 @@ plugins_query_invoker (Gimp *gimp,
* where we can store the strings.
*/
tmp = proc_defs;
while (tmp)
for (gimp->plug_in_proc_defs; tmp; tmp = g_slist_next (tmp))
{
proc_def = tmp->data;
tmp = tmp->next;
proc_def = (PlugInProcDef *) tmp->data;
if (proc_def->prog && proc_def->menu_path)
{
......@@ -266,14 +264,12 @@ plugins_query_invoker (Gimp *gimp,
realname_strs = g_new (gchar *, num_plugins);
time_ints = g_new (gint , num_plugins);
tmp = proc_defs;
while (tmp)
for (tmp = gimp->plug_in_proc_defs; tmp; tmp = g_slist_next (tmp))
{
if (i > num_plugins)
g_error ("Internal error counting plugins");
proc_def = tmp->data;
tmp = tmp->next;
proc_def = (PlugInProcDef *) tmp->data;
if (proc_def->prog && proc_def->menu_path)
{
......@@ -427,11 +423,11 @@ plugin_domain_register_invoker (Gimp *gimp,
if (success)
{
if (current_plug_in && current_plug_in->query)
if (gimp->current_plug_in && gimp->current_plug_in->query)
{
plug_in_def_set_locale_domain_name (current_plug_in->plug_in_def,
plug_in_def_set_locale_domain_name (gimp->current_plug_in->plug_in_def,
domain_name);
plug_in_def_set_locale_domain_path (current_plug_in->plug_in_def,
plug_in_def_set_locale_domain_path (gimp->current_plug_in->plug_in_def,
domain_path);
}
}
......@@ -482,9 +478,9 @@ plugin_help_register_invoker (Gimp *gimp,
if (success)
{
if (current_plug_in && current_plug_in->query)
if (gimp->current_plug_in && gimp->current_plug_in->query)
{
plug_in_def_set_help_path (current_plug_in->plug_in_def, help_path);
plug_in_def_set_help_path (gimp->current_plug_in->plug_in_def, help_path);
}
}
......
......@@ -337,14 +337,14 @@ plug_in_handle_proc_run (PlugIn *plug_in,
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (plug_in->gimp, proc_run->name);
plug_in_push (plug_in);
plug_in_push (plug_in->gimp, plug_in);
/* Execute the procedure even if procedural_db_lookup() returned NULL,
* procedural_db_execute() will return appropriate error return_vals.
*/
return_vals = procedural_db_execute (plug_in->gimp, proc_run->name, args);
plug_in_pop ();
plug_in_pop (plug_in->gimp);
if (return_vals)
{
......
......@@ -122,17 +122,6 @@ static gboolean plug_in_recv_message (GIOChannel *channel,
static void plug_in_prep_for_exec (gpointer data);
/* global variables */
PlugIn *current_plug_in = NULL;
/* private variables */
static GSList *open_plug_ins = NULL;
static GSList *plug_in_stack = NULL;
void
plug_in_init (Gimp *gimp)
{
......@@ -167,7 +156,7 @@ plug_in_exit (Gimp *gimp)
if (gimp->use_shm)
plug_in_shm_exit (gimp);
list = open_plug_ins;
list = gimp->open_plug_ins;
while (list)
{
PlugIn *plug_in;
......@@ -499,7 +488,7 @@ plug_in_open (PlugIn *plug_in)
plug_in_recv_message,
plug_in);
open_plug_ins = g_slist_prepend (open_plug_ins, plug_in);
gimp->open_plug_ins = g_slist_prepend (gimp->open_plug_ins, plug_in);
}
plug_in->open = TRUE;
......@@ -520,7 +509,8 @@ void
plug_in_close (PlugIn *plug_in,
gboolean kill_it)
{
gint status;
Gimp *gimp;
gint status;
#ifndef G_OS_WIN32
struct timeval tv;
#endif
......@@ -528,6 +518,8 @@ plug_in_close (PlugIn *plug_in,
g_return_if_fail (plug_in != NULL);
g_return_if_fail (plug_in->open == TRUE);
gimp = plug_in->gimp;
if (! plug_in->open)
return;
......@@ -650,7 +642,7 @@ plug_in_close (PlugIn *plug_in,
palette_select_dialogs_check ();
pattern_select_dialogs_check ();
open_plug_ins = g_slist_remove (open_plug_ins, plug_in);
gimp->open_plug_ins = g_slist_remove (gimp->open_plug_ins, plug_in);
}
static gboolean
......@@ -799,35 +791,40 @@ plug_in_flush (GIOChannel *channel,
}
void
plug_in_push (PlugIn *plug_in)
plug_in_push (Gimp *gimp,
PlugIn *plug_in)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (plug_in != NULL);
current_plug_in = plug_in;
gimp->current_plug_in = plug_in;
plug_in_stack = g_slist_prepend (plug_in_stack, current_plug_in);
gimp->plug_in_stack = g_slist_prepend (gimp->plug_in_stack,
gimp->current_plug_in);
}
void
plug_in_pop (void)
plug_in_pop (Gimp *gimp)
{
GSList *tmp;
if (current_plug_in)
g_return_if_fail (GIMP_IS_GIMP (gimp));
if (gimp->current_plug_in)
{
tmp = plug_in_stack;
plug_in_stack = plug_in_stack->next;
tmp = gimp->plug_in_stack;
gimp->plug_in_stack = gimp->plug_in_stack->next;
tmp->next = NULL;
g_slist_free (tmp);
}
if (plug_in_stack)
if (gimp->plug_in_stack)
{
current_plug_in = plug_in_stack->data;
gimp->current_plug_in = gimp->plug_in_stack->data;
}
else
{
current_plug_in = NULL;
gimp->current_plug_in = NULL;
}
}
......
......@@ -84,14 +84,12 @@ gboolean plug_in_open (PlugIn *plug_in);
void plug_in_close (PlugIn *plug_in,
gboolean kill_it);
void plug_in_push (PlugIn *plug_in);
void plug_in_pop (void);
void plug_in_push (Gimp *gimp,
PlugIn *plug_in);
void plug_in_pop (Gimp *gimp);
void plug_in_main_loop (PlugIn *plug_in);
void plug_in_main_loop_quit (PlugIn *plug_in);
extern PlugIn *current_plug_in;
#endif /* __PLUG_IN_H__ */
......@@ -43,8 +43,6 @@ static const GDebugKey gimp_debug_wrap_keys[] = {
{"run", GIMP_DEBUG_WRAP_RUN},
{"on", GIMP_DEBUG_WRAP_DEFAULT}
};
static const guint gimp_ndebug_wrap_keys = sizeof (gimp_debug_wrap_keys) / sizeof (GDebugKey);
void
......@@ -83,7 +81,7 @@ plug_in_debug_init (Gimp *gimp)
dbg->name = g_strndup (wrap, debug_string - wrap);
dbg->flags = g_parse_debug_string (debug_string + 1,
gimp_debug_wrap_keys,
gimp_ndebug_wrap_keys);
G_N_ELEMENTS (gimp_debug_wrap_keys));
}
else
{
......
......@@ -53,11 +53,6 @@ static Argument * plug_in_get_return_vals (PlugIn *plug_in,
ProcRecord *proc_rec);
/* global variables */
ProcRecord *last_plug_in = NULL;
/* public functions */
Argument *
......@@ -72,6 +67,10 @@ plug_in_run (Gimp *gimp,
Argument *return_vals = NULL;
PlugIn *plug_in;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (proc_rec != NULL, NULL);
g_return_val_if_fail (argc == 0 || args != NULL, NULL);
if (proc_rec->proc_type == GIMP_TEMPORARY)
{
return_vals = plug_in_temp_run (proc_rec, args, argc);
......@@ -164,14 +163,16 @@ plug_in_repeat (Gimp *gimp,
Argument *args;
gint i;
if (last_plug_in)
g_return_if_fail (GIMP_IS_GIMP (gimp));
if (gimp->last_plug_in)
{
/* construct the procedures arguments */
args = g_new (Argument, 3);
/* initialize the first three argument types */
for (i = 0; i < 3; i++)
args[i].arg_type = last_plug_in->args[i].arg_type;
args[i].arg_type = gimp->last_plug_in->args[i].arg_type;
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ?
......@@ -180,7 +181,7 @@ plug_in_repeat (Gimp *gimp,
args[2].value.pdb_int = drawable_ID;
/* run the plug-in procedure */
plug_in_run (gimp, last_plug_in, args, 3, FALSE, TRUE, display_ID);
plug_in_run (gimp, gimp->last_plug_in, args, 3, FALSE, TRUE, display_ID);
g_free (args);
}
......
......@@ -40,7 +40,4 @@ void plug_in_repeat (Gimp *gimp,
gboolean with_interface);
extern ProcRecord *last_plug_in;
#endif /* __PLUG_IN_RUN_H__ */
......@@ -53,11 +53,6 @@ static Argument * plug_in_get_return_vals (PlugIn *plug_in,
ProcRecord *proc_rec);
/* global variables */
ProcRecord *last_plug_in = NULL;
/* public functions */
Argument *
......@@ -72,6 +67,10 @@ plug_in_run (Gimp *gimp,
Argument *return_vals = NULL;
PlugIn *plug_in;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (proc_rec != NULL, NULL);
g_return_val_if_fail (argc == 0 || args != NULL, NULL);
if (proc_rec->proc_type == GIMP_TEMPORARY)
{
return_vals = plug_in_temp_run (proc_rec, args, argc);
......@@ -164,14 +163,16 @@ plug_in_repeat (Gimp *gimp,
Argument *args;
gint i;
if (last_plug_in)
g_return_if_fail (GIMP_IS_GIMP (gimp));
if (gimp->last_plug_in)
{
/* construct the procedures arguments */
args = g_new (Argument, 3);
/* initialize the first three argument types */
for (i = 0; i < 3; i++)
args[i].arg_type = last_plug_in->args[i].arg_type;
args[i].arg_type = gimp->last_plug_in->args[i].arg_type;
/* initialize the first three plug-in arguments */
args[0].value.pdb_int = (with_interface ?
......@@ -180,7 +181,7 @@ plug_in_repeat (Gimp *gimp,
args[2].value.pdb_int = drawable_ID;
/* run the plug-in procedure */
plug_in_run (gimp, last_plug_in, args, 3, FALSE, TRUE, display_ID);
plug_in_run (gimp, gimp->last_plug_in, args, 3, FALSE, TRUE, display_ID);
g_free (args);
}
......
......@@ -40,7 +40,4 @@ void plug_in_repeat (Gimp *gimp,
gboolean with_interface);
extern ProcRecord *last_plug_in;
#endif /* __PLUG_IN_RUN_H__ */
......@@ -77,15 +77,8 @@ struct _PlugInHelpPathDef
static void plug_ins_init_file (GimpDatafileData *file_data);
static void plug_ins_add_to_db (Gimp *gimp);
static PlugInProcDef * plug_ins_proc_def_insert (PlugInProcDef *proc_def);
GSList *proc_defs = NULL;
static GSList *plug_in_defs = NULL;
static GSList *locale_domain_defs = NULL;
static GSList *help_path_defs = NULL;
static gboolean write_pluginrc = FALSE;
static PlugInProcDef * plug_ins_proc_def_insert (Gimp *gimp,
PlugInProcDef *proc_def);
/* public functions */
......@@ -114,7 +107,8 @@ plug_ins_init (Gimp *gimp,
gimp_datafiles_read_directories (path,
G_FILE_TEST_IS_EXECUTABLE,
plug_ins_init_file, &plug_in_defs);
plug_ins_init_file,
&gimp->plug_in_defs);
g_free (path);
......@@ -139,21 +133,23 @@ plug_ins_init (Gimp *gimp,
}
(* status_callback) (_("Resource configuration"), filename, -1);
plug_in_rc_parse (filename);
plug_in_rc_parse (gimp, filename);
/* query any plug-ins that have changed since we last wrote out
* the pluginrc file.
*/
(* status_callback) (_("Querying new Plug-ins"), "", 0);
n_plugins = g_slist_length (plug_in_defs);
n_plugins = g_slist_length (gimp->plug_in_defs);
for (tmp = plug_in_defs, nth = 0; tmp; tmp = g_slist_next (tmp), nth++)
for (tmp = gimp->plug_in_defs, nth = 0;
tmp;
tmp = g_slist_next (tmp), nth++)
{
plug_in_def = tmp->data;
if (plug_in_def->needs_query)
{
write_pluginrc = TRUE;
gimp->write_pluginrc = TRUE;
if (gimp->be_verbose)
g_print (_("querying plug-in: \"%s\"\n"), plug_in_def->prog);
......@@ -167,7 +163,7 @@ plug_ins_init (Gimp *gimp,
}
/* insert the proc defs */
for (tmp = plug_in_defs; tmp; tmp = g_slist_next (tmp))
for (tmp = gimp->plug_in_defs; tmp; tmp = g_slist_next (tmp))
{
plug_in_def = tmp->data;
......@@ -179,7 +175,7 @@ plug_ins_init (Gimp *gimp,
proc_def->mtime = plug_in_def->mtime;
overridden_proc_def = plug_ins_proc_def_insert (proc_def);
overridden_proc_def = plug_ins_proc_def_insert (gimp, proc_def);
if (overridden_proc_def)
{
......@@ -191,7 +187,7 @@ plug_ins_init (Gimp *gimp,
/* search the plugin list to see if any plugins had references to
* the overridden_proc_def.
*/
for (tmp2 = plug_in_defs; tmp2; tmp2 = g_slist_next (tmp2))
for (tmp2 = gimp->plug_in_defs; tmp2; tmp2 = g_slist_next (tmp2))
{
PlugInDef *plug_in_def2;
......@@ -208,12 +204,13 @@ plug_ins_init (Gimp *gimp,
}
/* write the pluginrc file if necessary */
if (write_pluginrc)
if (gimp->write_pluginrc)
{
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_rc_write (plug_in_defs, filename);
plug_in_rc_write (gimp->plug_in_defs, filename);
gimp->write_pluginrc = FALSE;
}
g_free (filename);
......@@ -226,7 +223,7 @@ plug_ins_init (Gimp *gimp,
gimp->save_procs = g_slist_reverse (gimp->save_procs);
/* create help_path and locale_domain lists */
for (tmp = plug_in_defs; tmp; tmp = g_slist_next (tmp))
for (tmp = gimp->plug_in_defs; tmp; tmp = g_slist_next (tmp))
{
plug_in_def = tmp->data;
......@@ -240,8 +237,8 @@ plug_ins_init (Gimp *gimp,
locale_domain_def->locale_domain = g_strdup (plug_in_def->locale_domain);
locale_domain_def->locale_path = g_strdup (plug_in_def->locale_path);
locale_domain_defs = g_slist_prepend (locale_domain_defs,
locale_domain_def);
gimp->plug_in_locale_domains =
g_slist_prepend (gimp->plug_in_locale_domains, locale_domain_def);
}
if (plug_in_def->help_path)
......@@ -253,17 +250,20 @@ plug_ins_init (Gimp *gimp,
help_path_def->prog_name = g_strdup (plug_in_def->prog);
help_path_def->help_path = g_strdup (plug_in_def->help_path);
help_path_defs = g_slist_prepend (help_path_defs, help_path_def);
gimp->plug_in_help_paths =
g_slist_prepend (gimp->plug_in_help_paths, help_path_def);