diff --git a/ChangeLog b/ChangeLog index e52c322287..ca3faf718e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2000-04-23 Tor Lillqvist + + * libgimp/gimpui.def: Add gimp_ui_init. + + * libgimp/makefile.{cygwin,msc} (gimpui_OBJECTS): Add gimpui. + + * app/makefile.{cygwin,msc} + * plug-ins/makefile.{cygwin,msc}: New installation directory. + + * app/datafiles.c (is_script): Must not g_free() value returned by + g_getenv(). + + * plug-ins/gdyntext/font_selection.c: Don't include gdkx.h with + GTk+ 1.3. + 2000-04-23 Sven Neumann * configure.in: added es to ALL_LINGUAS diff --git a/app/core/gimpdatafiles.c b/app/core/gimpdatafiles.c index 1aa98876b7..2984131418 100644 --- a/app/core/gimpdatafiles.c +++ b/app/core/gimpdatafiles.c @@ -76,7 +76,6 @@ is_script (const gchar *filename) if (pathext != NULL) { exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100); - g_free (pathext); } else { diff --git a/app/datafiles.c b/app/datafiles.c index 1aa98876b7..2984131418 100644 --- a/app/datafiles.c +++ b/app/datafiles.c @@ -76,7 +76,6 @@ is_script (const gchar *filename) if (pathext != NULL) { exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100); - g_free (pathext); } else { diff --git a/app/makefile.cygwin b/app/makefile.cygwin index 73692fa7ff..5a5e3b3d52 100644 --- a/app/makefile.cygwin +++ b/app/makefile.cygwin @@ -2,7 +2,9 @@ ## Use: make -f makefile.cygwin # Change this to wherever you want to install gimp.exe. -BIN = /gimp/bin +# This is what I use as installation target, from where the installer-builder +# will pick it up. +BIN = /install/gimp/bin OPTIMIZE = -g -O diff --git a/app/makefile.msc b/app/makefile.msc index d9d4d98392..6199300a09 100644 --- a/app/makefile.msc +++ b/app/makefile.msc @@ -2,7 +2,9 @@ ## Use: nmake -f makefile.msc # Change this to wherever you want to install gimp.exe. -BIN = C:\gimp\bin +# This is what I use as installation target, from where the installer-builder +# will pick it up. +BIN = C:\install\gimp\bin ################################################################ diff --git a/libgimp/gimpui.def b/libgimp/gimpui.def index cf48ecaedf..022bed1c3a 100644 --- a/libgimp/gimpui.def +++ b/libgimp/gimpui.def @@ -89,4 +89,5 @@ EXPORTS gimp_spin_button_new gimp_table_attach_aligned gimp_toggle_button_update + gimp_ui_init gimp_unit_menu_update diff --git a/libgimp/makefile.cygwin b/libgimp/makefile.cygwin index bb2e29e1d1..48539e0768 100644 --- a/libgimp/makefile.cygwin +++ b/libgimp/makefile.cygwin @@ -161,6 +161,7 @@ gimpui_OBJECTS = \ gimppixmap.o \ gimpquerybox.o \ gimpsizeentry.o \ + gimpui.o \ gimpunitmenu.o \ gimpwidgets.o diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc index 652f065543..271d29f192 100644 --- a/libgimp/makefile.msc +++ b/libgimp/makefile.msc @@ -55,53 +55,53 @@ install : all $(INSTALL) gimpui-$(GIMP_VER).dll $(BIN) gimpi_OBJECTS = \ - gimpenv.obj \ - gimpchainbutton.obj\ - gimpcolorbutton.obj\ + gimpenv.obj \ + gimpchainbutton.obj \ + gimpcolorbutton.obj \ gimpcolorspace.obj \ - gimpdialog.obj \ - gimpfileselection.obj\ - gimphelpui.obj \ - gimpmatrix.obj \ - gimppatheditor.obj\ - gimppixmap.obj \ - gimpprotocol.obj\ - gimpquerybox.obj\ - gimpsizeentry.obj\ - gimpunitmenu.obj\ - gimpvector.obj \ - gimpwidgets.obj \ - gimpwire.obj \ - gserialize.obj \ - parasite.obj \ + gimpdialog.obj \ + gimpfileselection.obj \ + gimphelpui.obj \ + gimpmatrix.obj \ + gimppatheditor.obj \ + gimppixmap.obj \ + gimpprotocol.obj \ + gimpquerybox.obj \ + gimpsizeentry.obj \ + gimpunitmenu.obj \ + gimpvector.obj \ + gimpwidgets.obj \ + gimpwire.obj \ + gserialize.obj \ + parasite.obj \ parasiteio.obj gimpi.lib : $(gimpi_OBJECTS) lib /out:gimpi.lib $(gimpi_OBJECTS) gimp_OBJECTS = \ - gimp.obj \ - gimpchannel.obj \ + gimp.obj \ + gimpchannel.obj \ gimpcolorspace.obj \ - gimpdisplay.obj \ - gimpdrawable.obj\ - gimpenv.obj \ - gimpgradient.obj\ - gimphelp.obj \ - gimpimage.obj \ - gimplayer.obj \ - gimpmatrix.obj \ - gimppalette.obj \ - gimpparasite.obj\ - gimppixelrgn.obj\ - gimpprotocol.obj\ - gimpselection.obj\ - gimptile.obj \ - gimpunit.obj \ - gimpvector.obj \ - gimpwire.obj \ - gserialize.obj \ - parasite.obj \ + gimpdisplay.obj \ + gimpdrawable.obj \ + gimpenv.obj \ + gimpgradient.obj \ + gimphelp.obj \ + gimpimage.obj \ + gimplayer.obj \ + gimpmatrix.obj \ + gimppalette.obj \ + gimpparasite.obj \ + gimppixelrgn.obj \ + gimpprotocol.obj \ + gimpselection.obj \ + gimptile.obj \ + gimpunit.obj \ + gimpvector.obj \ + gimpwire.obj \ + gserialize.obj \ + parasite.obj \ parasiteio.obj gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def @@ -153,21 +153,22 @@ parasite.obj : parasite.c $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION parasite.c gimpui_OBJECTS = \ - gimpmenu.obj \ - gimpbrushmenu.obj\ - gimpchainbutton.obj\ - gimpcolorbutton.obj\ - gimpdialog.obj \ - gimpexport.obj \ - gimpfileselection.obj\ - gimpgradientmenu.obj\ - gimphelpui.obj \ - gimppatheditor.obj\ - gimppatternmenu.obj\ - gimppixmap.obj \ - gimpquerybox.obj\ - gimpsizeentry.obj\ - gimpunitmenu.obj\ + gimpmenu.obj \ + gimpbrushmenu.obj \ + gimpchainbutton.obj \ + gimpcolorbutton.obj \ + gimpdialog.obj \ + gimpexport.obj \ + gimpfileselection.obj \ + gimpgradientmenu.obj \ + gimphelpui.obj \ + gimppatheditor.obj \ + gimppatternmenu.obj \ + gimppixmap.obj \ + gimpquerybox.obj \ + gimpsizeentry.obj \ + gimpui.obj \ + gimpunitmenu.obj \ gimpwidgets.obj gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def diff --git a/libgimpbase/gimpdatafiles.c b/libgimpbase/gimpdatafiles.c index 1aa98876b7..2984131418 100644 --- a/libgimpbase/gimpdatafiles.c +++ b/libgimpbase/gimpdatafiles.c @@ -76,7 +76,6 @@ is_script (const gchar *filename) if (pathext != NULL) { exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100); - g_free (pathext); } else { diff --git a/plug-ins/gdyntext/font_selection.c b/plug-ins/gdyntext/font_selection.c index 2b346b205a..f6cbeeb4bc 100644 --- a/plug-ins/gdyntext/font_selection.c +++ b/plug-ins/gdyntext/font_selection.c @@ -25,7 +25,11 @@ #include #include +#if GTK_CHECK_VERSION(1,3,0) +#include +#else #include +#endif #include "font_selection.h" diff --git a/plug-ins/makefile.cygwin b/plug-ins/makefile.cygwin index 0b58f9ba3a..c9bb745c73 100644 --- a/plug-ins/makefile.cygwin +++ b/plug-ins/makefile.cygwin @@ -7,7 +7,9 @@ INSTALL = install -GIMP = /gimp +# This is what I use as installation target, from where the installer-builder +# will pick it up. +GIMP = /install/gimp BIN = $(GIMP)/plug-ins @@ -135,6 +137,7 @@ guash-data-install: script-fu-data-install: -mkdir $(GIMP)/scripts $(INSTALL) script-fu/scripts/*.scm $(GIMP)/scripts + rm $(GIMP)/scripts/test-sphere.scm $(INSTALL) script-fu/scripts/*.jpg $(GIMP)/scripts for d in FractalExplorer/fractalexplorer-examples/*; do if [ -f $$d ]; then $(INSTALL) $$d $(GIMP)/fractalexplorer; fi; done rm $(GIMP)/fractalexplorer/Makefile.am diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc index 759ef38774..1f9f48fa8d 100644 --- a/plug-ins/makefile.msc +++ b/plug-ins/makefile.msc @@ -7,7 +7,9 @@ INSTALL = copy -GIMP = C:\gimp +# This is what I use as installation target, from where the installer-builder +# will pick it up. +GIMP = C:\install\gimp BIN = $(GIMP)\plug-ins