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

app/Makefile.am removed... 

2001-11-30  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* app/plug_in.[ch]: removed...

	* app/plug-in/Makefile.am
	* app/plug-in/plug-in-types.h
	* app/plug-in/plug-in.[ch]: ...and added here.

	* app/appenv.h: removed StackTraceMode and MessageHandlerType...

	* libgimpbase/gimpbasetypes.h: ...and added them here.

	* tools/pdbgen/Makefile.am: don't scan "app/apptypes.h" for enums.

	* tools/pdbgen/enumcode.pl: added a general check to prevent
	enums which are defined in libgimp* from being written to
	"libgimp/gimpenums.c".

	* libgimp/gimpenums.h
	* plug-ins/script-fu/script-fu-constants.c
	* tools/pdbgen/enums.pl: regenerated.

	* app/core/core-types.h: include "pdb/pdb-types.h" so including
	"core/core-types.h" gets the whole core type space.

	* app/core/gimp.[ch]: added a "stack_trace_mode" parameter to the
	constructor and store it in the Gimp struct because the value is
	also passed to plug-ins and nobody should include "appenv.h".

	* app/gimprc.[ch]: pass the alternate_system_gimprc and
	alternate_gimprc filenames from the command line to gimprc_prase()
	so we don't need to include "appenv.h".

	* app/batch.[ch]: pass the "batch_cmds" as parameter, don't
	include "append.h".

	* app/app_procs.c: pass more parameters around.

	* app/devices.c
	* app/errors.c
	* app/gimphelp.c
	* app/main.c
	* app/core/gimpgradient.c
	* app/display/gimpdisplay.c
	* app/display/gimpdisplayshell.c
	* app/file/file-open.c
	* app/file/file-save.c
	* app/file/file-utils.c
	* app/gui/commands.c
	* app/gui/error-console-dialog.c
	* app/gui/file-dialog-utils.c
	* app/gui/file-open-dialog.c
	* app/gui/file-save-dialog.c
	* app/gui/paths-dialog.c
	* app/gui/user-install-dialog.c
	* app/tools/gimpbezierselecttool.c
	* app/tools/xinput_airbrush.c
	* app/xcf/xcf.c
	* tools/pdbgen/pdb/fileops.pdb
	* tools/pdbgen/pdb/help.pdb
	* tools/pdbgen/pdb/message.pdb
	* tools/pdbgen/pdb/plug_in.pdb: changed accordingly:

	- changed "plug-in.h" include where needed.
	- don't call gimp_fatal_error() directly, it's called via the log
	  handler when calling g_error().
	- don't incude "errors.h" except from main.c.
	- changed stack_trace and message_handler enum names.
	- get "stack_trace_mode" from Gimp.
	- removed many inclusions of "appenv.h".

	* app/pdb/fileops_cmds.c
	* app/pdb/help_cmds.c
	* app/pdb/message_cmds.c
	* app/pdb/plug_in_cmds.c
	* app/pdb/procedural_db.c: regenerated.
This commit is contained in:
Michael Natterer 2001-12-01 00:14:14 +00:00 committed by Michael Natterer
parent 57157b4041
commit 77863d8868
95 changed files with 559 additions and 4458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ChangeLog
View File

@ -1,3 +1,81 @@
2001-11-30 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
* app/plug_in.[ch]: removed...
* app/plug-in/Makefile.am
* app/plug-in/plug-in-types.h
* app/plug-in/plug-in.[ch]: ...and added here.
* app/appenv.h: removed StackTraceMode and MessageHandlerType...
* libgimpbase/gimpbasetypes.h: ...and added them here.
* tools/pdbgen/Makefile.am: don't scan "app/apptypes.h" for enums.
* tools/pdbgen/enumcode.pl: added a general check to prevent
enums which are defined in libgimp* from being written to
"libgimp/gimpenums.c".
* libgimp/gimpenums.h
* plug-ins/script-fu/script-fu-constants.c
* tools/pdbgen/enums.pl: regenerated.
* app/core/core-types.h: include "pdb/pdb-types.h" so including
"core/core-types.h" gets the whole core type space.
* app/core/gimp.[ch]: added a "stack_trace_mode" parameter to the
constructor and store it in the Gimp struct because the value is
also passed to plug-ins and nobody should include "appenv.h".
* app/gimprc.[ch]: pass the alternate_system_gimprc and
alternate_gimprc filenames from the command line to gimprc_prase()
so we don't need to include "appenv.h".
* app/batch.[ch]: pass the "batch_cmds" as parameter, don't
include "append.h".
* app/app_procs.c: pass more parameters around.
* app/devices.c
* app/errors.c
* app/gimphelp.c
* app/main.c
* app/core/gimpgradient.c
* app/display/gimpdisplay.c
* app/display/gimpdisplayshell.c
* app/file/file-open.c
* app/file/file-save.c
* app/file/file-utils.c
* app/gui/commands.c
* app/gui/error-console-dialog.c
* app/gui/file-dialog-utils.c
* app/gui/file-open-dialog.c
* app/gui/file-save-dialog.c
* app/gui/paths-dialog.c
* app/gui/user-install-dialog.c
* app/tools/gimpbezierselecttool.c
* app/tools/xinput_airbrush.c
* app/xcf/xcf.c
* tools/pdbgen/pdb/fileops.pdb
* tools/pdbgen/pdb/help.pdb
* tools/pdbgen/pdb/message.pdb
* tools/pdbgen/pdb/plug_in.pdb: changed accordingly:
- changed "plug-in.h" include where needed.
- don't call gimp_fatal_error() directly, it's called via the log
handler when calling g_error().
- don't incude "errors.h" except from main.c.
- changed stack_trace and message_handler enum names.
- get "stack_trace_mode" from Gimp.
- removed many inclusions of "appenv.h".
* app/pdb/fileops_cmds.c
* app/pdb/help_cmds.c
* app/pdb/message_cmds.c
* app/pdb/plug_in_cmds.c
* app/pdb/procedural_db.c: regenerated.
2001-11-30 Michael Natterer <mitch@gimp.org>
* app/display/Makefile.am

8
app/Makefile.am
View File

@ -57,13 +57,6 @@ config_sources = \
gimprc.c \
gimprc.h
##
## stuff for plug-in/
##
plug_in_sources = \
plug_in.c \
plug_in.h
##
## stuff which is about to be replaced by new subsystems
##
@ -101,7 +94,6 @@ gimp_1_3_SOURCES = @STRIP_BEGIN@ \
$(core_ui_sources) \
$(core_sources) \
$(config_sources) \
$(plug_in_sources) \
$(bye_sources) \
$(stuff_sources) \
@STRIP_END@

4
app/actions/help-commands.c
View File

@ -24,9 +24,9 @@
#include "core/core-types.h"
#include "commands.h"
#include "plug-in/plug-in.h"
#include "plug_in.h"
#include "commands.h"
/***** Filters *****/

21
app/actions/plug-in-commands.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

21
app/app_procs.c
View File

