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

changed the default for "help-locales" from NULL to an empty string. Fixes 

2004-03-29  Sven Neumann  <sven@gimp.org>

	* app/config/gimpguiconfig.c: changed the default for "help-locales"
	from NULL to an empty string. Fixes the generated gimprc man-page.

	* app/config/gimprc-blurbs.h (HELP_LOCALES_BLURB): added missing
	whitespace.

	* app/widgets/gimphelp.c: use the user's locale if "help-locales"
	is NULL or the empty string.

	* docs/gimprc.5.in
	* etc/gimprc: regenerated.
This commit is contained in:
Sven Neumann 2004-03-29 17:54:13 +00:00 committed by Sven Neumann
parent 4fa62d1564
commit 951f1589a1
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,17 @@
2004-03-29 Sven Neumann <sven@gimp.org>
* app/config/gimpguiconfig.c: changed the default for "help-locales"
from NULL to an empty string. Fixes the generated gimprc man-page.
* app/config/gimprc-blurbs.h (HELP_LOCALES_BLURB): added missing
whitespace.
* app/widgets/gimphelp.c: use the user's locale if "help-locales"
is NULL or the empty string.
* docs/gimprc.5.in
* etc/gimprc: regenerated.
2004-03-29 Michael Natterer <mitch@gimp.org>
* app/core/core-enums.[ch] (enum GimpUndoType): added new group
@ -17,7 +31,7 @@
* plug-ins/ifscompose/ifscompose.c: applied patch from David Necas
that updates the sensitivity of the Delete button and menu entry.
Fixes bug 138212#.
Fixes bug #138212.
2004-03-28 Sven Neumann <sven@gimp.org>

2
app/config/gimpguiconfig.c
View File

@ -221,7 +221,7 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
0);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_HELP_LOCALES,
"help-locales", HELP_LOCALES_BLURB,
NULL,
"",
0);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_HELP_BROWSER,
"help-browser", HELP_BROWSER_BLURB,

2
app/config/gimprc-blurbs.h
View File

@ -143,7 +143,7 @@ N_("When enabled, the selected pattern will be used for all tools.")
N_("Sets the browser used by the help system.")
#define HELP_LOCALES_BLURB \
"Specifies the language preferences used by the help system. This is a" \
"Specifies the language preferences used by the help system. This is a " \
"colon-separated list of language identifiers with decreasing priority. " \
"If empty, the language is taken from the user's locale setting."

6
app/widgets/gimphelp.c
View File

@ -22,11 +22,7 @@
#include "config.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <string.h>
#include "sys/types.h"
#include <gtk/gtk.h>
@ -98,7 +94,7 @@ gimp_help (Gimp *gimp,
if (help_domain && strlen (help_domain))
idle_help->help_domain = g_strdup (help_domain);
if (config->help_locales)
if (config->help_locales && strlen (config->help_locales))
idle_help->help_locales = g_strdup (config->help_locales);
else
idle_help->help_locales = gimp_get_default_language ();

5
docs/gimprc.5.in
View File

@ -672,9 +672,10 @@ When enabled, pressing F1 will open the help browser. Possible values are yes
and no.
.TP
(help-locales "")
Specifies the language preferences used by the help system. This is
acolon-separated list of language identifiers with decreasing priority. If
Specifies the language preferences used by the help system. This is a
colon-separated list of language identifiers with decreasing priority. If
empty, the language is taken from the user's locale setting. This is a string
value.

6
etc/gimprc
View File

@ -524,12 +524,12 @@
#
# (use-help yes)
# Specifies the language preferences used by the help system. This is
# acolon-separated list of language identifiers with decreasing priority. If
# Specifies the language preferences used by the help system. This is a
# colon-separated list of language identifiers with decreasing priority. If
# empty, the language is taken from the user's locale setting. This is a
# string value.
#
#
# (help-locales "")
# Sets the browser used by the help system. Possible values are gimp and
# web-browser.