mirror of https://github.com/GNOME/gimp.git
Fix a few path separators, should be semicolons on Win32.
2000-02-08 Tor Lillqvist <tml@iki.fi> * gimprc.win32: Fix a few path separators, should be semicolons on Win32. * plug-ins/makefile.cygwin: Install GAP and GFlare data. * plug-ins/FractalExplorer/FractalExplorer.c: Fix a bug I introduced last May, don't overrun a g_strdup'ed string with strcat.
This commit is contained in:
Tor Lillqvist
Tor Lillqvist
parent
dd62734b87
commit
19b2af9211
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2000-02-08 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gimprc.win32: Fix a few path separators, should be semicolons on
|
||||
Win32.
|
||||
|
||||
* plug-ins/makefile.cygwin: Install GAP and GFlare data.
|
||||
|
||||
* plug-ins/FractalExplorer/FractalExplorer.c: Fix a bug I
|
||||
introduced last May, don't overrun a g_strdup'ed string with
|
||||
strcat.
|
||||
|
||||
Mon Feb 7 23:22:53 CET 2000 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* plug-ins/common/curve_bend.c: found a bug that I introduced
|
||||
|
|
|
|||
|
|
@ -286,15 +286,15 @@
|
|||
|
||||
# Gfig search path
|
||||
# This path will be searched for Gfig figures when you use the Gfig plug-in.
|
||||
(gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig")
|
||||
(gfig-path "${gimp_dir}/gfig;${gimp_data_dir}/gfig")
|
||||
|
||||
# Fractalexplorer path
|
||||
# This path will be searched for fractals when you use the Fractalexplorer
|
||||
# plug-in.
|
||||
(fractalexplorer-path "${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer")
|
||||
(fractalexplorer-path "${gimp_dir}/fractalexplorer;${gimp_data_dir}/fractalexplorer")
|
||||
|
||||
# GFlare path
|
||||
# This path will be searched for gflares when you use the GFlare plug-in.
|
||||
(gflare-path "${gimp_dir}/gflares:${gimp_data_dir}/gflares")
|
||||
(gflare-path "${gimp_dir}/gflare;${gimp_data_dir}/gflare")
|
||||
|
||||
# [end of file]
|
||||
|
|
|
|||
|
|
@ -286,15 +286,15 @@
|
|||
|
||||
# Gfig search path
|
||||
# This path will be searched for Gfig figures when you use the Gfig plug-in.
|
||||
(gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig")
|
||||
(gfig-path "${gimp_dir}/gfig;${gimp_data_dir}/gfig")
|
||||
|
||||
# Fractalexplorer path
|
||||
# This path will be searched for fractals when you use the Fractalexplorer
|
||||
# plug-in.
|
||||
(fractalexplorer-path "${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer")
|
||||
(fractalexplorer-path "${gimp_dir}/fractalexplorer;${gimp_data_dir}/fractalexplorer")
|
||||
|
||||
# GFlare path
|
||||
# This path will be searched for gflares when you use the GFlare plug-in.
|
||||
(gflare-path "${gimp_dir}/gflares:${gimp_data_dir}/gflares")
|
||||
(gflare-path "${gimp_dir}/gflare;${gimp_data_dir}/gflare")
|
||||
|
||||
# [end of file]
|
||||
|
|
|
|||
|
|
@ -1180,9 +1180,6 @@ plug_in_parse_fractalexplorer_path (void)
|
|||
|
||||
if (!err && S_ISDIR (filestat.st_mode))
|
||||
{
|
||||
if (path[strlen (path) - 1] != G_DIR_SEPARATOR)
|
||||
strcat (path, G_DIR_SEPARATOR_S);
|
||||
|
||||
fractalexplorer_path_list = g_list_append (fractalexplorer_path_list, path);
|
||||
}
|
||||
else
|
||||
|
|
@ -1333,6 +1330,8 @@ fractalexplorer_list_load_all (GList *plist)
|
|||
struct dirent *dir_ent;
|
||||
struct stat filestat;
|
||||
gint err;
|
||||
gchar pathlast;
|
||||
|
||||
/* Make sure to clear any existing fractalexplorers */
|
||||
current_obj = pic_obj = NULL;
|
||||
fractalexplorer_list_free_all ();
|
||||
|
|
@ -1341,6 +1340,7 @@ fractalexplorer_list_load_all (GList *plist)
|
|||
{
|
||||
path = list->data;
|
||||
list = list->next;
|
||||
pathlast = path[strlen (path) - 1];
|
||||
|
||||
/* Open directory */
|
||||
dir = opendir (path);
|
||||
|
|
@ -1351,7 +1351,10 @@ fractalexplorer_list_load_all (GList *plist)
|
|||
{
|
||||
while ((dir_ent = readdir (dir)))
|
||||
{
|
||||
filename = g_strdup_printf ("%s%s", path, dir_ent->d_name);
|
||||
filename = g_strdup_printf
|
||||
("%s%s%s", path,
|
||||
(pathlast == G_DIR_SEPARATOR ? "" : G_DIR_SEPARATOR_S),
|
||||
dir_ent->d_name);
|
||||
|
||||
/* Check the file and see that it is not a sub-directory */
|
||||
err = stat (filename, &filestat);
|
||||
|
|
|
|||
|
|
@ -112,7 +112,16 @@ sub-one-separate :
|
|||
cd $(DIR); $(MAKE) -f ../makefile.cygwin TOP=../.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET)
|
||||
|
||||
|
||||
data-install : gimpressionist-data-install script-fu-data-install gap-data-install guash-data-install
|
||||
data-install : gap-data-install gflare-data-install gimpressionist-data-install guash-data-install script-fu-data-install
|
||||
|
||||
gap-data-install:
|
||||
-mkdir $(GIMP)/scripts
|
||||
$(INSTALL) gap/*.scm $(GIMP)/scripts
|
||||
|
||||
gflare-data-install:
|
||||
-mkdir $(GIMP)/gflare
|
||||
-$(INSTALL) gflare/gflares/* $(GIMP)/gflare
|
||||
-rm $(GIMP)/gflare/Makefile.am
|
||||
|
||||
gimpressionist-data-install :
|
||||
-mkdir $(GIMP)/gimpressionist $(GIMP)/gimpressionist/Brushes $(GIMP)/gimpressionist/Paper $(GIMP)/gimpressionist/Presets
|
||||
|
|
@ -121,6 +130,8 @@ gimpressionist-data-install :
|
|||
-$(INSTALL) gimpressionist/Presets/* $(GIMP)/gimpressionist/Presets
|
||||
-rm $(GIMP)/gimpressionist/Presets/Makefile.am
|
||||
|
||||
guash-data-install:
|
||||
|
||||
script-fu-data-install:
|
||||
-mkdir $(GIMP)/scripts
|
||||
$(INSTALL) script-fu/scripts/*.scm $(GIMP)/scripts
|
||||
|
|
@ -128,12 +139,6 @@ script-fu-data-install:
|
|||
for d in FractalExplorer/fractalexplorer-examples/*; do if [ -f $$d ]; then $(INSTALL) $$d $(GIMP)/fractalexplorer; fi; done
|
||||
rm $(GIMP)/fractalexplorer/Makefile.am
|
||||
|
||||
gap-data-install:
|
||||
-mkdir $(GIMP)/scripts
|
||||
$(INSTALL) gap/*.scm $(GIMP)/scripts
|
||||
|
||||
guash-data-install:
|
||||
|
||||
endif # ifndef MODULE
|
||||
endif # ifndef PLUGIN
|
||||
endif # ifndef LIBRARY
|
||||
|
|
|
|||
Loading…
Reference in New Issue