dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/config/gimpconfig-dump.c changed prefix of environment variables to 

2003-08-18  Sven Neumann  <sven@gimp.org>

	* app/config/gimpconfig-dump.c
	* libgimpbase/gimpenv.c: changed prefix of environment variables
	to GIMP2 (bug #118553).

	* docs/gimprc-1.3.5.in: regenerated.
This commit is contained in:
Sven Neumann 2003-08-18 15:10:30 +00:00 committed by Sven Neumann
parent 4cae0f19ce
commit 506f2d7733
5 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,7 +1,14 @@
2003-08-18 Sven Neumann <sven@gimp.org>
* app/config/gimpconfig-dump.c
* libgimpbase/gimpenv.c: changed prefix of environment variables
to GIMP2 (bug #118553).
* docs/gimprc-1.3.5.in: regenerated.
2003-08-18 Helvetix Victorinox <helvetix@gimp.org>
* app/composite:
Various beautifications, dead code removal.
* app/composite: Various beautifications, dead code removal.
2003-08-18 Michael Natterer <mitch@gimp.org>

14
app/config/gimpconfig-dump.c
View File

@ -2,7 +2,7 @@
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* GimpConfig object property dumper.
* Copyright (C) 2001-2002 Sven Neumann <sven@gimp.org>
* Copyright (C) 2001-2003 Sven Neumann <sven@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -164,8 +164,8 @@ static const gchar *system_gimprc_header =
"documents the default values and shows what changes are possible.\n"
"\n"
"The variable ${gimp_dir} is set to the value of the environment "
"variable GIMP_DIRECTORY or, if that is not set, the compiled-in "
"default value is used. If GIMP_DIRECTORY is not an absolute path, "
"variable GIMP2_DIRECTORY or, if that is not set, the compiled-in "
"default value is used. If GIMP2_DIRECTORY is not an absolute path, "
"it is interpreted relative to your home directory.";
static void
@ -264,21 +264,21 @@ static const gchar *man_page_path =
".TP\n"
".I gimp_dir\n"
"The personal gimp directory which is set to the value of the environment\n"
"variable GIMP_DIRECTORY or to ~/@gimpdir@.\n"
"variable GIMP2_DIRECTORY or to ~/@gimpdir@.\n"
".TP\n"
".I gimp_data_dir\n"
"Nase for paths to shareable data, which is set to the value of the\n"
"environment variable GIMP_DATADIR or to the compiled-in default value\n"
"environment variable GIMP2_DATADIR or to the compiled-in default value\n"
"@gimpdatadir@.\n"
".TP\n"
".I gimp_plug_in_dir\n"
"Base to paths for architecture-specific plugins and modules, which is set\n"
"to the value of the environment variable GIMP_PLUGINDIR or to the\n"
"to the value of the environment variable GIMP2_PLUGINDIR or to the\n"
"compiled-in default value @gimpplugindir@.\n"
".TP\n"
".I gimp_sysconf_dir\n"
"Path to configuration files, which is set to the value of the environment\n"
"variable GIMP_SYSCONFDIR or to the compiled-in default value \n"
"variable GIMP2_SYSCONFDIR or to the compiled-in default value \n"
"@gimpsysconfdir@.\n"
"\n";

8
docs/gimprc-1.3.5.in
View File

@ -711,21 +711,21 @@ There are a few variables that are pre-defined:
.TP
.I gimp_dir
The personal gimp directory which is set to the value of the environment
variable GIMP_DIRECTORY or to ~/@gimpdir@.
variable GIMP2_DIRECTORY or to ~/@gimpdir@.
.TP
.I gimp_data_dir
Nase for paths to shareable data, which is set to the value of the
environment variable GIMP_DATADIR or to the compiled-in default value
environment variable GIMP2_DATADIR or to the compiled-in default value
@gimpdatadir@.
.TP
.I gimp_plug_in_dir
Base to paths for architecture-specific plugins and modules, which is set
to the value of the environment variable GIMP_PLUGINDIR or to the
to the value of the environment variable GIMP2_PLUGINDIR or to the
compiled-in default value @gimpplugindir@.
.TP
.I gimp_sysconf_dir
Path to configuration files, which is set to the value of the environment
variable GIMP_SYSCONFDIR or to the compiled-in default value
variable GIMP2_SYSCONFDIR or to the compiled-in default value
@gimpsysconfdir@.
.SH FILES

8
docs/gimprc.5.in
View File

@ -711,21 +711,21 @@ There are a few variables that are pre-defined:
.TP
.I gimp_dir
The personal gimp directory which is set to the value of the environment
variable GIMP_DIRECTORY or to ~/@gimpdir@.
variable GIMP2_DIRECTORY or to ~/@gimpdir@.
.TP
.I gimp_data_dir
Nase for paths to shareable data, which is set to the value of the
environment variable GIMP_DATADIR or to the compiled-in default value
environment variable GIMP2_DATADIR or to the compiled-in default value
@gimpdatadir@.
.TP
.I gimp_plug_in_dir
Base to paths for architecture-specific plugins and modules, which is set
to the value of the environment variable GIMP_PLUGINDIR or to the
to the value of the environment variable GIMP2_PLUGINDIR or to the
compiled-in default value @gimpplugindir@.
.TP
.I gimp_sysconf_dir
Path to configuration files, which is set to the value of the environment
variable GIMP_SYSCONFDIR or to the compiled-in default value
variable GIMP2_SYSCONFDIR or to the compiled-in default value
@gimpsysconfdir@.
.SH FILES

34
libgimpbase/gimpenv.c
View File

@ -71,13 +71,13 @@ static gchar * gimp_env_get_dir (const gchar *gimp_env_name,
* gimp_directory:
*
* Returns the user-specific GIMP settings directory. If the
* environment variable GIMP_DIRECTORY exists, it is used. If it is an
* absolute path, it is used as is. If it is a relative path, it is
* taken to be a subdirectory of the home directory. If it is a
* environment variable GIMP2_DIRECTORY exists, it is used. If it is
* an absolute path, it is used as is. If it is a relative path, it
* is taken to be a subdirectory of the home directory. If it is a
* relative path, and no home directory can be determined, it is taken
* to be a subdirectory of gimp_data_directory().
*
* The usual case is that no GIMP_DIRECTORY environment variable
* The usual case is that no GIMP2_DIRECTORY environment variable
* exists, and then we use the GIMPDIR subdirectory of the home
* directory. If no home directory exists, we use a per-user
* subdirectory of gimp_data_directory(). In any case, we always
@ -100,7 +100,7 @@ gimp_directory (void)
if (gimp_dir)
return gimp_dir;
env_gimp_dir = g_getenv ("GIMP_DIRECTORY");
env_gimp_dir = g_getenv ("GIMP2_DIRECTORY");
home_dir = g_get_home_dir ();
if (env_gimp_dir)
@ -243,11 +243,11 @@ gimp_toplevel_directory ()
/**
* gimp_data_directory:
*
* Returns the top directory for GIMP data. If the environment variable
* GIMP_DATADIR exists, that is used. It should be an absolute pathname.
* Otherwise, on Unix the compile-time defined directory is used. On
* Win32, the installation directory as deduced from the executable's
* name is used.
* Returns the top directory for GIMP data. If the environment
* variable GIMP2_DATADIR exists, that is used. It should be an
* absolute pathname. Otherwise, on Unix the compile-time defined
* directory is used. On Win32, the installation directory as deduced
* from the executable's name is used.
*
* The returned string is allocated just once, and should *NOT* be
* freed with g_free().
@ -262,7 +262,7 @@ gimp_data_directory (void)
if (gimp_data_dir)
return gimp_data_dir;
gimp_data_dir = gimp_env_get_dir ("GIMP_DATADIR", DATADIR);
gimp_data_dir = gimp_env_get_dir ("GIMP2_DATADIR", DATADIR);
return gimp_data_dir;
}
@ -271,7 +271,7 @@ gimp_data_directory (void)
* gimp_locale_directory:
*
* Returns the top directory for GIMP locale files. If the environment
* variable GIMP_LOCALEDIR exists, that is used. It should be an
* variable GIMP2_LOCALEDIR exists, that is used. It should be an
* absolute pathname. Otherwise, on Unix the compile-time defined
* directory is used. On Win32, the installation directory as deduced
* from the executable's name is used.
@ -289,7 +289,7 @@ gimp_locale_directory (void)
if (gimp_locale_dir != NULL)
return gimp_locale_dir;
gimp_locale_dir = gimp_env_get_dir ("GIMP_LOCALEDIR", LOCALEDIR);
gimp_locale_dir = gimp_env_get_dir ("GIMP2_LOCALEDIR", LOCALEDIR);
return gimp_locale_dir;
}
@ -298,7 +298,7 @@ gimp_locale_directory (void)
* gimp_sysconf_directory:
*
* Returns the top directory for GIMP config files. If the environment
* variable GIMP_SYSCONFDIR exists, that is used. It should be an
* variable GIMP2_SYSCONFDIR exists, that is used. It should be an
* absolute pathname. Otherwise, on Unix the compile-time defined
* directory is used. On Win32, the installation directory as deduced
* from the executable's name is used.
@ -316,7 +316,7 @@ gimp_sysconf_directory (void)
if (gimp_sysconf_dir != NULL)
return gimp_sysconf_dir;
gimp_sysconf_dir = gimp_env_get_dir ("GIMP_SYSCONFDIR", SYSCONFDIR);
gimp_sysconf_dir = gimp_env_get_dir ("GIMP2_SYSCONFDIR", SYSCONFDIR);
return gimp_sysconf_dir;
}
@ -325,7 +325,7 @@ gimp_sysconf_directory (void)
* gimp_plug_in_directory:
*
* Returns the top directory for GIMP plug_ins and modules. If the
* environment variable GIMP_PLUGINDIR exists, that is used. It
* environment variable GIMP2_PLUGINDIR exists, that is used. It
* should be an absolute pathname. Otherwise, on Unix the compile-time
* defined directory is used. On Win32, the installation directory as
* deduced from the executable's name is used.
@ -343,7 +343,7 @@ gimp_plug_in_directory (void)
if (gimp_plug_in_dir)
return gimp_plug_in_dir;
gimp_plug_in_dir = gimp_env_get_dir ("GIMP_PLUGINDIR", PLUGINDIR);
gimp_plug_in_dir = gimp_env_get_dir ("GIMP2_PLUGINDIR", PLUGINDIR);
return gimp_plug_in_dir;
}