Commit 642a129e authored by Ari Pollak's avatar Ari Pollak

Imported Upstream version 2.6.5

parent 3cf24830
2009-02-15 Sven Neumann <sven@gimp.org>
* Made 2.6.5 release.
2009-02-13 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 571628 – Scaling image to 25% turn background from white to grey
* app/paint-funcs/scale-region.c (pixel_average2): fixed right-shift
for GRAYA pixels.
2009-02-12 Michael Natterer <mitch@gimp.org>
Merged from trunk:
* plug-ins/file-faxg3/Makefile.am
* plug-ins/help/Makefile.am
* plug-ins/metadata/Makefile.am: add $(libgimpconfig) to LDADD
where it was missing. Libgimp pulls in libgimpconfig and these
plug-ins were linking against the installed libgimpconfig under
some #$&%*#%&%$& .la file circumstances.
2009-02-12 Michael Natterer <mitch@gimp.org>
Merged from trunk:
Bug 567840 – GIMP's GtkScaleButton conflicts with GTK's
* app/widgets/gtkscalebutton.c: rename the type to
"GimpGtkScaleButton" so we don't crash if the real
GtkScaleButton type is registered too.
2009-01-29 Sven Neumann <sven@gimp.org>
Merged from trunk:
* app/core/gimpchannel-combine.c (gimp_channel_combine_ellipse_rect):
fixed incorrect optimization that caused glitches in the rounded
corners on the left side of rectangular selections.
2009-01-28 Sven Neumann <sven@gimp.org>
* app/tools/gimpgegltool.c (gimp_param_spec_duplicate): if
compiling for GEGL >= 0.0.23, use double parameters with
gegl_color_get_rgba().
2009-01-26 Michael Natterer <mitch@gimp.org>
Merged from trunk:
* libgimpwidgets/gimpbutton.c (gimp_button_clicked): chain up if a
parent impl exists to be safe against future gtk versions doing
something in GtkButton::clicked() (as happened in GTK+ trunk).
2009-01-25 Sven Neumann <sven@gimp.org>
Bug 569043 – GEGL tool - missing Operation Settings for all sub-tools
Merged from trunk:
* app/tools/gimpgegltool.c (gimp_gegl_tool_get_config):
(gimp_gegl_tool_get_config): canonicalize the type name of the
created config class.
2009-01-24 Michael Natterer <mitch@gimp.org>
Merged from trunk:
Bug 568890 – don't rely on GtkAction implementation details
* app/widgets/gimpuimanager.c (gimp_ui_manager_menu_item_select):
use gtk_widget_get_action() instead of g_object_get_data(),
which relies on the name of the data key.
2009-01-23 Kevin Cozens <kcozens@cvs.gimp.org>
Bug 568909 – wrong RGB values for color names in
libgimpcolor/gimprgb-parse.c
Merged from trunk:
* libgimpcolor/gimprgb-parse.c: applied patch from Andreas Turtschan
to fix more RGB colour values.
2009-01-23 Kevin Cozens <kcozens@cvs.gimp.org>
Bug 568839 – wrong hex RGB value for the color names slategrey and
slategray
Merged from trunk:
* libgimpcolor/gimprgb-parse.c: applied patch from Andreas Turtschan
to fix colour values for slategray and slategrey.
2009-01-22 Tor Lillqvist <tml@iki.fi>
Bug 559408 - Brushes dragged to the image window look strange
* app/widgets/gimppixbuf.c (gimp_pixbuf_format_compare): Drop
Windows-specific code to prefer BMP. The BMP format written by
gdk-pixbuf doesn't support alpha. PNG is better. Note that the
same bug report also takes up a different problem.
2009-01-18 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
Bug 563337 – Rectangle Select Tool does not allow 1:1 fixed ratio
* libgimpwidgets/gimpnumberpairentry.c: When testing if the value
changed on focus-out we shall test against the current values, not
the default values.
2009-01-17 Sven Neumann <sven@gimp.org>
Merged from trunk:
Bug 568016 – Black pullout parameter of plug-in-newsprint has
no effect
* plug-ins/common/newsprint.c: fixed the documentation of the
colorspace parameter.
2009-01-13 Sven Neumann <sven@gimp.org>
* INSTALL
* autogen.sh
* configure.in: looks like we need intltool >= 0.36.3 (and we
recommend using an even newer version).
2009-01-04 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
Bug 562818 – First image opened in GIMP offset
* app/display/gimpdisplayshell.c (gimp_display_shell_shrink_wrap):
Only rely on disp_width/height for border calculation if they are
larger than 1. If not, special-case the calculation so we don't
get a severly mispositioned image.
2009-01-04 Martin Nordholts <martinn@svn.gnome.org>
Merged from trunk:
Bug 562213 – Align Tool doesn't work properly if it is the active
tool at startup
* app/tools/gimpaligntool.c: Perform NULL-pointer dodging to avoid
crashing.
2009-01-01 Sven Neumann <sven@gimp.org>
* configure.in: bumped version to 2.6.5 (interface age 5).
2009-01-01 Sven Neumann <sven@gimp.org>
* Made 2.6.4 release.
......
......@@ -30,7 +30,7 @@ header files installed.
1. You need to have installed a recent version of pkg-config available
from http://www.freedesktop.org/software/pkgconfig/.
2. You need intltool (at least 0.35.5, but preferably a newer version).
2. You need intltool (at least 0.36.3, but preferably a newer version).
Intltool can be downloaded from
http://ftp.gnome.org/pub/gnome/sources/intltool/
......
......@@ -7,6 +7,39 @@ This is the stable branch of GIMP. No new features are being added
here, just bug-fixes.
Overview of Changes from GIMP 2.6.4 to GIMP 2.6.5
=================================================
* Bugs fixed:
571628 – Scaling image to 25% turn background from white to grey
567840 – GIMP's GtkScaleButton conflicts with GTK's
569043 – GEGL tool - missing Operation Settings for all sub-tools
568890 – don't rely on GtkAction implementation details
568909 – wrong RGB values for color names in libgimpcolor/gimprgb-parse.c
568839 – wrong hex RGB value for the color names slategrey and slategray
559408 - Brushes dragged to the image window look strange
563337 – Rectangle Select Tool does not allow 1:1 fixed ratio
568016 – Black pullout parameter of plug-in-newsprint has no effect
562818 – First image opened in GIMP offset
562213 – Align Tool doesn't work properly if it is the active tool
at startup
* Updated translations:
Spanish (es)
Estonian (et)
Hindi (hi)
Italian (it)
Brazilian Portuguese (pt_BR)
Romanian (ro)
Russian (ru)
Serbian (sr)
Tamil (ta)
Simplified Chinese (zh_CN)
Overview of Changes from GIMP 2.6.3 to GIMP 2.6.4
=================================================
......
......@@ -394,16 +394,17 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
xj = ABS (cur_x + 0.5 - ellipse_center_x);
if (yi < b)
xdist = xj - a * sqrt (1 - yi * yi / b_sqr);
xdist = xj - a * sqrt (1 - SQR (yi) / b_sqr);
else
xdist = 100.0; /* anything large will work */
xdist = 1000.0; /* anything large will work */
if (xj < a)
ydist = yi - b * sqrt (1 - xj * xj / a_sqr);
ydist = yi - b * sqrt (1 - SQR (xj) / a_sqr);
else
ydist = 100.0; /* anything large will work */
ydist = 1000.0; /* anything large will work */
r = hypot (xdist, ydist);
if (r < 0.001)
dist = 0.;
else
......@@ -430,19 +431,21 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
{
x_start = cur_x;
last_val = val;
}
/* because we are symetric accross the y axis we can
* skip ahead a bit if we are inside. Do this if we
* have reached a value of 255 OR if we have passed
* the center of the leftmost ellipse.
*/
if ((val == 255 || cur_x >= x + a) && cur_x < x + w / 2)
{
x_start = cur_x;
last_val = val = 255;
/* because we are symetric accross the y axis we can
* skip ahead a bit if we are inside. Do this if we
* have reached a value of 255 OR if we have passed
* the center of the leftmost ellipse.
*/
if ((val == 255 || cur_x >= x + a) && cur_x < x + w / 2)
{
last_val = val = 255;
cur_x = (ellipse_center_x +
(ellipse_center_x - cur_x) - 1 +
floor (straight_width));
}
cur_x = (ellipse_center_x +
(ellipse_center_x - cur_x) - 1 +
floor (straight_width));
}
/* Time to change center? */
......@@ -450,7 +453,6 @@ gimp_channel_combine_ellipse_rect (GimpChannel *mask,
{
ellipse_center_x = x + a + straight_width;
}
}
gimp_channel_combine_segment (mask, op, x_start,
......
......@@ -1860,8 +1860,25 @@ gimp_display_shell_shrink_wrap (GimpDisplayShell *shell,
disp_width = shell->disp_width;
disp_height = shell->disp_height;
border_x = widget->allocation.width - disp_width;
border_y = widget->allocation.height - disp_height;
/* As long as the disp_width/disp_heightheight is larger than 1 we
* can reliably depend on it to calculate the
* border_width/border_height because that means there is enough
* room in the top-level for the canvas as well as the rulers and
* scrollbars. If it is 1 or smaller it is likely that the rulers
* and scrollbars are overlapping each other and thus we cannot use
* the normal approach to border size, so special case that.
*/
if (disp_width > 1 || !shell->vsb)
border_x = widget->allocation.width - disp_width;
else
border_x = widget->allocation.width - disp_width + shell->vsb->allocation.width;
if (disp_height > 1 || !shell->hsb)
border_y = widget->allocation.height - disp_height;
else
border_y = widget->allocation.height - disp_height + shell->hsb->allocation.height;
max_auto_width = (rect.width - border_x) * 0.75;
max_auto_height = (rect.height - border_y) * 0.75;
......
......@@ -856,7 +856,7 @@ pixel_average2 (const guchar *p1,
break;
case 510: /* all opaque */
p[0] = (p1[0] + p2[0] + 1) >> 2;
p[0] = (p1[0] + p2[0] + 1) >> 1;
p[1] = 255;
break;
......
......@@ -199,12 +199,19 @@ gimp_align_tool_constructor (GType type,
align_tool = GIMP_ALIGN_TOOL (object);
options = G_OBJECT (gimp_tool_get_options (tool));
/* This line of code is evil because it relies on that the 'options'
* object is fully constructed before we get here, which is not
* guaranteed
*/
container = GTK_CONTAINER (g_object_get_data (options,
"controls-container"));
align_tool->controls = gimp_align_tool_controls (align_tool);
gtk_container_add (container, align_tool->controls);
gtk_widget_show (align_tool->controls);
if (container)
{
align_tool->controls = gimp_align_tool_controls (align_tool);
gtk_container_add (container, align_tool->controls);
gtk_widget_show (align_tool->controls);
}
return object;
}
......@@ -427,8 +434,13 @@ gimp_align_tool_button_release (GimpTool *tool,
}
for (i = 0; i < ALIGN_TOOL_NUM_BUTTONS; i++)
gtk_widget_set_sensitive (align_tool->button[i],
(align_tool->selected_objects != NULL));
{
if (align_tool->button[i])
{
gtk_widget_set_sensitive (align_tool->button[i],
(align_tool->selected_objects != NULL));
}
}
align_tool->x1 = align_tool->x0;
align_tool->y1 = align_tool->y0;
......
......@@ -557,10 +557,19 @@ gimp_param_spec_duplicate (GParamSpec *pspec)
{
GeglColor *gegl_color;
GimpRGB gimp_color;
#if (GEGL_MAJOR_VERSION > 0 || \
(GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION > 0) || \
(GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 0 && GEGL_MICRO_VERSION >= 23))
gdouble r = 0.0;
gdouble g = 0.0;
gdouble b = 0.0;
gdouble a = 1.0;
#else
gfloat r = 0.0;
gfloat g = 0.0;
gfloat b = 0.0;
gfloat a = 1.0;
#endif
GValue value = { 0, };
g_value_init (&value, GEGL_TYPE_COLOR);
......@@ -743,6 +752,8 @@ gimp_gegl_tool_get_config (GimpGeglTool *tool)
gchar *type_name = g_strdup_printf ("GimpGeglTool-%s-config",
tool->operation);
g_strcanon (type_name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-');
config_type = g_type_register_static (GIMP_TYPE_OBJECT, type_name,
&info, 0);
......
......@@ -126,15 +126,6 @@ gimp_pixbuf_format_compare (GdkPixbufFormat *a,
gchar *b_name = gdk_pixbuf_format_get_name (b);
gint retval = 0;
#ifdef GDK_WINDOWING_WIN32
/* move BMP to the front of the list */
if (strcmp (a_name, "bmp") == 0)
retval = -1;
else if (strcmp (b_name, "bmp") == 0)
retval = 1;
else
#endif
/* move PNG to the front of the list */
if (strcmp (a_name, "png") == 0)
retval = -1;
......
......@@ -909,7 +909,7 @@ static void
gimp_ui_manager_menu_item_select (GtkWidget *widget,
GimpUIManager *manager)
{
GtkAction *action = g_object_get_data (G_OBJECT (widget), "gtk-action");
GtkAction *action = gtk_widget_get_action (widget);
if (action)
{
......
......@@ -159,7 +159,38 @@ static GtkWidget *gtk_scale_button_scale_box_new(GtkScaleButton *button);
static guint signals[LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE (GtkScaleButton, gimp_gtk_scale_button, GTK_TYPE_BUTTON)
static void gimp_gtk_scale_button_class_init (GtkScaleButtonClass *klass);
static void gimp_gtk_scale_button_init (GtkScaleButton *button);
static gpointer gimp_gtk_scale_button_parent_class = NULL;
GType
gimp_gtk_scale_button_get_type (void)
{
static GType type = 0;
if (! type)
{
const GTypeInfo info =
{
sizeof (GtkScaleButtonClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gimp_gtk_scale_button_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GtkScaleButton),
0, /* n_preallocs */
(GInstanceInitFunc) gimp_gtk_scale_button_init,
};
type = g_type_register_static (GTK_TYPE_BUTTON,
"GimpGtkScaleButton",
&info, 0);
}
return type;
}
static guint
gimp_gtk_binding_signal_new (const gchar *signal_name,
......@@ -197,6 +228,8 @@ gimp_gtk_scale_button_class_init (GtkScaleButtonClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GtkBindingSet *binding_set;
gimp_gtk_scale_button_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (GtkScaleButtonPrivate));
gobject_class->constructor = gtk_scale_button_constructor;
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for GIMP 2.6.4.
# Generated by GNU Autoconf 2.61 for GIMP 2.6.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP>.
#
......@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GIMP'
PACKAGE_TARNAME='gimp'
PACKAGE_VERSION='2.6.4'
PACKAGE_STRING='GIMP 2.6.4'
PACKAGE_VERSION='2.6.5'
PACKAGE_STRING='GIMP 2.6.5'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP'
ac_unique_file="app/core/gimp.c"
......@@ -1708,7 +1708,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures GIMP 2.6.4 to adapt to many kinds of systems.
\`configure' configures GIMP 2.6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1782,7 +1782,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GIMP 2.6.4:";;
short | recursive ) echo "Configuration of GIMP 2.6.5:";;
esac
cat <<\_ACEOF
......@@ -2001,7 +2001,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GIMP configure 2.6.4
GIMP configure 2.6.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -2015,7 +2015,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by GIMP $as_me 2.6.4, which was
It was created by GIMP $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -2708,7 +2708,7 @@ fi
# Define the identity of the package.
PACKAGE='gimp'
VERSION='2.6.4'
VERSION='2.6.5'
# Some tools Automake needs.
......@@ -2850,11 +2850,11 @@ ac_config_headers="$ac_config_headers config.h"
GIMP_MAJOR_VERSION=2
GIMP_MINOR_VERSION=6
GIMP_MICRO_VERSION=4
GIMP_INTERFACE_AGE=4
GIMP_BINARY_AGE=604
GIMP_VERSION=2.6.4
GIMP_REAL_VERSION=2.6.4
GIMP_MICRO_VERSION=5
GIMP_INTERFACE_AGE=5
GIMP_BINARY_AGE=605
GIMP_VERSION=2.6.5
GIMP_REAL_VERSION=2.6.5
GIMP_API_VERSION=2.0
GIMP_APP_VERSION=2.6
GIMP_PLUGIN_VERSION=2.0
......@@ -2914,7 +2914,7 @@ fi
LT_VERSION_INFO="600:4:600"
LT_VERSION_INFO="600:5:600"
LT_CURRENT_MINUS_AGE=0
......@@ -23756,19 +23756,19 @@ echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
;;
esac
if test -n "0.35.5"; then
{ echo "$as_me:$LINENO: checking for intltool >= 0.35.5" >&5
echo $ECHO_N "checking for intltool >= 0.35.5... $ECHO_C" >&6; }
if test -n "0.36.3"; then
{ echo "$as_me:$LINENO: checking for intltool >= 0.36.3" >&5
echo $ECHO_N "checking for intltool >= 0.36.3... $ECHO_C" >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.5 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.36.3 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
{ echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.5 or later." >&5
echo "$as_me: error: Your intltool is too old. You need intltool 0.35.5 or later." >&2;}
{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.36.3 or later." >&5
echo "$as_me: error: Your intltool is too old. You need intltool 0.36.3 or later." >&2;}
{ (exit 1); exit 1; }; }
fi
......@@ -37596,7 +37596,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by GIMP $as_me 2.6.4, which was
This file was extended by GIMP $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -37649,7 +37649,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
GIMP config.status 2.6.4
GIMP config.status 2.6.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......@@ -37758,8 +37758,8 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
gimp_major_ver=2
gimp_minor_ver=6
gimp_micro_ver=4
gimp_ver=2.6.4
gimp_micro_ver=5
gimp_ver=2.6.5
gimp_api_ver=2.0
......@@ -8,11 +8,11 @@ AC_PREREQ(2.54)
m4_define([gimp_major_version], [2])
m4_define([gimp_minor_version], [6])
m4_define([gimp_micro_version], [4])
m4_define([gimp_micro_version], [5])
m4_define([gimp_real_version],
[gimp_major_version.gimp_minor_version.gimp_micro_version])
m4_define([gimp_version], [gimp_real_version])
m4_define([gimp_interface_age], [4])
m4_define([gimp_interface_age], [5])
m4_define([gimp_binary_age],
[m4_eval(100 * gimp_minor_version + gimp_micro_version)])
......@@ -410,7 +410,7 @@ fi
# Internationalisation
######################
IT_PROG_INTLTOOL(0.35.5)
IT_PROG_INTLTOOL(0.36.3)
AM_GLIB_GNU_GETTEXT
......
This diff is collapsed.
......@@ -21,7 +21,7 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GIMP Base Library Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
for GIMP 2.6.4
for GIMP 2.6.5
</p></div>
</div>
......
......@@ -135,9 +135,7 @@ href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>domain</code></em> :</span></p></td>
<td> a constant string that identifies a translation domain or <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a>
<td> a constant string that identifies a translation domain or <code class="literal">NULL</code>
</td>
</tr>
</tbody>
......@@ -174,9 +172,7 @@ href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td> the translation domain associated with <em class="parameter"><code>type</code></em>
or <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a> if no domain was set
or <code class="literal">NULL</code> if no domain was set
</td>
</tr>
......@@ -210,9 +206,7 @@ href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>descriptions</code></em> :</span></p></td>
<td> a <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a> terminated constant static array of <a class="link" href="libgimpbase-gimpbasetypes.html#GimpEnumDesc" title="GimpEnumDesc"><span class="type">GimpEnumDesc</span></a>
<td> a <code class="literal">NULL</code> terminated constant static array of <a class="link" href="libgimpbase-gimpbasetypes.html#GimpEnumDesc" title="GimpEnumDesc"><span class="type">GimpEnumDesc</span></a>
</td>
</tr>
</tbody>
......@@ -244,9 +238,7 @@ href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td> a <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a> terminated constant array of <a class="link" href="libgimpbase-gimpbasetypes.html#GimpEnumDesc" title="GimpEnumDesc"><span class="type">GimpEnumDesc</span></a>
<td> a <code class="literal">NULL</code> terminated constant array of <a class="link" href="libgimpbase-gimpbasetypes.html#GimpEnumDesc" title="GimpEnumDesc"><span class="type">GimpEnumDesc</span></a>
</td>
</tr>
......@@ -279,9 +271,7 @@ href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td> a <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a> terminated constant array of <a class="link" href="libgimpbase-gimpbasetypes.html#GimpFlagsDesc" title="GimpFlagsDesc"><span class="type">GimpFlagsDesc</span></a>
<td> a <code class="literal">NULL</code> terminated constant array of <a class="link" href="libgimpbase-gimpbasetypes.html#GimpFlagsDesc" title="GimpFlagsDesc"><span class="type">GimpFlagsDesc</span></a>
</td>
</tr>
......@@ -315,9 +305,7 @@ href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>descriptions</code></em> :</span></p></td>
<td> a <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a> terminated constant static array of <a class="link" href="libgimpbase-gimpbasetypes.html#GimpFlagsDesc" title="GimpFlagsDesc"><span class="type">GimpFlagsDesc</span></a>
<td> a <code class="literal">NULL</code> terminated constant static array of <a class="link" href="libgimpbase-gimpbasetypes.html#GimpFlagsDesc" title="GimpFlagsDesc"><span class="type">GimpFlagsDesc</span></a>
</td>
</tr>
</tbody>
......
......@@ -127,9 +127,7 @@ runs). Calling it again will cause a fatal error.</p>
<col align="left" valign="top">
<tbody><tr>
<td><p><span class="term"><em class="parameter"><code>plug_in</code></em> :</span></p></td>
<td> must be <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
><code class="literal">TRUE</code></a> if this function is called from a plug-in
<td> must be <code class="literal">TRUE</code> if this function is called from a plug-in
</td>
</tr></tbody>
</table></div>
......@@ -325,9 +323,7 @@ href="/usr/share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html#g-g
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
<td> The path to the specified user directory, or <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a> if the
<td> The path to the specified user directory, or <code class="literal">NULL</code> if the
logical ID was not found.
</td>
......@@ -427,9 +423,7 @@ href="/usr/share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html#GList"
<tbody>
<tr>
<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td>
<td> A list of directories separated by <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#G-SEARCHPATH-SEPARATOR:CAPS"
><span class="type">G_SEARCHPATH_SEPARATOR</span></a>.
<td> A list of directories separated by <span class="type">G_SEARCHPATH_SEPARATOR</span>.
</td>
</tr>
<tr>
......@@ -439,9 +433,7 @@ href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#G-SEARCHPATH-SEPARA
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>check</code></em> :</span></p></td>
<td> <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
><code class="literal">TRUE</code></a> if you want the directories to be checked.