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

Add gimp_ui_init.

Browse Source 
2000-04-23  Tor Lillqvist  <tml@iki.fi>

* 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.
This commit is contained in:
Tor Lillqvist
2000-04-23 20:27:41 +00:00
committed by Tor Lillqvist
parent b954835cf3
commit 2041747fc6
12 changed files with 89 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2000-04-23 Tor Lillqvist <tml@iki.fi>
* 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 <sven@gimp.org> 2000-04-23 Sven Neumann <sven@gimp.org>
* configure.in: added es to ALL_LINGUAS * configure.in: added es to ALL_LINGUAS

1
app/core/gimpdatafiles.c
View File

@ -76,7 +76,6 @@ is_script (const gchar *filename)
if (pathext != NULL) if (pathext != NULL)
{ {
exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100); exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100);
g_free (pathext);
} }
else else
{ {

1
app/datafiles.c
View File

@ -76,7 +76,6 @@ is_script (const gchar *filename)
if (pathext != NULL) if (pathext != NULL)
{ {
exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100); exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100);
g_free (pathext);
} }
else else
{ {

4
app/makefile.cygwin
View File

@ -2,7 +2,9 @@
## Use: make -f makefile.cygwin ## Use: make -f makefile.cygwin
# Change this to wherever you want to install gimp.exe. # 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 OPTIMIZE = -g -O

4
app/makefile.msc
View File

@ -2,7 +2,9 @@
## Use: nmake -f makefile.msc ## Use: nmake -f makefile.msc
# Change this to wherever you want to install gimp.exe. # 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
################################################################ ################################################################

1
libgimp/gimpui.def
View File

@ -89,4 +89,5 @@ EXPORTS
gimp_spin_button_new gimp_spin_button_new
gimp_table_attach_aligned gimp_table_attach_aligned
gimp_toggle_button_update gimp_toggle_button_update
gimp_ui_init
gimp_unit_menu_update gimp_unit_menu_update

1
libgimp/makefile.cygwin
View File

@ -161,6 +161,7 @@ gimpui_OBJECTS = \
gimppixmap.o \ gimppixmap.o \
gimpquerybox.o \ gimpquerybox.o \
gimpsizeentry.o \ gimpsizeentry.o \
gimpui.o \
gimpunitmenu.o \ gimpunitmenu.o \
gimpwidgets.o gimpwidgets.o

109
libgimp/makefile.msc
View File

@ -55,53 +55,53 @@ install : all
$(INSTALL) gimpui-$(GIMP_VER).dll $(BIN) $(INSTALL) gimpui-$(GIMP_VER).dll $(BIN)
gimpi_OBJECTS = \ gimpi_OBJECTS = \
gimpenv.obj \ gimpenv.obj \
gimpchainbutton.obj\ gimpchainbutton.obj \
gimpcolorbutton.obj\ gimpcolorbutton.obj \
gimpcolorspace.obj \ gimpcolorspace.obj \
gimpdialog.obj \ gimpdialog.obj \
gimpfileselection.obj\ gimpfileselection.obj \
gimphelpui.obj \ gimphelpui.obj \
gimpmatrix.obj \ gimpmatrix.obj \
gimppatheditor.obj\ gimppatheditor.obj \
gimppixmap.obj \ gimppixmap.obj \
gimpprotocol.obj\ gimpprotocol.obj \
gimpquerybox.obj\ gimpquerybox.obj \
gimpsizeentry.obj\ gimpsizeentry.obj \
gimpunitmenu.obj\ gimpunitmenu.obj \
gimpvector.obj \ gimpvector.obj \
gimpwidgets.obj \ gimpwidgets.obj \
gimpwire.obj \ gimpwire.obj \
gserialize.obj \ gserialize.obj \
parasite.obj \ parasite.obj \
parasiteio.obj parasiteio.obj
gimpi.lib : $(gimpi_OBJECTS) gimpi.lib : $(gimpi_OBJECTS)
lib /out:gimpi.lib $(gimpi_OBJECTS) lib /out:gimpi.lib $(gimpi_OBJECTS)
gimp_OBJECTS = \ gimp_OBJECTS = \
gimp.obj \ gimp.obj \
gimpchannel.obj \ gimpchannel.obj \
gimpcolorspace.obj \ gimpcolorspace.obj \
gimpdisplay.obj \ gimpdisplay.obj \
gimpdrawable.obj\ gimpdrawable.obj \
gimpenv.obj \ gimpenv.obj \
gimpgradient.obj\ gimpgradient.obj \
gimphelp.obj \ gimphelp.obj \
gimpimage.obj \ gimpimage.obj \
gimplayer.obj \ gimplayer.obj \
gimpmatrix.obj \ gimpmatrix.obj \
gimppalette.obj \ gimppalette.obj \
gimpparasite.obj\ gimpparasite.obj \
gimppixelrgn.obj\ gimppixelrgn.obj \
gimpprotocol.obj\ gimpprotocol.obj \
gimpselection.obj\ gimpselection.obj \
gimptile.obj \ gimptile.obj \
gimpunit.obj \ gimpunit.obj \
gimpvector.obj \ gimpvector.obj \
gimpwire.obj \ gimpwire.obj \
gserialize.obj \ gserialize.obj \
parasite.obj \ parasite.obj \
parasiteio.obj parasiteio.obj
gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def gimp-$(GIMP_VER).dll : $(gimp_OBJECTS) gimp.def
@ -153,21 +153,22 @@ parasite.obj : parasite.c
$(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION parasite.c $(CC) $(CFLAGS) -GD -c -DLIBGIMP_COMPILATION parasite.c
gimpui_OBJECTS = \ gimpui_OBJECTS = \
gimpmenu.obj \ gimpmenu.obj \
gimpbrushmenu.obj\ gimpbrushmenu.obj \
gimpchainbutton.obj\ gimpchainbutton.obj \
gimpcolorbutton.obj\ gimpcolorbutton.obj \
gimpdialog.obj \ gimpdialog.obj \
gimpexport.obj \ gimpexport.obj \
gimpfileselection.obj\ gimpfileselection.obj \
gimpgradientmenu.obj\ gimpgradientmenu.obj \
gimphelpui.obj \ gimphelpui.obj \
gimppatheditor.obj\ gimppatheditor.obj \
gimppatternmenu.obj\ gimppatternmenu.obj \
gimppixmap.obj \ gimppixmap.obj \
gimpquerybox.obj\ gimpquerybox.obj \
gimpsizeentry.obj\ gimpsizeentry.obj \
gimpunitmenu.obj\ gimpui.obj \
gimpunitmenu.obj \
gimpwidgets.obj gimpwidgets.obj
gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def

1
libgimpbase/gimpdatafiles.c
View File

@ -76,7 +76,6 @@ is_script (const gchar *filename)
if (pathext != NULL) if (pathext != NULL)
{ {
exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100); exts = g_strsplit (pathext, G_SEARCHPATH_SEPARATOR_S, 100);
g_free (pathext);
} }
else else
{ {

4
plug-ins/gdyntext/font_selection.c
View File

@ -25,7 +25,11 @@
#include <string.h> #include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#if GTK_CHECK_VERSION(1,3,0)
#include <gdk/gdkprivate.h>
#else
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif
#include "font_selection.h" #include "font_selection.h"

5
plug-ins/makefile.cygwin
View File

@ -7,7 +7,9 @@
INSTALL = install 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 BIN = $(GIMP)/plug-ins
@ -135,6 +137,7 @@ guash-data-install:
script-fu-data-install: script-fu-data-install:
-mkdir $(GIMP)/scripts -mkdir $(GIMP)/scripts
$(INSTALL) script-fu/scripts/*.scm $(GIMP)/scripts $(INSTALL) script-fu/scripts/*.scm $(GIMP)/scripts
rm $(GIMP)/scripts/test-sphere.scm
$(INSTALL) script-fu/scripts/*.jpg $(GIMP)/scripts $(INSTALL) script-fu/scripts/*.jpg $(GIMP)/scripts
for d in FractalExplorer/fractalexplorer-examples/*; do if [ -f $$d ]; then $(INSTALL) $$d $(GIMP)/fractalexplorer; fi; done for d in FractalExplorer/fractalexplorer-examples/*; do if [ -f $$d ]; then $(INSTALL) $$d $(GIMP)/fractalexplorer; fi; done
rm $(GIMP)/fractalexplorer/Makefile.am rm $(GIMP)/fractalexplorer/Makefile.am

4
plug-ins/makefile.msc
View File

@ -7,7 +7,9 @@
INSTALL = copy 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 BIN = $(GIMP)\plug-ins