@ -41,6 +41,8 @@
#include "core/gimpdatafactory.h"
#include "core/gimpunit.h"
#include "plug-in/plug-in.h"
#include "file/file-open.h"
#include "display/gimpdisplay-foreach.h"
@ -54,15 +56,9 @@
#include "appenv.h"
#include "app_procs.h"
#include "batch.h"
#include "errors.h"
#include "gimprc.h"
#include "plug_in.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
#include "libgimp/gimpintl.h"
@ -91,7 +87,10 @@ app_init (gint gimp_argc,
/* Create an instance of the "Gimp" object which is the root of the
* core object system
*/
the_gimp = gimp_new (be_verbose, no_data, no_interface);
the_gimp = gimp_new (be_verbose,
no_data,
no_interface,
stack_trace_mode);
/* Check if the user's gimp_directory exists
*/
@ -124,7 +123,7 @@ app_init (gint gimp_argc,
gimp_unitrc_load (the_gimp);
/* parse the local GIMP configuration file */
gimprc_parse (the_gimp);
gimprc_parse (the_gimp, alternate_system_gimprc, alternate_gimprc);
}
/* initialize lowlevel stuff */
@ -167,7 +166,7 @@ app_init (gint gimp_argc,
splash_destroy ();
/* FIXME: This needs to go in preferences */
message_handler = MESSAGE_BOX;
message_handler = GIMP_MESSAGE_BOX;
gui_restore (the_gimp, restore_session);
}
@ -187,7 +186,7 @@ app_init (gint gimp_argc,
}
}
batch_init (the_gimp);
batch_init (the_gimp, batch_cmds);
if (! no_interface)
{
@ -224,7 +223,7 @@ app_init_update_status (const gchar *text1,
static void
app_exit_finish (void)
{
message_handler = CONSOLE;
message_handler = GIMP_CONSOLE;
if (! no_interface)
{

43
app/appenv.h
View File

@ -20,38 +20,23 @@
#define __APPENV_H__
typedef enum
{
MESSAGE_BOX,
CONSOLE,
ERROR_CONSOLE
} MessageHandlerType;
typedef enum
{
STACK_TRACE_NEVER,
STACK_TRACE_QUERY,
STACK_TRACE_ALWAYS
} StackTraceMode;
/* command line options */
extern gboolean no_interface;
extern gboolean no_splash;
extern gboolean no_splash_image;
extern gboolean no_data;
extern gboolean be_verbose;
extern gboolean use_debug_handler;
extern gboolean console_messages;
extern gboolean restore_session;
extern StackTraceMode stack_trace_mode;
extern gchar *alternate_gimprc;
extern gchar *alternate_system_gimprc;
extern gchar **batch_cmds;
extern gboolean no_interface;
extern gboolean no_splash;
extern gboolean no_splash_image;
extern gboolean no_data;
extern gboolean be_verbose;
extern gboolean use_debug_handler;
extern gboolean console_messages;
extern gboolean restore_session;
extern GimpStackTraceMode stack_trace_mode;
extern gchar *alternate_gimprc;
extern gchar *alternate_system_gimprc;
extern gchar **batch_cmds;
/* other global variables */
extern gchar *prog_name;
extern MessageHandlerType message_handler;
extern gchar *prog_name;
extern GimpMessageHandlerType message_handler;
#endif /* __APPENV_H__ */

4
app/batch.c
View File

@ -31,7 +31,6 @@
#include "core/core-types.h"
#include "appenv.h"
#include "app_procs.h"
#include "batch.h"
@ -50,7 +49,8 @@ static ProcRecord *eval_proc;
void
batch_init (Gimp *gimp)
batch_init (Gimp *gimp,
gchar **batch_cmds)
{
gboolean read_from_stdin = FALSE;
gboolean perl_server_already_running = FALSE;

3
app/batch.h
View File

@ -20,7 +20,8 @@
#define __BATCH_H__
void batch_init (Gimp *gimp);
void batch_init (Gimp *gimp,
gchar **batch_cmds);
#endif /* __BATCH_H__ */

1
app/core/core-types.h
View File

@ -24,6 +24,7 @@
#include "libgimpmath/gimpmath.h"
#include "base/base-types.h"
#include "pdb/pdb-types.h"
#include "plug-in/plug-in-types.h"
#include "undo_types.h" /* EEK */

15
app/core/gimp.c
View File

@ -120,6 +120,7 @@ gimp_init (Gimp *gimp)
gimp->be_verbose = FALSE;
gimp->no_data = FALSE;
gimp->no_interface = FALSE;
gimp->stack_trace_mode = GIMP_STACK_TRACE_NEVER;
gimp->main_loops = NULL;
@ -320,17 +321,19 @@ gimp_finalize (GObject *object)
}
Gimp *
gimp_new (gboolean be_verbose,
gboolean no_data,
gboolean no_interface)
gimp_new (gboolean be_verbose,
gboolean no_data,
gboolean no_interface,
GimpStackTraceMode stack_trace_mode)
{
Gimp *gimp;
gimp = g_object_new (GIMP_TYPE_GIMP, NULL);
gimp->be_verbose = be_verbose ? TRUE : FALSE;
gimp->no_data = no_data ? TRUE : FALSE;
gimp->no_interface = no_interface ? TRUE : FALSE;
gimp->be_verbose = be_verbose ? TRUE : FALSE;
gimp->no_data = no_data ? TRUE : FALSE;
gimp->no_interface = no_interface ? TRUE : FALSE;
gimp->stack_trace_mode = stack_trace_mode;
return gimp;
}

4
app/core/gimp.h
View File

@ -49,6 +49,7 @@ struct _Gimp
gboolean be_verbose;
gboolean no_data;
gboolean no_interface;
GimpStackTraceMode stack_trace_mode;
GList *main_loops;
@ -128,7 +129,8 @@ GType gimp_get_type (void) G_GNUC_CONST;
Gimp * gimp_new (gboolean be_verbose,
gboolean no_data,
gboolean no_interface);
gboolean no_interface,
GimpStackTraceMode stack_trace_mode);
void gimp_initialize (Gimp *gimp,
GimpInitStatusFunc status_callback);

2
app/core/gimpgradient.c
View File

@ -36,8 +36,6 @@
#include "gimpimage.h"
#include "gimpgradient.h"
#include "errors.h"
#include "libgimp/gimpintl.h"

1
app/core/gimpprojection.c
View File

@ -44,7 +44,6 @@
#include "gimprc.h"
#include "nav_window.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"

7
app/devices.c
View File

@ -41,7 +41,6 @@
#include "widgets/gimpdnd.h"
#include "widgets/gimppreview.h"
#include "appenv.h"
#include "app_procs.h"
#include "devices.h"
#include "gimprc.h"
@ -464,7 +463,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_brush (device_info->context, brush);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->brush_name);
device_info->context->brush_name = g_strdup (brush_name);
@ -483,7 +482,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_pattern (device_info->context, pattern);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->pattern_name);
device_info->context->pattern_name = g_strdup (pattern_name);
@ -502,7 +501,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_gradient (device_info->context, gradient);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->gradient_name);
device_info->context->gradient_name = g_strdup (gradient_name);

4
app/dialogs/file-dialog-utils.c
View File

@ -25,9 +25,11 @@
#include "gui-types.h"
#include "plug-in/plug-in.h"
#include "widgets/gimpitemfactory.h"
#include "plug_in.h"
#include "file-dialog-utils.h"
void

3
app/dialogs/file-open-dialog.c
View File

@ -48,6 +48,8 @@
#include "core/gimpdocuments.h"
#include "core/gimpimage.h"
#include "plug-in/plug-in.h"
#include "file/file-open.h"
#include "file/file-utils.h"
@ -56,7 +58,6 @@
#include "file-dialog-utils.h"
#include "file-open-dialog.h"
#include "plug_in.h"
#include "undo.h"
#include "libgimp/gimpintl.h"

3
app/dialogs/file-save-dialog.c
View File

@ -38,6 +38,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "plug-in/plug-in.h"
#include "file/file-save.h"
#include "file/file-utils.h"
@ -47,7 +49,6 @@
#include "file-save-dialog.h"
#include "gimprc.h"
#include "plug_in.h"
#include "undo.h"
#include "libgimp/gimpintl.h"

