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

include "libgimpbase/gimpbase.h" instead of "libgimpbase/gimpparasite.h"

Browse Source 
2004-07-16  Michael Natterer  <mitch@gimp.org>

	* tools/pdbgen/pdb.pl: include "libgimpbase/gimpbase.h" instead of
	"libgimpbase/gimpparasite.h" for getting the GimpParasite type.

	* tools/pdbgen/app.pl
	* tools/pdbgen/pdb/drawable.pdb
	* tools/pdbgen/pdb/edit.pdb
	* tools/pdbgen/pdb/gradients.pdb
	* tools/pdbgen/pdb/guides.pdb
	* tools/pdbgen/pdb/image.pdb: removed redundant #includes.

	* tools/pdbgen/pdb/plug_in.pdb: standardized "success" logic.
	Consistetly fail if there is no currently queried plugin.

	* app/pdb/*.c: regenerated.
This commit is contained in:
Michael Natterer
2004-07-16 14:43:56 +00:00
committed by Michael Natterer
parent 147775d63d
commit a456ac9bde
47 changed files with 48 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2004-07-16 Michael Natterer <mitch@gimp.org>
* tools/pdbgen/pdb.pl: include "libgimpbase/gimpbase.h" instead of
"libgimpbase/gimpparasite.h" for getting the GimpParasite type.
* tools/pdbgen/app.pl
* tools/pdbgen/pdb/drawable.pdb
* tools/pdbgen/pdb/edit.pdb
* tools/pdbgen/pdb/gradients.pdb
* tools/pdbgen/pdb/guides.pdb
* tools/pdbgen/pdb/image.pdb: removed redundant #includes.
* tools/pdbgen/pdb/plug_in.pdb: standardized "success" logic.
Consistetly fail if there is no currently queried plugin.
* app/pdb/*.c: regenerated.
2004-07-16 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-transform.c: made gtk-doc even

2
app/pdb/brush_select_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/brushes_cmds.c
View File

@ -24,8 +24,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/channel_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"

2
app/pdb/color_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/convert_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/display_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

3
app/pdb/drawable_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"
@ -33,7 +31,6 @@
#include "base/tile.h"
#include "config/gimpcoreconfig.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
#include "core/gimpdrawable-offset.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"

2
app/pdb/edit_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/fileops_cmds.c
View File

@ -38,8 +38,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpthumb/gimpthumb.h"
#include "pdb-types.h"

2
app/pdb/floating_sel_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/font_select_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/fonts_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/gimprc_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpmodule/gimpmodule.h"
#include "pdb-types.h"

2
app/pdb/gradient_edit_cmds.c
View File

@ -24,8 +24,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"

2
app/pdb/gradient_select_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

3
app/pdb/gradients_cmds.c
View File

@ -24,14 +24,11 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"
#include "core/gimp.h"
#include "core/gimpcontainer-filter.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "core/gimpdatafactory.h"
#include "core/gimpgradient.h"

3
app/pdb/guides_cmds.c
View File

@ -23,15 +23,12 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"
#include "core/gimpimage-guides.h"
#include "core/gimpimage-undo-push.h"
#include "core/gimpimage.h"
#include "gimp-intl.h"
static ProcRecord image_add_hguide_proc;
static ProcRecord image_add_vguide_proc;

2
app/pdb/help_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

5
app/pdb/image_cmds.c
View File

@ -20,12 +20,9 @@
#include "config.h"
#include <string.h>
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
@ -37,7 +34,6 @@
#include "config/gimpcoreconfig.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
#include "core/gimpcontainer.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage-colormap.h"
#include "core/gimpimage-crop.h"
@ -53,7 +49,6 @@
#include "core/gimplayermask.h"
#include "core/gimplist.h"
#include "core/gimpunit.h"
#include "core/gimpviewable.h"
#include "gimp-intl.h"
static ProcRecord image_list_proc;

2
app/pdb/layer_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/message_cmds.c
View File

@ -24,8 +24,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/misc_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"

2
app/pdb/paint_tools_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"

2
app/pdb/palette_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"

2
app/pdb/palette_select_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/palettes_cmds.c
View File

@ -24,8 +24,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"

4
app/pdb/parasite_cmds.c
View File

@ -23,9 +23,7 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpparasite.h"
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/paths_cmds.c
View File

@ -24,8 +24,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/pattern_select_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/patterns_cmds.c
View File

@ -24,8 +24,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

16
app/pdb/plug_in_cmds.c
View File

@ -25,8 +25,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "libgimpbase/gimpprotocol.h"
@ -138,18 +136,18 @@ progress_update_invoker (Gimp *gimp,
GimpContext *context,
Argument *args)
{
gboolean success = FALSE;
gboolean success = TRUE;
gdouble percentage;
percentage = args[0].value.pdb_float;
if (gimp->current_plug_in && gimp->current_plug_in->open)
{
success = TRUE;
if (! gimp->no_interface)
plug_in_progress_update (gimp->current_plug_in, percentage);
}
else
success = FALSE;
return procedural_db_return_args (&progress_update_proc, success);
}
@ -418,6 +416,8 @@ plugin_domain_register_invoker (Gimp *gimp,
plug_in_def_set_locale_domain_path (gimp->current_plug_in->plug_in_def,
domain_path);
}
else
success = FALSE;
}
return procedural_db_return_args (&plugin_domain_register_proc, success);
@ -479,6 +479,8 @@ plugin_help_register_invoker (Gimp *gimp,
plug_in_def_set_help_domain_uri (gimp->current_plug_in->plug_in_def,
domain_uri);
}
else
success = FALSE;
}
return procedural_db_return_args (&plugin_help_register_proc, success);
@ -593,6 +595,8 @@ plugin_menu_register_invoker (Gimp *gimp,
if (! list)
success = FALSE;
}
else
success = FALSE;
}
return procedural_db_return_args (&plugin_menu_register_proc, success);
@ -698,6 +702,8 @@ plugin_icon_register_invoker (Gimp *gimp,
if (! list)
success = FALSE;
}
else
success = FALSE;
}
return procedural_db_return_args (&plugin_icon_register_proc, success);

2
app/pdb/procedural_db_cmds.c
View File

@ -26,8 +26,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/selection_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/selection_tools_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpcolor/gimpcolor.h"
#include "pdb-types.h"

2
app/pdb/text_tool_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"

2
app/pdb/transform_tools_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpmath/gimpmath.h"
#include "pdb-types.h"

2
app/pdb/undo_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "pdb-types.h"
#include "procedural_db.h"

2
app/pdb/unit_cmds.c
View File

@ -23,8 +23,6 @@
#include <glib-object.h>
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpbase/gimpbase.h"
#include "pdb-types.h"

2
tools/pdbgen/app.pl
View File

@ -744,8 +744,6 @@ GPL
$headers .= "\n";
$headers .= '#include <glib-object.h>';
$headers .= "\n\n";
$headers .= '#include "libgimpbase/gimpbasetypes.h"';
$headers .= "\n\n";
}
$seen = 0 if !/^</;

2
tools/pdbgen/pdb.pl
View File

@ -84,7 +84,7 @@ package Gimp::CodeGen::pdb;
check_func => '(GIMP_IS_VECTORS ($var) && ! gimp_item_is_removed (GIMP_ITEM ($var)))' },
parasite => { name => 'PARASITE',
type => 'GimpParasite *',
headers => [ qw("libgimpbase/gimpparasite.h") ] },
headers => [ qw("libgimpbase/gimpbase.h") ] },
boundary => { name => 'BOUNDARY', type => 'gpointer ' }, # ??? FIXME
path => { name => 'PATH' , type => 'gpointer ' }, # ??? FIXME

5
tools/pdbgen/pdb/drawable.pdb
View File

@ -180,7 +180,7 @@ HELP
desc => 'Push merge to undo stack?' }
);
%invoke = ( headers => [ qw("core/gimp.h" "plug-in/plug-in.h") ],
%invoke = ( headers => [ qw("plug-in/plug-in.h") ],
vars => [ 'gchar *undo_desc = NULL' ],
code => <<CODE
{
@ -702,9 +702,8 @@ CODE
}
@headers = qw("base/tile.h" "base/tile-manager.h" "base/temp-buf.h"
"config/gimpcoreconfig.h"
"config/gimpcoreconfig.h"
"core/gimp.h" "core/gimplayer.h" "core/gimplayermask.h"
"core/gimpchannel.h" "core/gimpdrawable.h"
"core/gimpdrawable-offset.h" "gimp-intl.h");
@procs = qw(drawable_delete

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

@ -47,7 +47,6 @@ sub sample_merged_arg () {{
# Common invoker for checking for image/drawable consistency
sub invoke {
%invoke = (
headers => [ qw("core/gimp.h") ],
vars => [ 'GimpImage *gimage' ],
code => <<CODE
{
@ -125,7 +124,6 @@ HELP
);
%invoke = (
headers => [ qw("core/gimp.h") ],
code => <<CODE
{
success = (gimp_item_is_attached (GIMP_ITEM (drawable)) &&
@ -369,7 +367,7 @@ CODE
);
}
@headers = qw("core/gimpimage.h" "core/gimp-edit.h");
@headers = qw("core/gimp.h" "core/gimpimage.h" "core/gimp-edit.h");
@procs = qw(edit_cut edit_copy edit_paste edit_clear
edit_fill edit_bucket_fill edit_blend edit_stroke);

5
tools/pdbgen/pdb/gradients.pdb
View File

@ -507,9 +507,8 @@ CODE
}
@headers = qw(<string.h> "core/gimp.h" "core/gimpcontext.h"
"core/gimpcontainer.h" "core/gimpdatafactory.h"
"core/gimplist.h" "core/gimpgradient.h");
@headers = qw(<string.h> "core/gimp.h" "core/gimpcontext.h" "core/gimplist.h"
"core/gimpdatafactory.h" "core/gimpgradient.h");
@procs = qw(gradients_refresh gradients_get_list
gradients_get_gradient gradients_set_gradient

3
tools/pdbgen/pdb/guides.pdb
View File

@ -268,8 +268,7 @@ CODE
);
}
@headers = qw("core/gimpimage-guides.h" "core/gimpimage-undo-push.h"
"gimp-intl.h");
@headers = qw("core/gimpimage-guides.h" "core/gimpimage-undo-push.h");
@procs = qw(image_add_hguide image_add_vguide image_delete_guide
image_find_next_guide image_get_guide_orientation

8
tools/pdbgen/pdb/image.pdb
View File

@ -1444,7 +1444,6 @@ HELP
$outargs[0]->{void_ret} = 1;
%invoke = (
headers => [ qw(<string.h> "core/gimpviewable.h") ],
code => <<'CODE'
{
TempBuf *buf;
@ -1490,12 +1489,9 @@ CODE
}
@headers = qw(<string.h>
"core/gimp.h" "core/gimpcontainer.h"
"core/gimplist.h" "core/gimpunit.h"
@headers = qw("core/gimp.h" "core/gimplist.h" "core/gimpunit.h"
"base/temp-buf.h" "libgimpmath/gimpmath.h"
"libgimpbase/gimpbase.h"
"gimp-intl.h");
"libgimpbase/gimpbase.h" "gimp-intl.h");
$extra{app}->{code} = <<'CODE';
#if defined (HAVE_FINITE)

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

@ -69,16 +69,15 @@ HELP
);
%invoke = (
success => 'FALSE',
code => <<'CODE'
{
if (gimp->current_plug_in && gimp->current_plug_in->open)
{
success = TRUE;
if (! gimp->no_interface)
plug_in_progress_update (gimp->current_plug_in, percentage);
}
else
success = FALSE;
}
CODE
);
@ -252,7 +251,6 @@ HELP
);
%invoke = (
success => 'TRUE',
code => <<'CODE',
{
if (gimp->current_plug_in && gimp->current_plug_in->query)
@ -262,6 +260,8 @@ HELP
plug_in_def_set_locale_domain_path (gimp->current_plug_in->plug_in_def,
domain_path);
}
else
success = FALSE;
}
CODE
);
@ -287,7 +287,6 @@ HELP
);
%invoke = (
success => 'TRUE',
code => <<'CODE',
{
if (gimp->current_plug_in && gimp->current_plug_in->query)
@ -297,6 +296,8 @@ HELP
plug_in_def_set_help_domain_uri (gimp->current_plug_in->plug_in_def,
domain_uri);
}
else
success = FALSE;
}
CODE
);
@ -321,7 +322,6 @@ HELP
);
%invoke = (
success => 'TRUE',
code => <<'CODE',
{
if (gimp->current_plug_in && gimp->current_plug_in->query)
@ -384,6 +384,8 @@ HELP
if (! list)
success = FALSE;
}
else
success = FALSE;
}
CODE
);
@ -412,7 +414,6 @@ HELP
);
%invoke = (
success => 'TRUE',
code => <<'CODE',
{
if (gimp->current_plug_in && gimp->current_plug_in->query)
@ -458,6 +459,8 @@ HELP
if (! list)
success = FALSE;
}
else
success = FALSE;
}
CODE
);