Imported Upstream version 2.3.10

This commit is contained in:
Ari Pollak
2010-08-11 01:19:49 -04:00
parent 2a222e99d4
commit efbc58ed09
1387 changed files with 58385 additions and 100558 deletions

View File

@ -149,6 +149,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
AA = @AA@
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALL_LINGUAS = @ALL_LINGUAS@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
@ -220,11 +221,6 @@ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GIMPINSTALL = @GIMPINSTALL@
GIMPPRINT_CFLAGS = @GIMPPRINT_CFLAGS@
GIMPPRINT_CONFIG = @GIMPPRINT_CONFIG@
GIMPPRINT_LIBS = @GIMPPRINT_LIBS@
GIMPPRINT_REQUIRED_VERSION = @GIMPPRINT_REQUIRED_VERSION@
GIMPPRINT_TOONEW_VERSION = @GIMPPRINT_TOONEW_VERSION@
GIMP_API_VERSION = @GIMP_API_VERSION@
GIMP_APP_VERSION = @GIMP_APP_VERSION@
GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
@ -257,9 +253,6 @@ GMODULE_NO_EXPORT_CFLAGS = @GMODULE_NO_EXPORT_CFLAGS@
GMODULE_NO_EXPORT_LIBS = @GMODULE_NO_EXPORT_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMEPRINT = @GNOMEPRINT@
GNOMEPRINT_CFLAGS = @GNOMEPRINT_CFLAGS@
GNOMEPRINT_LIBS = @GNOMEPRINT_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
@ -277,8 +270,6 @@ HAVE_FINITE = @HAVE_FINITE@
HAVE_GLIBC_REGEX = @HAVE_GLIBC_REGEX@
HAVE_GLIBC_REGEX_FALSE = @HAVE_GLIBC_REGEX_FALSE@
HAVE_GLIBC_REGEX_TRUE = @HAVE_GLIBC_REGEX_TRUE@
HAVE_GNOMEPRINT_FALSE = @HAVE_GNOMEPRINT_FALSE@
HAVE_GNOMEPRINT_TRUE = @HAVE_GNOMEPRINT_TRUE@
HAVE_GNOMEVFS_FALSE = @HAVE_GNOMEVFS_FALSE@
HAVE_GNOMEVFS_TRUE = @HAVE_GNOMEVFS_TRUE@
HAVE_ISFINITE = @HAVE_ISFINITE@
@ -333,7 +324,6 @@ LDFLAGS = @LDFLAGS@
LIBAA = @LIBAA@
LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@
LIBGNOMEPRINT = @LIBGNOMEPRINT@
LIBJPEG = @LIBJPEG@
LIBMNG = @LIBMNG@
LIBOBJS = @LIBOBJS@
@ -433,7 +423,6 @@ USE_BINRELOC_TRUE = @USE_BINRELOC_TRUE@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WINDRES = @WINDRES@
WINPRINT = @WINPRINT@
WITH_PDBGEN_FALSE = @WITH_PDBGEN_FALSE@
WITH_PDBGEN_TRUE = @WITH_PDBGEN_TRUE@
WMF = @WMF@

View File