2
app/dialogs/user-install-dialog.c
View File

@ -352,7 +352,7 @@ user_install_continue_callback (GtkWidget *widget,
#endif
gimprc_init (gimp);
gimp_unitrc_load (gimp);
gimprc_parse (gimp);
gimprc_parse (gimp, alternate_system_gimprc, alternate_gimprc);
user_install_tuning ();
break;

1
app/display/gimpdisplay.c
View File

@ -44,7 +44,6 @@
#include "gimprc.h"
#include "nav_window.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"

6
app/display/gimpdisplayshell-draw.c
View File

@ -25,7 +25,6 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "display-types.h"
#include "gui/gui-types.h" /* FIXME */
#include "base/temp-buf.h"
@ -40,12 +39,16 @@
#include "core/gimplayermask.h"
#include "core/gimppattern.h"
#include "plug-in/plug-in.h"
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpcursor.h"
#include "widgets/gimpdnd.h"
#include "widgets/gimpitemfactory.h"
#include "widgets/gimpwidgets-utils.h"
#include "gui/gui-types.h" /* FIXME */
#include "gui/info-window.h"
#include "tools/tools-types.h"
@ -63,7 +66,6 @@
#include "gimprc.h"
#include "nav_window.h"
#include "plug_in.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS

6
app/display/gimpdisplayshell.c
View File

@ -25,7 +25,6 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "display-types.h"
#include "gui/gui-types.h" /* FIXME */
#include "base/temp-buf.h"
@ -40,12 +39,16 @@
#include "core/gimplayermask.h"
#include "core/gimppattern.h"
#include "plug-in/plug-in.h"
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpcursor.h"
#include "widgets/gimpdnd.h"
#include "widgets/gimpitemfactory.h"
#include "widgets/gimpwidgets-utils.h"
#include "gui/gui-types.h" /* FIXME */
#include "gui/info-window.h"
#include "tools/tools-types.h"
@ -63,7 +66,6 @@
#include "gimprc.h"
#include "nav_window.h"
#include "plug_in.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS

16
app/errors.c
View File

@ -54,11 +54,11 @@ gimp_message_log_func (const gchar *log_domain,
{
switch (message_handler)
{
case MESSAGE_BOX:
case GIMP_MESSAGE_BOX:
gimp_message_box ((gchar *) message, NULL, NULL);
break;
case ERROR_CONSOLE:
case GIMP_ERROR_CONSOLE:
gimp_dialog_factory_dialog_raise (global_dock_factory,
"gimp:error-console", -1);
error_console_add ((gchar *) message);
@ -100,10 +100,10 @@ gimp_fatal_error (const gchar *fmt, ...)
switch (stack_trace_mode)
{
case STACK_TRACE_NEVER:
case GIMP_STACK_TRACE_NEVER:
break;
case STACK_TRACE_QUERY:
case GIMP_STACK_TRACE_QUERY:
{
sigset_t sigset;
@ -113,7 +113,7 @@ gimp_fatal_error (const gchar *fmt, ...)
}
break;
case STACK_TRACE_ALWAYS:
case GIMP_STACK_TRACE_ALWAYS:
{
sigset_t sigset;
@ -156,10 +156,10 @@ gimp_terminate (const gchar *fmt, ...)
{
switch (stack_trace_mode)
{
case STACK_TRACE_NEVER:
case GIMP_STACK_TRACE_NEVER:
break;
case STACK_TRACE_QUERY:
case GIMP_STACK_TRACE_QUERY:
{
sigset_t sigset;
@ -169,7 +169,7 @@ gimp_terminate (const gchar *fmt, ...)
}
break;
case STACK_TRACE_ALWAYS:
case GIMP_STACK_TRACE_ALWAYS:
{
sigset_t sigset;

5
app/file/file-open.c
View File

@ -41,10 +41,13 @@
#include "core/gimpimage.h"
#include "core/gimpdocuments.h"
#include "pdb/procedural_db.h"
#include "plug-in/plug-in.h"
#include "file-open.h"
#include "file-utils.h"
#include "plug_in.h"
#include "undo.h"
#include "libgimp/gimpintl.h"

5
app/file/file-save.c
View File

@ -43,10 +43,13 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "pdb/procedural_db.h"
#include "plug-in/plug-in.h"
#include "file-save.h"
#include "file-utils.h"
#include "plug_in.h"
#include "undo.h"
#include "libgimp/gimpintl.h"

6
app/file/file-utils.c
View File

@ -50,9 +50,11 @@
#include "core/gimpimage.h"
#include "file-utils.h"
#include "pdb/procedural_db.h"
#include "plug_in.h"
#include "plug-in/plug-in.h"
#include "file-utils.h"
static PlugInProcDef *

13
app/gimphelp.c
View File

@ -34,10 +34,11 @@
#include "core/core-types.h"
#include "plug-in/plug-in.h"
#include "app_procs.h"
#include "gimphelp.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -54,7 +55,9 @@ struct _GimpIdleHelp
gchar *help_data;
};
/* local function prototypes */
static gint gimp_idle_help (gpointer data);
static gboolean gimp_help_internal (const gchar *help_path,
const gchar *current_locale,
@ -63,9 +66,8 @@ static void gimp_help_netscape (const gchar *help_path,
const gchar *current_locale,
const gchar *help_data);
/**********************/
/* public functions */
/**********************/
/* The standard help function */
void
@ -95,9 +97,8 @@ gimp_help (const gchar *help_path,
}
}
/*********************/
/* local functions */
/*********************/
/* private functions */
static gboolean
gimp_idle_help (gpointer data)

23
app/gimprc.c
View File

@ -47,21 +47,20 @@
#include "core/gimpparasite.h"
#include "core/gimptoolinfo.h"
#include "tools/gimptool.h"
#include "plug-in/plug-in.h"
#include "widgets/gimpdialogfactory.h"
#include "tools/gimptool.h"
#include "gui/color-notebook.h"
#include "gui/menus.h"
#include "app_procs.h"
#include "appenv.h"
#include "devices.h"
#include "errors.h"
#include "general.h"
#include "gimphelp.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -455,23 +454,25 @@ parse_add_directory_tokens (void)
}
void
gimprc_parse (Gimp *gimp)
gimprc_parse (Gimp *gimp,
const gchar *cmdline_system_gimprc,
const gchar *cmdline_gimprc)
{
gchar *libfilename;
gchar *filename;
parse_add_directory_tokens ();
if (alternate_system_gimprc)
libfilename = g_strdup (alternate_system_gimprc);
if (cmdline_system_gimprc)
libfilename = g_strdup (cmdline_system_gimprc);
else
libfilename = g_strdup (gimp_system_rc_file ());
if (! gimprc_parse_file (libfilename))
g_message ("Can't open '%s' for reading.", libfilename);
if (alternate_gimprc != NULL)
filename = g_strdup (alternate_gimprc);
if (cmdline_gimprc != NULL)
filename = g_strdup (cmdline_gimprc);
else
filename = gimp_personal_rc_file ("gimprc");
@ -496,7 +497,7 @@ parse_absolute_gimprc_file (const gchar *filename)
if (! parse_info.fp)
return FALSE;
if (be_verbose)
if (the_gimp->be_verbose)
g_print (_("parsing \"%s\"\n"), filename);
cur_token = -1;
@ -1986,7 +1987,7 @@ transform_path (gchar *path,
}
else
{
gimp_terminate ("transform_path(): gimprc token referenced but not defined: %s", token);
g_error ("gimprc token referenced but not defined: %s", token);
}
}
tmp2 = transform_path ((gchar *) tmp2, FALSE);

4
app/gimprc.h
View File

@ -75,7 +75,9 @@ extern GimpRc gimprc;
*/
gboolean gimprc_init (Gimp *gimp);
void gimprc_parse (Gimp *gimp);
void gimprc_parse (Gimp *gimp,
const gchar *cmdline_system_gimprc,
const gchar *cmdline_gimprc);
void gimprc_save (GList **updated_options,
GList **conflicting_options);

4
app/gui/commands.c
View File

@ -24,9 +24,9 @@
#include "core/core-types.h"
#include "commands.h"
#include "plug-in/plug-in.h"
#include "plug_in.h"
#include "commands.h"
/***** Filters *****/

7
app/gui/device-status-dialog.c
View File

@ -41,7 +41,6 @@
#include "widgets/gimpdnd.h"
#include "widgets/gimppreview.h"
#include "appenv.h"
#include "app_procs.h"
#include "devices.h"
#include "gimprc.h"
@ -464,7 +463,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_brush (device_info->context, brush);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->brush_name);
device_info->context->brush_name = g_strdup (brush_name);
@ -483,7 +482,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_pattern (device_info->context, pattern);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->pattern_name);
device_info->context->pattern_name = g_strdup (pattern_name);
@ -502,7 +501,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_gradient (device_info->context, gradient);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->gradient_name);
device_info->context->gradient_name = g_strdup (gradient_name);

6
app/gui/error-console-dialog.c
View File

@ -165,7 +165,7 @@ error_console_create (void)
menu);
/* FIXME: interact with preferences */
message_handler = ERROR_CONSOLE;
message_handler = GIMP_ERROR_CONSOLE;
return error_console;
}
@ -177,7 +177,7 @@ error_console_add (const gchar *errormsg)
{
g_warning ("%s: error_console widget is NULL", G_STRLOC);
message_handler = MESSAGE_BOX;
message_handler = GIMP_MESSAGE_BOX;
g_message (errormsg);
return;
@ -207,7 +207,7 @@ error_console_destroy_callback (gpointer data)
error_console = NULL;
/* FIXME: interact with preferences */
message_handler = MESSAGE_BOX;
message_handler = GIMP_MESSAGE_BOX;
}
static gboolean

4
app/gui/file-dialog-utils.c
View File

@ -25,9 +25,11 @@
#include "gui-types.h"
#include "plug-in/plug-in.h"
#include "widgets/gimpitemfactory.h"
#include "plug_in.h"
#include "file-dialog-utils.h"
void

3
app/gui/file-open-dialog.c
View File

@ -48,6 +48,8 @@
#include "core/gimpdocuments.h"
#include "core/gimpimage.h"
#include "plug-in/plug-in.h"
#include "file/file-open.h"
#include "file/file-utils.h"
@ -56,7 +58,6 @@
#include "file-dialog-utils.h"
#include "file-open-dialog.h"
#include "plug_in.h"
#include "undo.h"
#include "libgimp/gimpintl.h"

3
app/gui/file-save-dialog.c
View File

@ -38,6 +38,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "plug-in/plug-in.h"
#include "file/file-save.h"
#include "file/file-utils.h"
@ -47,7 +49,6 @@
#include "file-save-dialog.h"
#include "gimprc.h"
#include "plug_in.h"
#include "undo.h"
#include "libgimp/gimpintl.h"

4
app/gui/help-commands.c
View File

@ -24,9 +24,9 @@
#include "core/core-types.h"
#include "commands.h"
#include "plug-in/plug-in.h"
#include "plug_in.h"
#include "commands.h"
/***** Filters *****/

7
app/gui/input-dialog.c
View File

@ -41,7 +41,6 @@
#include "widgets/gimpdnd.h"
#include "widgets/gimppreview.h"
#include "appenv.h"
#include "app_procs.h"
#include "devices.h"
#include "gimprc.h"
@ -464,7 +463,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_brush (device_info->context, brush);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->brush_name);
device_info->context->brush_name = g_strdup (brush_name);
@ -483,7 +482,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_pattern (device_info->context, pattern);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->pattern_name);
device_info->context->pattern_name = g_strdup (pattern_name);
@ -502,7 +501,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_gradient (device_info->context, gradient);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->gradient_name);
device_info->context->gradient_name = g_strdup (gradient_name);

