diff --git a/ChangeLog b/ChangeLog index 2a1c349548..ae1c3d0677 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Thu Jun 18 18:34:58 PDT 1998 Manish Singh + + * acconfig.h + * config.h.in + * configure.in: added --with-threads (taken from gtk+ configure.in) + + * libgimp/Makefile.am: ugly hack to force libgimpi.a to get + rebuilt since libgimp.la compilations screws up the deps. Fixes + relinking on make install. + + * configure.in + * plug-ins/Makefile.am: other cleanups + + * libgimp/gimp.c + * app/plug_in.c: pass INT32 instead of INT8 for gdisp_id since + that's the correct type + + * app/preferences_dialog.c + * plug-ins/script-fu/script-fu-server.c + * plug-ins/tileit/tileit.c: warning fixups + Thu Jun 18 21:20:12 1998 Owen Taylor * app/interface.c app/tools.c: Removed calls to diff --git a/acconfig.h b/acconfig.h index d4a7c7c27e..c273a47ab2 100644 --- a/acconfig.h +++ b/acconfig.h @@ -40,6 +40,8 @@ #undef RAND_FUNC #undef SRAND_FUNC +#undef USE_PTHREADS + /* #undef PACKAGE */ /* #undef VERSION */ diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index 19ec476e09..545c3000f7 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 1de5160899..76db8cb8d6 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -504,7 +504,7 @@ file_prefs_mem_size_unit_callback (GtkWidget *widget, { int new_unit; - new_unit = (int*)data; + new_unit = (int)data; if (new_unit != mem_size_unit) { diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index 19ec476e09..545c3000f7 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c index 19ec476e09..545c3000f7 100644 --- a/app/gui/plug-in-menus.c +++ b/app/gui/plug-in-menus.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index 1de5160899..76db8cb8d6 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -504,7 +504,7 @@ file_prefs_mem_size_unit_callback (GtkWidget *widget, { int new_unit; - new_unit = (int*)data; + new_unit = (int)data; if (new_unit != mem_size_unit) { diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index 19ec476e09..545c3000f7 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/gimpplugin-progress.c +++ b/app/plug-in/gimpplugin-progress.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/gimppluginshm.c +++ b/app/plug-in/gimppluginshm.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/plug-in-def.c +++ b/app/plug-in/plug-in-def.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/plug-in-progress.c +++ b/app/plug-in/plug-in-progress.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/plug-in-shm.c +++ b/app/plug-in/plug-in-shm.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index 19ec476e09..545c3000f7 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/plug_in.c b/app/plug_in.c index 19ec476e09..545c3000f7 100644 --- a/app/plug_in.c +++ b/app/plug_in.c @@ -144,7 +144,7 @@ static ProcArg progress_init_args[] = { PDB_STRING, "message", "Message to use in the progress dialog." }, - { PDB_INT8, + { PDB_INT32, "gdisplay", "GDisplay to update progressbar in, or -1 for a seperate window" } }; diff --git a/app/preferences_dialog.c b/app/preferences_dialog.c index 1de5160899..76db8cb8d6 100644 --- a/app/preferences_dialog.c +++ b/app/preferences_dialog.c @@ -504,7 +504,7 @@ file_prefs_mem_size_unit_callback (GtkWidget *widget, { int new_unit; - new_unit = (int*)data; + new_unit = (int)data; if (new_unit != mem_size_unit) { diff --git a/config.h.in b/config.h.in index 38ca5d1967..24b936cfbb 100644 --- a/config.h.in +++ b/config.h.in @@ -72,6 +72,8 @@ #undef RAND_FUNC #undef SRAND_FUNC +#undef USE_PTHREADS + /* #undef PACKAGE */ /* #undef VERSION */ diff --git a/configure.in b/configure.in index ae55ea5589..31e6d3e214 100644 --- a/configure.in +++ b/configure.in @@ -32,6 +32,7 @@ fi) AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]], , enable_ansi=no) +AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ]) dnl Possibly change default gimpdir from .gimp gimpdir=.gimp-1.1 @@ -88,9 +89,11 @@ if eval "test x$GCC = xyes"; then fi gimp_save_CPPFLAGS="$CPPFLAGS" +gimp_save_LDFLAGS="$LDFLAGS" gimp_save_LIBS="$LIBS" -CPPFLAGS="$GTK_CFLAGS $CPPFLAGS" +CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" +LDFLAGS="$LDFLAGS `echo $GTK_LIBS | sed 's/\(.*\)\(-lgtk.*\)/\1/'`" LIBS="$LIBS $GTK_LIBS" dnl Test for Xmu @@ -302,7 +305,16 @@ AC_CHECK_FUNC(random, [ dnl check for difftime AC_CHECK_FUNC(difftime, , AC_DEFINE(NO_DIFFTIME)) +dnl Threads +if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then + AC_CHECK_LIB(pthread, pthread_attr_init, + AC_DEFINE(USE_PTHREADS) + x_libs="$x_libs -lpthread" + CFLAGS="$CFLAGS -D_REENTRANT") +fi + CPPFLAGS="$gimp_save_CPPFLAGS" +LDFLAGS="$gimp_save_LDFLAGS" LIBS="$gimp_save_LIBS" gimpdatadir=$datadir/gimp @@ -395,10 +407,10 @@ AC_SUBST(GIMP_VERSION) AC_SUBST(gimpdir) AC_SUBST(gimpdatadir) AC_SUBST(gimpplugindir) -AC_SUBST(brushdata) -AC_SUBST(gradientdata) -AC_SUBST(palettedata) -AC_SUBST(patterndata) +AC_SUBST(brushdata) +AC_SUBST(gradientdata) +AC_SUBST(palettedata) +AC_SUBST(patterndata) AC_SUBST(WEBBROWSER) AC_SUBST(LIBXMU_LIB) AC_SUBST(TIFF) @@ -431,138 +443,137 @@ gimprc_user gimptool libgimp/Makefile plug-ins/Makefile -plug-ins/build -plug-ins/dbbrowser/Makefile -plug-ins/CML_explorer/Makefile -plug-ins/convmatrix/Makefile -plug-ins/diffraction/Makefile -plug-ins/pix/Makefile -plug-ins/oilify/Makefile -plug-ins/nova/Makefile -plug-ins/normalize/Makefile -plug-ins/noisify/Makefile -plug-ins/nlfilt/Makefile -plug-ins/mosaic/Makefile -plug-ins/mblur/Makefile -plug-ins/maze/Makefile -plug-ins/max_rgb/Makefile -plug-ins/mail/Makefile -plug-ins/laplace/Makefile -plug-ins/ifscompose/Makefile -plug-ins/iwarp/Makefile -plug-ins/hrz/Makefile -plug-ins/hot/Makefile -plug-ins/gz/Makefile -plug-ins/header/Makefile -plug-ins/grid/Makefile -plug-ins/gee/Makefile -plug-ins/gradmap/Makefile -plug-ins/gqbist/Makefile -plug-ins/gif/Makefile -plug-ins/gicon/Makefile -plug-ins/gfli/Makefile -plug-ins/gbr/Makefile -plug-ins/gauss_iir/Makefile -plug-ins/gauss_rle/Makefile -plug-ins/fits/Makefile -plug-ins/film/Makefile -plug-ins/faxg3/Makefile -plug-ins/exchange/Makefile -plug-ins/engrave/Makefile -plug-ins/emboss/Makefile -plug-ins/edge/Makefile -plug-ins/displace/Makefile -plug-ins/destripe/Makefile -plug-ins/despeckle/Makefile -plug-ins/depthmerge/Makefile -plug-ins/deinterlace/Makefile -plug-ins/decompose/Makefile -plug-ins/cubism/Makefile -plug-ins/compose/Makefile -plug-ins/checkerboard/Makefile -plug-ins/bz2/Makefile -plug-ins/xpm/Makefile -plug-ins/AlienMap/Makefile -plug-ins/c_astretch/Makefile -plug-ins/bumpmap/Makefile -plug-ins/script-fu/Makefile -plug-ins/script-fu/scripts/Makefile -plug-ins/jpeg/Makefile -plug-ins/mpeg/Makefile -plug-ins/aa/Makefile -plug-ins/png/Makefile -plug-ins/tiff/Makefile -plug-ins/xd/Makefile -plug-ins/bmp/Makefile -plug-ins/megawidget/Makefile -plug-ins/blur/Makefile -plug-ins/flame/Makefile -plug-ins/struc/Makefile -plug-ins/zealouscrop/Makefile -plug-ins/xwd/Makefile -plug-ins/whirlpinch/Makefile -plug-ins/waves/Makefile -plug-ins/vpropagate/Makefile -plug-ins/vinvert/Makefile -plug-ins/video/Makefile -plug-ins/url/Makefile -plug-ins/tiler/Makefile -plug-ins/tile/Makefile -plug-ins/tileit/Makefile -plug-ins/threshold_alpha/Makefile -plug-ins/tga/Makefile -plug-ins/sunras/Makefile -plug-ins/spread/Makefile -plug-ins/sparkle/Makefile -plug-ins/sobel/Makefile -plug-ins/snp/Makefile -plug-ins/snoise/Makefile -plug-ins/smooth_palette/Makefile -plug-ins/sinus/Makefile -plug-ins/shift/Makefile -plug-ins/sgi/Makefile -plug-ins/semiflatten/Makefile -plug-ins/scatter_hsv/Makefile -plug-ins/rotators/Makefile -plug-ins/rotate/Makefile -plug-ins/ripple/Makefile -plug-ins/randomize/Makefile -plug-ins/palette/Makefile -plug-ins/ps/Makefile -plug-ins/print/Makefile -plug-ins/polar/Makefile -plug-ins/pnm/Makefile -plug-ins/plasma/Makefile -plug-ins/pixelize/Makefile -plug-ins/pcx/Makefile -plug-ins/pagecurl/Makefile -plug-ins/pat/Makefile -plug-ins/blinds/Makefile -plug-ins/autostretch_hsv/Makefile -plug-ins/autocrop/Makefile -plug-ins/apply_lens/Makefile -plug-ins/animationplay/Makefile -plug-ins/align_layers/Makefile -plug-ins/CEL/Makefile -plug-ins/glasstile/Makefile -plug-ins/gtm/Makefile -plug-ins/colorify/Makefile -plug-ins/papertile/Makefile -plug-ins/illusion/Makefile -plug-ins/fractaltrace/Makefile -plug-ins/flarefx/Makefile -plug-ins/webbrowser/Makefile -plug-ins/animoptimize/Makefile plug-ins/libgck/Makefile plug-ins/libgck/gck/Makefile +plug-ins/megawidget/Makefile +plug-ins/gpc/Makefile +plug-ins/dbbrowser/Makefile +plug-ins/script-fu/Makefile +plug-ins/script-fu/scripts/Makefile +plug-ins/aa/Makefile +plug-ins/jpeg/Makefile +plug-ins/mpeg/Makefile +plug-ins/png/Makefile +plug-ins/tiff/Makefile +plug-ins/webbrowser/Makefile +plug-ins/xd/Makefile +plug-ins/xpm/Makefile +plug-ins/AlienMap/Makefile +plug-ins/CEL/Makefile +plug-ins/CML_explorer/Makefile +plug-ins/Lighting/Makefile plug-ins/MapObject/Makefile +plug-ins/align_layers/Makefile +plug-ins/animationplay/Makefile +plug-ins/animoptimize/Makefile +plug-ins/apply_lens/Makefile +plug-ins/autocrop/Makefile +plug-ins/autostretch_hsv/Makefile +plug-ins/blinds/Makefile +plug-ins/blur/Makefile +plug-ins/bmp/Makefile +plug-ins/bumpmap/Makefile +plug-ins/bz2/Makefile +plug-ins/c_astretch/Makefile +plug-ins/checkerboard/Makefile +plug-ins/colorify/Makefile +plug-ins/compose/Makefile +plug-ins/convmatrix/Makefile +plug-ins/cubism/Makefile +plug-ins/decompose/Makefile +plug-ins/deinterlace/Makefile +plug-ins/depthmerge/Makefile +plug-ins/despeckle/Makefile +plug-ins/destripe/Makefile +plug-ins/diffraction/Makefile +plug-ins/displace/Makefile +plug-ins/edge/Makefile +plug-ins/emboss/Makefile +plug-ins/engrave/Makefile +plug-ins/exchange/Makefile +plug-ins/faxg3/Makefile +plug-ins/film/Makefile +plug-ins/fits/Makefile +plug-ins/flame/Makefile +plug-ins/flarefx/Makefile +plug-ins/fractaltrace/Makefile +plug-ins/gauss_iir/Makefile +plug-ins/gauss_rle/Makefile +plug-ins/gbr/Makefile +plug-ins/gee/Makefile plug-ins/gfig/Makefile plug-ins/gfig/gfig-examples/Makefile -plug-ins/screenshot/Makefile -plug-ins/sharpen/Makefile +plug-ins/gfli/Makefile +plug-ins/gicon/Makefile +plug-ins/gif/Makefile +plug-ins/glasstile/Makefile +plug-ins/gqbist/Makefile +plug-ins/gradmap/Makefile +plug-ins/grid/Makefile +plug-ins/gtm/Makefile +plug-ins/gz/Makefile +plug-ins/header/Makefile +plug-ins/hot/Makefile +plug-ins/hrz/Makefile +plug-ins/ifscompose/Makefile +plug-ins/illusion/Makefile +plug-ins/iwarp/Makefile +plug-ins/laplace/Makefile +plug-ins/mail/Makefile +plug-ins/max_rgb/Makefile +plug-ins/maze/Makefile +plug-ins/mblur/Makefile +plug-ins/mosaic/Makefile +plug-ins/nlfilt/Makefile +plug-ins/noisify/Makefile +plug-ins/normalize/Makefile +plug-ins/nova/Makefile +plug-ins/oilify/Makefile +plug-ins/pagecurl/Makefile +plug-ins/palette/Makefile +plug-ins/papertile/Makefile +plug-ins/pat/Makefile +plug-ins/pcx/Makefile +plug-ins/pix/Makefile +plug-ins/pixelize/Makefile +plug-ins/plasma/Makefile +plug-ins/pnm/Makefile +plug-ins/polar/Makefile +plug-ins/print/Makefile +plug-ins/ps/Makefile plug-ins/psd/Makefile -plug-ins/gpc/Makefile -plug-ins/Lighting/Makefile +plug-ins/randomize/Makefile +plug-ins/ripple/Makefile +plug-ins/rotate/Makefile +plug-ins/rotators/Makefile +plug-ins/scatter_hsv/Makefile +plug-ins/screenshot/Makefile +plug-ins/semiflatten/Makefile +plug-ins/sgi/Makefile +plug-ins/sharpen/Makefile +plug-ins/shift/Makefile +plug-ins/sinus/Makefile +plug-ins/smooth_palette/Makefile +plug-ins/snoise/Makefile +plug-ins/snp/Makefile +plug-ins/sobel/Makefile +plug-ins/sparkle/Makefile +plug-ins/spread/Makefile +plug-ins/struc/Makefile +plug-ins/sunras/Makefile +plug-ins/tga/Makefile +plug-ins/threshold_alpha/Makefile +plug-ins/tile/Makefile +plug-ins/tileit/Makefile +plug-ins/tiler/Makefile +plug-ins/url/Makefile +plug-ins/video/Makefile +plug-ins/vinvert/Makefile +plug-ins/vpropagate/Makefile +plug-ins/waves/Makefile +plug-ins/whirlpinch/Makefile +plug-ins/xwd/Makefile +plug-ins/zealouscrop/Makefile app/Makefile docs/Makefile data/Makefile diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 96b5594567..c72948433a 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -12,6 +12,8 @@ libgimpi_a_SOURCES = gimpprotocol.c \ gimpwire.c \ gimpwire.h +libgimpi_a_DEPENDENCIES = libgimp.la + libgimp_la_SOURCES = gimp.c \ gimpchannel.c \ gimpdisplay.c \ diff --git a/libgimp/gimp.c b/libgimp/gimp.c index 971728a37d..6e9b6dae54 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c @@ -185,7 +185,7 @@ gimp_progress_init (char *message) return_vals = gimp_run_procedure ("gimp_progress_init", &nreturn_vals, PARAM_STRING, message, - PARAM_INT8, _gdisp_ID, + PARAM_INT32, _gdisp_ID, PARAM_END); gimp_destroy_params (return_vals, nreturn_vals); diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am index 5fb34c80b6..fac267e044 100644 --- a/plug-ins/Makefile.am +++ b/plug-ins/Makefile.am @@ -4,21 +4,21 @@ SUBDIRS = \ libgck \ megawidget \ gpc \ - MapObject \ - Lighting \ - AlienMap \ dbbrowser \ script-fu \ - struc \ - @WEBBROWSER@ \ @AA@ \ - @TIFF@ \ @JPEG@ \ - @PNG@ \ @MPEG@ \ + @PNG@ \ + @TIFF@ \ + @WEBBROWSER@ \ @XD@ \ @XPM@ \ + AlienMap \ + CEL \ CML_explorer \ + Lighting \ + MapObject \ align_layers \ animoptimize \ apply_lens \ @@ -31,7 +31,6 @@ SUBDIRS = \ bumpmap \ bz2 \ c_astretch \ - CEL \ checkerboard \ colorify \ compose \ @@ -115,6 +114,7 @@ SUBDIRS = \ sobel \ sparkle \ spread \ + struc \ sunras \ tga \ threshold_alpha \ diff --git a/plug-ins/common/tileit.c b/plug-ins/common/tileit.c index e7359680cd..bec0b66894 100644 --- a/plug-ins/common/tileit.c +++ b/plug-ins/common/tileit.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "gtk/gtk.h" #include "libgimp/gimp.h" @@ -484,7 +485,6 @@ tileit_dialog () /* Table for the stuff next to the explict button */ table3 = gtk_table_new (6, 6, FALSE); gtk_container_border_width (GTK_CONTAINER (table3), 0); - gtk_container_add (GTK_CONTAINER (xframe), table3); label = gtk_label_new ("Row"); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c index 2266252190..7e0caea053 100644 --- a/plug-ins/script-fu/script-fu-server.c +++ b/plug-ins/script-fu/script-fu-server.c @@ -115,7 +115,6 @@ static void server_start (gint port, static gint execute_command (SFCommand *cmd); static gint read_from_client (gint filedes); static gint make_socket (guint port); -static guint clientname_hash (gpointer key); static void server_log (gchar *format, ...); static void server_quit (void); diff --git a/plug-ins/tileit/tileit.c b/plug-ins/tileit/tileit.c index e7359680cd..bec0b66894 100644 --- a/plug-ins/tileit/tileit.c +++ b/plug-ins/tileit/tileit.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "gtk/gtk.h" #include "libgimp/gimp.h" @@ -484,7 +485,6 @@ tileit_dialog () /* Table for the stuff next to the explict button */ table3 = gtk_table_new (6, 6, FALSE); gtk_container_border_width (GTK_CONTAINER (table3), 0); - gtk_container_add (GTK_CONTAINER (xframe), table3); label = gtk_label_new ("Row"); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);