@ -64,7 +64,7 @@ static const GEnumValue enum_values[] =
static const GimpEnumDesc enum_descs[] =
{
{ COLORBLIND_DEFICIENCY_PROTANOPIA,
N_("Protanopia (insensitivity to red"), NULL },
N_("Protanopia (insensitivity to red)"), NULL },
{ COLORBLIND_DEFICIENCY_DEUTERANOPIA,
N_("Deuteranopia (insensitivity to green)"), NULL },
{ COLORBLIND_DEFICIENCY_TRITANOPIA,

View File

@ -35,33 +35,6 @@
#include "libgimp/libgimp-intl.h"
#define CDISPLAY_TYPE_PROOF_INTENT (cdisplay_proof_intent_type)
static GType cdisplay_proof_intent_get_type (GTypeModule *module);
static const GEnumValue enum_values[] =
{
{ INTENT_PERCEPTUAL,
"INTENT_PERCEPTUAL", "perceptual" },
{ INTENT_RELATIVE_COLORIMETRIC,
"INTENT_RELATIVE_COLORIMETRIC", "relative-colorimetric" },
{ INTENT_SATURATION,
"INTENT_SATURATION", "saturation" },
{ INTENT_ABSOLUTE_COLORIMETRIC,
"INTENT_ABSOLUTE_COLORIMETRIC" "absolute-colorimetric" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc enum_descs[] =
{
{ INTENT_PERCEPTUAL, N_("Perceptual"), NULL },
{ INTENT_RELATIVE_COLORIMETRIC, N_("Relative colorimetric"), NULL },
{ INTENT_SATURATION, N_("Saturation"), NULL },
{ INTENT_ABSOLUTE_COLORIMETRIC, N_("Absolute colorimetric"), NULL },
{ 0, NULL, NULL }
};
#define CDISPLAY_TYPE_PROOF (cdisplay_proof_type)
#define CDISPLAY_PROOF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CDISPLAY_TYPE_PROOF, CdisplayProof))
#define CDISPLAY_PROOF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CDISPLAY_TYPE_PROOF, CdisplayProofClass))
@ -133,9 +106,8 @@ static const GimpModuleInfo cdisplay_proof_info =
"November 14, 2003"
};
static GType cdisplay_proof_type = 0;
static GType cdisplay_proof_intent_type = 0;
static GimpColorDisplayClass *parent_class = NULL;
static GType cdisplay_proof_type = 0;
static GimpColorDisplayClass *parent_class = NULL;
G_MODULE_EXPORT const GimpModuleInfo *
@ -148,7 +120,6 @@ G_MODULE_EXPORT gboolean
gimp_module_register (GTypeModule *module)
{
cdisplay_proof_get_type (module);
cdisplay_proof_intent_get_type (module);
return TRUE;
}
@ -179,22 +150,6 @@ cdisplay_proof_get_type (GTypeModule *module)
return cdisplay_proof_type;
}
static GType
cdisplay_proof_intent_get_type (GTypeModule *module)
{
if (! cdisplay_proof_intent_type)
{
cdisplay_proof_intent_type =
g_type_module_register_enum (module, "CDisplayProofIntent",
enum_values);
gimp_enum_set_value_descriptions (cdisplay_proof_intent_type,
enum_descs);
}
return cdisplay_proof_intent_type;
}
static void
cdisplay_proof_class_init (CdisplayProofClass *klass)
{
@ -209,7 +164,8 @@ cdisplay_proof_class_init (CdisplayProofClass *klass)
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_INTENT,
"intent", NULL,
CDISPLAY_TYPE_PROOF_INTENT, INTENT_PERCEPTUAL,
GIMP_TYPE_COLOR_RENDERING_INTENT,
GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_BPC,
"black-point-compensation", NULL,

View File

@ -22,7 +22,7 @@
#include "config.h"
#define _BSD_SOURCE /* the ALSA headers need this */
#define _GNU_SOURCE /* the ALSA headers need this */
#include <errno.h>
#include <fcntl.h>
@ -380,13 +380,13 @@ midi_get_event_blurb (GimpController *controller,
if (! midi_events[event_id].blurb)
{
if (event_id <= 127)
midi_events[event_id].blurb = g_strdup_printf ("Note %02x on",
midi_events[event_id].blurb = g_strdup_printf (_("Note %02x on"),
event_id);
else if (event_id <= 255)
midi_events[event_id].blurb = g_strdup_printf ("Note %02x off",
midi_events[event_id].blurb = g_strdup_printf (_("Note %02x off"),
event_id - 128);
else if (event_id <= 383)
midi_events[event_id].blurb = g_strdup_printf ("Controller %03d",
midi_events[event_id].blurb = g_strdup_printf (_("Controller %03d"),
event_id - 256);
}