7
app/gui/paths-dialog.c
View File

@ -37,6 +37,10 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "pdb/procedural_db.h"
#include "plug-in/plug-in.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -44,14 +48,13 @@
#include "tools/gimpbezierselecttool.h"
#include "ops_buttons.h"
#include "paths-dialog.h"
#include "gimprc.h"
#include "ops_buttons.h"
#include "path.h"
#include "pathP.h"
#include "path_transform.h"
#include "plug_in.h"
#include "undo.h"
#include "libgimp/gimpintl.h"

21
app/gui/plug-in-commands.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

21
app/gui/plug-in-menus.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

2
app/gui/user-install-dialog.c
View File

@ -352,7 +352,7 @@ user_install_continue_callback (GtkWidget *widget,
#endif
gimprc_init (gimp);
gimp_unitrc_load (gimp);
gimprc_parse (gimp);
gimprc_parse (gimp, alternate_system_gimprc, alternate_gimprc);
user_install_tuning ();
break;

53
app/main.c
View File

@ -62,23 +62,23 @@ static void gimp_sigchld_handler (gint sig_num);
/* command line options */
gboolean no_interface = FALSE;
gboolean no_data = FALSE;
gboolean no_splash = FALSE;
gboolean no_splash_image = FALSE;
gboolean be_verbose = FALSE;
gboolean use_shm = FALSE;
gboolean use_debug_handler = FALSE;
gboolean console_messages = FALSE;
gboolean restore_session = FALSE;
StackTraceMode stack_trace_mode = STACK_TRACE_QUERY;
gchar *alternate_gimprc = NULL;
gchar *alternate_system_gimprc = NULL;
gchar **batch_cmds = NULL;
gboolean no_interface = FALSE;
gboolean no_data = FALSE;
gboolean no_splash = FALSE;
gboolean no_splash_image = FALSE;
gboolean be_verbose = FALSE;
gboolean use_shm = FALSE;
gboolean use_debug_handler = FALSE;
gboolean console_messages = FALSE;
gboolean restore_session = FALSE;
GimpStackTraceMode stack_trace_mode = GIMP_STACK_TRACE_QUERY;
gchar *alternate_gimprc = NULL;
gchar *alternate_system_gimprc = NULL;
gchar **batch_cmds = NULL;
/* other global variables */
gchar *prog_name = NULL; /* our executable name */
MessageHandlerType message_handler = CONSOLE;
gchar *prog_name = NULL; /* our executable name */
GimpMessageHandlerType message_handler = GIMP_CONSOLE;
/*
@ -298,11 +298,11 @@ main (int argc,
else
{
if (! strcmp (argv[i], "never"))
stack_trace_mode = STACK_TRACE_NEVER;
stack_trace_mode = GIMP_STACK_TRACE_NEVER;
else if (! strcmp (argv[i], "query"))
stack_trace_mode = STACK_TRACE_QUERY;
stack_trace_mode = GIMP_STACK_TRACE_QUERY;
else if (! strcmp (argv[i], "always"))
stack_trace_mode = STACK_TRACE_ALWAYS;
stack_trace_mode = GIMP_STACK_TRACE_ALWAYS;
else
show_help = TRUE;
@ -403,6 +403,14 @@ main (int argc,
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
NULL);
g_log_set_handler ("Gimp-PDB",
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
NULL);
g_log_set_handler ("Gimp-Plug-In",
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
NULL);
g_log_set_handler ("Gimp-File",
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
@ -411,19 +419,15 @@ main (int argc,
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
NULL);
g_log_set_handler ("Gimp-PDB",
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
NULL);
g_log_set_handler ("Gimp-Widgets",
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
NULL);
g_log_set_handler ("Gimp-Tools",
g_log_set_handler ("Gimp-Display",
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
NULL);
g_log_set_handler ("Gimp-Display",
g_log_set_handler ("Gimp-Tools",
G_LOG_LEVEL_MESSAGE,
gimp_message_log_func,
NULL);
@ -499,7 +503,6 @@ WinMain (struct HINSTANCE__ *hInstance,
#ifndef G_OS_WIN32
/* gimp core signal handler for fatal signals */
static void

21
app/menus/plug-in-menus.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

2
app/pdb/fileops_cmds.c
View File

@ -45,7 +45,7 @@
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "file/file-utils.h"
#include "plug_in.h"
#include "plug-in/plug-in.h"
static ProcRecord file_load_proc;
static ProcRecord file_save_proc;

2
app/pdb/gimp-pdb.c
View File

@ -28,7 +28,7 @@
#include "core/gimp.h"
#include "plug_in.h"
#include "plug-in/plug-in.h"
#include "procedural_db.h"

2
app/pdb/gimppdb.c
View File

@ -28,7 +28,7 @@
#include "core/gimp.h"
#include "plug_in.h"
#include "plug-in/plug-in.h"
#include "procedural_db.h"

2
app/pdb/gimpprocedure.c
View File

@ -28,7 +28,7 @@
#include "core/gimp.h"
#include "plug_in.h"
#include "plug-in/plug-in.h"
#include "procedural_db.h"

2
app/pdb/help_cmds.c
View File

@ -30,7 +30,7 @@
#include "procedural_db.h"
#include "gimphelp.h"
#include "plug_in.h"
#include "plug-in/plug-in.h"
static ProcRecord help_proc;

4
app/pdb/message_cmds.c
View File

@ -30,6 +30,8 @@
#include "appenv.h"
#include "libgimpbase/gimpbasetypes.h"
static ProcRecord message_proc;
static ProcRecord message_get_handler_proc;
static ProcRecord message_set_handler_proc;
@ -129,7 +131,7 @@ message_set_handler_invoker (Gimp *gimp,
gint32 handler;
handler = args[0].value.pdb_int;
if (handler < MESSAGE_BOX || handler > ERROR_CONSOLE)
if (handler < GIMP_MESSAGE_BOX || handler > GIMP_ERROR_CONSOLE)
success = FALSE;
if (success)

2
app/pdb/plug_in_cmds.c
View File

@ -31,7 +31,7 @@
#include "procedural_db.h"
#include "core/gimp.h"
#include "plug_in.h"
#include "plug-in/plug-in.h"
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>

2
app/pdb/procedural_db.c
View File

@ -28,7 +28,7 @@
#include "core/gimp.h"
#include "plug_in.h"
#include "plug-in/plug-in.h"
#include "procedural_db.h"

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

@ -4,9 +4,9 @@ noinst_LIBRARIES = libappplug-in.a
libappplug_in_a_SOURCES = @STRIP_BEGIN@ \
plug-in-types.h \
plug-in.c \
plug-in.h \
@STRIP_END@
## plug-in.c \
## plug-in.h \
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gimp-Plug-In\" \

21
app/plug-in/gimpplugin-message.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

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

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

7
app/plug-in/gimpplugin-progress.h
View File

@ -23,12 +23,7 @@
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#include "pdb/procedural_db.h" /* ProcRecord */
#define WRITE_BUFFER_SIZE 512

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

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

7
app/plug-in/gimpplugin.h
View File

@ -23,12 +23,7 @@
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#include "pdb/procedural_db.h" /* ProcRecord */
#define WRITE_BUFFER_SIZE 512

21
app/plug-in/gimppluginmanager-call.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

21
app/plug-in/gimppluginmanager-run.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

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

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

7
app/plug-in/gimppluginmanager.h
View File

@ -23,12 +23,7 @@
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#include "pdb/procedural_db.h" /* ProcRecord */
#define WRITE_BUFFER_SIZE 512

21
app/plug-in/gimppluginshm.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

21
app/plug-in/plug-in-def.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

7
app/plug-in/plug-in-def.h
View File

@ -23,12 +23,7 @@
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#include "pdb/procedural_db.h" /* ProcRecord */
#define WRITE_BUFFER_SIZE 512

21
app/plug-in/plug-in-message.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

21
app/plug-in/plug-in-params.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

7
app/plug-in/plug-in-params.h
View File

@ -23,12 +23,7 @@
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#include "pdb/procedural_db.h" /* ProcRecord */
#define WRITE_BUFFER_SIZE 512

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

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

7
app/plug-in/plug-in-progress.h
View File

@ -23,12 +23,7 @@
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#include "pdb/procedural_db.h" /* ProcRecord */
#define WRITE_BUFFER_SIZE 512

21
app/plug-in/plug-in-run.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

21
app/plug-in/plug-in-shm.c
View File

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

1
app/plug-in/plug-in-types.h
View File

@ -21,7 +21,6 @@
#include "core/core-types.h"
#include "pdb/pdb-types.h"
typedef enum

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

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

7
app/plug-in/plug-in.h
View File

@ -23,12 +23,7 @@
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#include "pdb/procedural_db.h" /* ProcRecord */
#define WRITE_BUFFER_SIZE 512

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

@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "display/display-types.h"
#include "plug-in-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
@ -96,6 +96,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "widgets/widgets-types.h"
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
@ -104,12 +106,11 @@
#include "gui/gradient-select.h"
#include "gui/pattern-select.h"
#include "plug-in.h"
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -382,7 +383,7 @@ plug_in_init (Gimp *gimp,
{
write_pluginrc = TRUE;
if (be_verbose)
if (gimp->be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
@ -422,7 +423,7 @@ plug_in_init (Gimp *gimp,
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if (be_verbose)
if (gimp->be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
@ -440,7 +441,7 @@ plug_in_init (Gimp *gimp,
}
/* run the available extensions */
if (be_verbose)
if (gimp->be_verbose)
g_print (_("Starting extensions: "));
(* status_callback) (_("Extensions"), "", 0);
@ -457,7 +458,7 @@ plug_in_init (Gimp *gimp,
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == GIMP_EXTENSION))
{
if (be_verbose)
if (gimp->be_verbose)
g_print ("%s ", proc_def->db_info.name);
(* status_callback) (NULL, proc_def->db_info.name, nth / nplugins);
@ -466,7 +467,7 @@ plug_in_init (Gimp *gimp,
}
}
if (be_verbose)
if (gimp->be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
@ -1087,7 +1088,7 @@ plug_in_open (PlugIn *plug_in)
plug_in->args[4] = g_strdup ("-run");
}
plug_in->args[5] = g_strdup_printf ("%d", (gint) stack_trace_mode);
plug_in->args[5] = g_strdup_printf ("%d", the_gimp->stack_trace_mode);
/* Fork another process. We'll remember the process id
* so that we can later use it to kill the filter if

7
app/plug-in/plug-ins.h
View File

@ -23,12 +23,7 @@
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#include "pdb/procedural_db.h" /* ProcRecord */
#define WRITE_BUFFER_SIZE 512

3773
app/plug_in.c
View File

File diff suppressed because it is too large Load Diff

196
app/plug_in.h
View File

@ -1,196 +0,0 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __PLUG_IN_H__
#define __PLUG_IN_H__
#include <time.h> /* time_t */
#include <sys/types.h> /* pid_t */
/* FIXME: move the plugin stuff to plug-in/ */
#include "plug-in/plug-in-types.h"
#include "pdb/procedural_db.h"
#define WRITE_BUFFER_SIZE 512
#define PLUG_IN_RGB_IMAGE 0x01
#define PLUG_IN_GRAY_IMAGE 0x02
#define PLUG_IN_INDEXED_IMAGE 0x04
#define PLUG_IN_RGBA_IMAGE 0x08
#define PLUG_IN_GRAYA_IMAGE 0x10
#define PLUG_IN_INDEXEDA_IMAGE 0x20
struct _PlugIn
{
guint open : 1; /* Is the plug-in open* */
guint query : 1; /* Are we querying the plug-in? */
guint synchronous : 1; /* Is the plug-in running synchronously? */
guint recurse : 1; /* Have we called 'gtk_main' recursively? */
guint busy : 1; /* Is the plug-in busy with a temp proc? */
pid_t pid; /* Plug-ins process id */
gchar *args[7]; /* Plug-ins command line arguments */
GIOChannel *my_read; /* App's read and write channels */
GIOChannel *my_write;
GIOChannel *his_read; /* Plug-in's read and write channels */
GIOChannel *his_write;
#ifdef G_OS_WIN32
guint his_thread_id; /* Plug-in's thread ID */
gint his_read_fd; /* Plug-in's read pipe fd */
#endif
guint32 input_id; /* Id of input proc */
gchar write_buffer[WRITE_BUFFER_SIZE]; /* Buffer for writing */
gint write_buffer_index; /* Buffer index for writing */
GSList *temp_proc_defs; /* Temporary procedures */
GimpProgress *progress; /* Progress dialog */
PlugInDef *user_data; /* DON'T USE!! */
};
struct _PlugInProcDef
{
gchar *prog;
gchar *menu_path;
gchar *accelerator;
gchar *extensions;
gchar *prefixes;
gchar *magics;
gchar *image_types;
gint image_types_val;
ProcRecord db_info;
GSList *extensions_list;
GSList *prefixes_list;
GSList *magics_list;
time_t mtime;
};
/* Initialize the plug-ins */
void plug_in_init (Gimp *gimp,
GimpInitStatusFunc status_callback);
/* Kill all running plug-ins */
void plug_in_kill (void);
/* Add a plug-in to the list of valid plug-ins and query the plug-in
* for information if necessary.
*/
void plug_in_add (gchar *name,
gchar *menu_path,
gchar *accelerator);
/* Get the "image_types" the plug-in works on. */
gchar * plug_in_image_types (gchar *name);
/* Add in the file load/save handler fields procedure. */
PlugInProcDef * plug_in_file_handler (gchar *name,
gchar *extensions,
gchar *prefixes,
gchar *magics);
/* Add a plug-in definition. */
void plug_in_def_add (PlugInDef *plug_in_def);
/* Allocate and free a plug-in definition. */
PlugInDef * plug_in_def_new (const gchar *prog);
void plug_in_def_free (PlugInDef *plug_in_def,
gboolean free_proc_defs);
void plug_in_def_set_mtime (PlugInDef *plug_in_def,
time_t mtime);
void plug_in_def_set_locale_domain_name (PlugInDef *plug_in_def,
const gchar *domain_name);
void plug_in_def_set_locale_domain_path (PlugInDef *plug_in_def,
const gchar *domain_path);
void plug_in_def_set_help_path (PlugInDef *plug_in_def,
const gchar *help_path);
void plug_in_def_add_proc_def (PlugInDef *plug_in_def,
PlugInProcDef *proc_def);
/* Retrieve a plug-ins menu path */
gchar * plug_in_menu_path (gchar *name);
/* Retrieve a plug-ins help path */
gchar * plug_in_help_path (gchar *prog_name);
/* Create a new plug-in structure */
PlugIn * plug_in_new (gchar *name);
/* Destroy a plug-in structure.
* This will close the plug-in first if necessary.
*/
void plug_in_destroy (PlugIn *plug_in);
/* Open a plug-in. This cause the plug-in to run.
* If returns TRUE, you must destroy the plugin.
* If returns FALSE, you must not destroy the plugin.
*/
gboolean plug_in_open (PlugIn *plug_in);
/* Close a plug-in. This kills the plug-in and releases its resources. */
void plug_in_close (PlugIn *plug_in,
gboolean kill_it);
/* Run a plug-in as if it were a procedure database procedure */
Argument * plug_in_run (ProcRecord *proc_rec,
Argument *args,
gint argc,
gboolean synchronous,
gboolean destroy_values,
gint gdisp_ID);
/* Run the last plug-in again with the same arguments. Extensions
* are exempt from this "privelege".
*/
void plug_in_repeat (gboolean with_interface);
/* Set the sensitivity for plug-in menu items based on the image type. */
void plug_in_set_menu_sensitivity (GimpImageType type);
/* Register an internal plug-in. This is for file load-save
* handlers, which are organized around the plug-in data structure.
* This could all be done a little better, but oh well. -josh
*/
void plug_in_add_internal (PlugInProcDef *proc_def);
GSList * plug_in_extensions_parse (gchar *extensions);
gint plug_in_image_types_parse (gchar *image_types);
void plug_in_progress_init (PlugIn *plug_in,
gchar *message,
gint gdisp_ID);
void plug_in_progress_update (PlugIn *plug_in,
gdouble percentage);
extern PlugIn *current_plug_in;
extern GSList *proc_defs;
#endif /* __PLUG_IN_H__ */

25
app/tools/gimpbezierselecttool.c
View File

@ -53,7 +53,6 @@
#include "tool_manager.h"
#include "app_procs.h"
#include "errors.h"
#include "gimprc.h"
#include "path.h"
#include "pathP.h"
@ -628,9 +627,8 @@ gimp_bezier_select_tool_button_press (GimpTool *tool,
break;
case BEZIER_EDIT:
if (!bezier_sel->closed)
gimp_fatal_error ("gimp_bezier_select_tool_button_press(): Tried to edit "
"on open bezier curve in edit selection");
if (! bezier_sel->closed)
g_error ("Tried to edit on open bezier curve in edit selection");
/* erase the handles */
bezier_sel->draw_mode = BEZIER_DRAW_ALL;
@ -897,8 +895,7 @@ gimp_bezier_select_tool_motion (GimpTool *tool,
}
if (! anchor)
gimp_fatal_error ("bezier_select_motion(): Encountered orphaned "
"bezier control point");
g_error ("Encountered orphaned bezier control point");
if (opposite_control)
{
@ -2404,8 +2401,8 @@ bezier_draw_segment (GimpBezierSelectTool *bezier_sel,
for (i = 0; i < 4; i++)
{
if (!points)
gimp_fatal_error ("bezier_draw_segment(): Bad bezier segment");
if (! points)
g_error ("Bad bezier segment");
switch (space)
{
@ -2422,7 +2419,7 @@ bezier_draw_segment (GimpBezierSelectTool *bezier_sel,
geometry[i][1] = points->sy;
break;
default:
gimp_fatal_error ("bezier_draw_segment(): Unknown coordinate space: %d", space);
g_error ("Unknown coordinate space: %d", space);
break;
}
@ -2568,8 +2565,8 @@ bezier_convert (GimpBezierSelectTool *bezier_sel,
gint x, x2, w;
gint i, j;
if (!bezier_sel->closed)
gimp_fatal_error ("bezier_convert(): tried to convert an open bezier curve");
if (! bezier_sel->closed)
g_error ("tried to convert an open bezier curve");
/* destroy previous mask */
if (bezier_sel->mask)
@ -3074,7 +3071,7 @@ test_add_point_on_segment (GimpBezierSelectTool *bezier_sel,
geometry[i][1] = points->sy;
break;
default:
gimp_fatal_error ("test_add_point_on_segment(): Unknown coordinate space: %d", space);
g_error ("Unknown coordinate space: %d", space);
break;
}
@ -3606,8 +3603,8 @@ bezier_draw_segment_for_distance (GimpBezierSelectTool *bezier_sel,
for (i = 0; i < 4; i++)
{
if (!points)
gimp_fatal_error ("bezier_draw_segment_for_distance(): Bad bezier segment");
if (! points)
g_error ("Bad bezier segment");
geometry[i][0] = points->x;
geometry[i][1] = points->y;

2
app/tools/xinput_airbrush.c
View File

@ -21,8 +21,6 @@
#include <string.h>
#include <stdio.h>
#include "appenv.h"
#include "airbrush_blob.h"
#include "drawable.h"
#include "draw_core.h"

7
app/widgets/gimpdeviceinfo.c
View File

@ -41,7 +41,6 @@
#include "widgets/gimpdnd.h"
#include "widgets/gimppreview.h"
#include "appenv.h"
#include "app_procs.h"
#include "devices.h"
#include "gimprc.h"
@ -464,7 +463,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_brush (device_info->context, brush);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->brush_name);
device_info->context->brush_name = g_strdup (brush_name);
@ -483,7 +482,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_pattern (device_info->context, pattern);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->pattern_name);
device_info->context->pattern_name = g_strdup (pattern_name);
@ -502,7 +501,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_gradient (device_info->context, gradient);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->gradient_name);
device_info->context->gradient_name = g_strdup (gradient_name);

7
app/widgets/gimpdevices.c
View File

@ -41,7 +41,6 @@
#include "widgets/gimpdnd.h"
#include "widgets/gimppreview.h"
#include "appenv.h"
#include "app_procs.h"
#include "devices.h"
#include "gimprc.h"
@ -464,7 +463,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_brush (device_info->context, brush);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->brush_name);
device_info->context->brush_name = g_strdup (brush_name);
@ -483,7 +482,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_pattern (device_info->context, pattern);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->pattern_name);
device_info->context->pattern_name = g_strdup (pattern_name);
@ -502,7 +501,7 @@ devices_rc_update (gchar *name,
{
gimp_context_set_gradient (device_info->context, gradient);
}
else if (no_data)
else if (the_gimp->no_data)
{
g_free (device_info->context->gradient_name);
device_info->context->gradient_name = g_strdup (gradient_name);

13
app/widgets/gimphelp.c
View File

@ -34,10 +34,11 @@
#include "core/core-types.h"
#include "plug-in/plug-in.h"
#include "app_procs.h"
#include "gimphelp.h"
#include "gimprc.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"
@ -54,7 +55,9 @@ struct _GimpIdleHelp
gchar *help_data;
};
/* local function prototypes */
static gint gimp_idle_help (gpointer data);
static gboolean gimp_help_internal (const gchar *help_path,
const gchar *current_locale,
@ -63,9 +66,8 @@ static void gimp_help_netscape (const gchar *help_path,
const gchar *current_locale,
const gchar *help_data);
/**********************/
/* public functions */
/**********************/
/* The standard help function */
void
@ -95,9 +97,8 @@ gimp_help (const gchar *help_path,
}
}
/*********************/
/* local functions */
/*********************/
/* private functions */
static gboolean
gimp_idle_help (gpointer data)

6
app/xcf/xcf.c
View File

@ -30,14 +30,16 @@
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "pdb/procedural_db.h"
#include "plug-in/plug-in.h"
#include "xcf.h"
#include "xcf-private.h"
#include "xcf-load.h"
#include "xcf-read.h"
#include "xcf-save.h"
#include "plug_in.h"
#include "libgimp/gimpintl.h"

14
libgimp/gimpenums.h
View File

@ -245,13 +245,6 @@ typedef enum
GIMP_FLATTEN_IMAGE
} GimpMergeType;
typedef enum
{
GIMP_MESSAGE_BOX,
GIMP_CONSOLE,
GIMP_ERROR_CONSOLE
} GimpMessageHandlerType;
typedef enum
{
GIMP_HORIZONTAL,
@ -285,13 +278,6 @@ typedef enum
GIMP_POINTS
} GimpSizeType;
typedef enum
{
GIMP_STACK_TRACE_NEVER,
GIMP_STACK_TRACE_QUERY,
GIMP_STACK_TRACE_ALWAYS
} GimpStackTraceMode;
G_END_DECLS

14
libgimpbase/gimpbasetypes.h
View File

@ -90,6 +90,20 @@ typedef enum /*< chop=GIMP_ >*/
GIMP_PDB_CANCEL
} GimpPDBStatusType;
typedef enum /*< chop=GIMP_ >*/
{
GIMP_MESSAGE_BOX,
GIMP_CONSOLE,
GIMP_ERROR_CONSOLE
} GimpMessageHandlerType;
typedef enum /*< chop=GIMP_ >*/
{
GIMP_STACK_TRACE_NEVER,
GIMP_STACK_TRACE_QUERY,
GIMP_STACK_TRACE_ALWAYS
} GimpStackTraceMode;
G_END_DECLS

16
plug-ins/script-fu/script-fu-constants.c
View File

@ -103,6 +103,10 @@ init_generated_constants (void)
setvar (cintern ("INDEXED-IMAGE"), flocons (4), NIL);
setvar (cintern ("INDEXEDA-IMAGE"), flocons (5), NIL);
setvar (cintern ("MESSAGE-BOX"), flocons (0), NIL);
setvar (cintern ("CONSOLE"), flocons (1), NIL);
setvar (cintern ("ERROR-CONSOLE"), flocons (2), NIL);
setvar (cintern ("OFFSET-BACKGROUND"), flocons (0), NIL);
setvar (cintern ("OFFSET-TRANSPARENT"), flocons (1), NIL);
@ -141,6 +145,10 @@ init_generated_constants (void)
setvar (cintern ("PDB-SUCCESS"), flocons (3), NIL);
setvar (cintern ("PDB-CANCEL"), flocons (4), NIL);
setvar (cintern ("STACK-TRACE-NEVER"), flocons (0), NIL);
setvar (cintern ("STACK-TRACE-QUERY"), flocons (1), NIL);
setvar (cintern ("STACK-TRACE-ALWAYS"), flocons (2), NIL);
setvar (cintern ("SHADOWS"), flocons (0), NIL);
setvar (cintern ("MIDTONES"), flocons (1), NIL);
setvar (cintern ("HIGHLIGHTS"), flocons (2), NIL);
@ -211,10 +219,6 @@ init_generated_constants (void)
setvar (cintern ("CLIP-TO-BOTTOM-LAYER"), flocons (2), NIL);
setvar (cintern ("FLATTEN-IMAGE"), flocons (3), NIL);
setvar (cintern ("MESSAGE-BOX"), flocons (0), NIL);
setvar (cintern ("CONSOLE"), flocons (1), NIL);
setvar (cintern ("ERROR-CONSOLE"), flocons (2), NIL);
setvar (cintern ("HORIZONTAL"), flocons (0), NIL);
setvar (cintern ("VERTICAL"), flocons (1), NIL);
setvar (cintern ("UNKNOWN"), flocons (2), NIL);
@ -233,9 +237,5 @@ init_generated_constants (void)
setvar (cintern ("PIXELS"), flocons (0), NIL);
setvar (cintern ("POINTS"), flocons (1), NIL);
setvar (cintern ("STACK-TRACE-NEVER"), flocons (0), NIL);
setvar (cintern ("STACK-TRACE-QUERY"), flocons (1), NIL);
setvar (cintern ("STACK-TRACE-ALWAYS"), flocons (2), NIL);
return;
}

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2001-11-30 Michael Natterer <mitch@gimp.org>
* POTFILES.in: app/plug_in.c -> app/plug-in/plug-in.c
2001-11-30 Michael Natterer <mitch@gimp.org>
* POTFILES.in: updated.

3
po/POTFILES.in
View File

@ -9,7 +9,6 @@ app/gimpprogress.c
app/gimprc.c
app/main.c
app/nav_window.c
app/plug_in.c
app/undo.c
app/undo_history.c
@ -89,6 +88,8 @@ app/pdb/internal_procs.c
app/pdb/procedural_db.c
app/pdb/procedural_db_cmds.c
app/plug-in/plug-in.c
app/tools/gimpairbrushtool.c
app/tools/gimpbezierselecttool.c
app/tools/gimpblendtool.c

21
tools/pdbgen/Makefile.am
View File

@ -50,17 +50,16 @@ EXTRA_DIST = \
$(pdb_sources)
enum_headers = \
../../libgimpbase/gimpbasetypes.h \
../../app/appenv.h \
../../app/paint-funcs/paint-funcs.h \
../../app/base/base-types.h \
../../app/core/core-types.h \
../../app/plug-in/plug-in-types.h \
../../app/tools/tools-types.h \
../../app/tools/gimpclonetool.h \
../../app/tools/gimpconvolvetool.h \
../../app/tools/gimpdodgeburntool.h \
../../app/tools/gimphuesaturationtool.h \
../../libgimpbase/gimpbasetypes.h \
../../app/paint-funcs/paint-funcs-types.h \
../../app/base/base-types.h \
../../app/core/core-types.h \
../../app/plug-in/plug-in-types.h \
../../app/tools/tools-types.h \
../../app/tools/gimpclonetool.h \
../../app/tools/gimpconvolvetool.h \
../../app/tools/gimpdodgeburntool.h \
../../app/tools/gimphuesaturationtool.h \
../../app/tools/gimptexttool.h
pdb_scripts = \

2
tools/pdbgen/enumcode.pl
View File

@ -122,7 +122,7 @@ G_BEGIN_DECLS
HEADER
foreach (sort keys %enums) {
if (!/GimpPDB/ && !/GimpUnit/) {
if (! ($enums{$_}->{header} =~ /libgimp/)) {
print ENUMFILE "typedef enum\n{\n";
my $enum = $enums{$_}; my $body = "";
foreach $symbol (@{$enum->{symbols}}) {

32
tools/pdbgen/enums.pl
View File

@ -128,22 +128,28 @@ package Gimp::CodeGen::enums;
GIMP_PDB_SUCCESS => 'PDB_SUCCESS',
GIMP_PDB_CANCEL => 'PDB_CANCEL' }
},
MessageHandlerType =>
GimpMessageHandlerType =>
{ contig => 1,
header => 'appenv.h',
symbols => [ qw(MESSAGE_BOX CONSOLE ERROR_CONSOLE) ],
mapping => { MESSAGE_BOX => '0',
CONSOLE => '1',
ERROR_CONSOLE => '2' }
header => 'libgimpbase/gimpbasetypes.h',
symbols => [ qw(GIMP_MESSAGE_BOX GIMP_CONSOLE GIMP_ERROR_CONSOLE) ],
mapping => { GIMP_MESSAGE_BOX => '0',
GIMP_CONSOLE => '1',
GIMP_ERROR_CONSOLE => '2' },
nicks => { GIMP_MESSAGE_BOX => 'MESSAGE_BOX',
GIMP_CONSOLE => 'CONSOLE',
GIMP_ERROR_CONSOLE => 'ERROR_CONSOLE' }
},
StackTraceMode =>
GimpStackTraceMode =>
{ contig => 1,
header => 'appenv.h',
symbols => [ qw(STACK_TRACE_NEVER STACK_TRACE_QUERY
STACK_TRACE_ALWAYS) ],
mapping => { STACK_TRACE_NEVER => '0',
STACK_TRACE_QUERY => '1',
STACK_TRACE_ALWAYS => '2' }
header => 'libgimpbase/gimpbasetypes.h',
symbols => [ qw(GIMP_STACK_TRACE_NEVER GIMP_STACK_TRACE_QUERY
GIMP_STACK_TRACE_ALWAYS) ],
mapping => { GIMP_STACK_TRACE_NEVER => '0',
GIMP_STACK_TRACE_QUERY => '1',
GIMP_STACK_TRACE_ALWAYS => '2' },
nicks => { GIMP_STACK_TRACE_NEVER => 'STACK_TRACE_NEVER',
GIMP_STACK_TRACE_QUERY => 'STACK_TRACE_QUERY',
GIMP_STACK_TRACE_ALWAYS => 'STACK_TRACE_ALWAYS' }
},
LayerModeEffects =>
{ contig => 1,

4
tools/pdbgen/pdb/fileops.pdb
View File

@ -415,8 +415,8 @@ CODE
);
}
@headers = qw("core/gimp.h" "file/file-utils.h" "plug_in.h"
<sys/types.h> <unistd.h>);
@headers = qw(<sys/types.h> <unistd.h> "core/gimp.h"
"plug-in/plug-in.h" "file/file-utils.h");
@procs = qw(file_load file_save file_load_thumbnail file_save_thumbnail
temp_name register_magic_load_handler register_load_handler

2
tools/pdbgen/pdb/help.pdb
View File

@ -50,7 +50,7 @@ HELP
);
}
@headers = qw(<sys/types.h> "gimphelp.h" "plug_in.h");
@headers = qw(<sys/types.h> "plug-in/plug-in.h" "gimphelp.h");
@procs = qw(help);
%exports = (app => [@procs], lib => [@procs]);

4
tools/pdbgen/pdb/message.pdb
View File

@ -52,7 +52,7 @@ HELP
&pdb_misc;
@outargs = (
{ name => 'handler', type => 'enum MessageHandlerType',
{ name => 'handler', type => 'enum GimpMessageHandlerType',
desc => 'The current handler type: { %%desc%% }',
alias => 'message_handler', no_declare => 1 }
);
@ -69,7 +69,7 @@ HELP
&pdb_misc;
@inargs = (
{ name => 'handler', type => 'enum MessageHandlerType',
{ name => 'handler', type => 'enum GimpMessageHandlerType',
desc => 'The new handler type: { %%desc%% }' }
);

6
tools/pdbgen/pdb/plug_in.pdb
View File

@ -324,9 +324,6 @@ CODE
}
@headers = qw("core/gimp.h" "plug_in.h" "regexrepl/regex.h"
<string.h> <stdlib.h>);
$extra{app}->{code} = <<'CODE';
static int
match_strings (regex_t *preg,
@ -336,6 +333,9 @@ match_strings (regex_t *preg,
}
CODE
@headers = qw(<string.h> <stdlib.h> "regexrepl/regex.h"
"core/gimp.h" "plug-in/plug-in.h");
@procs = qw(progress_init progress_update temp_PDB_name plugins_query
plugin_domain_register plugin_help_register);
%exports = (app => [@procs], lib => [@procs[0..2,4,5]]);