Commit bf12a078 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

always build gimpconfig-dump.

2003-01-11  Sven Neumann  <sven@gimp.org>

	* app/config/Makefile.am: always build gimpconfig-dump.

	* app/config/gimpconfig-params.[ch]: added an enum to specify the
	type of path with GIMP_PARAM_SPEC_PATH.

	* app/config/gimpconfig-dump.c: document the different types of
	paths differently.

	* app/config/gimpbaseconfig.c
	* app/config/gimpcoreconfig.c
	* app/config/gimpguiconfig.c
	* app/config/gimppluginconfig.c: register the path types.

	* etc/gimprc: generated a new system gimprc.

	* plug-ins/common/tiff.c: added missing spaces in warning and
	removed trailing newlines in strings passed to g_message().
parent 72bcaa38
2003-01-11 Sven Neumann <sven@gimp.org>
* app/config/Makefile.am: always build gimpconfig-dump.
* app/config/gimpconfig-params.[ch]: added an enum to specify the
type of path with GIMP_PARAM_SPEC_PATH.
* app/config/gimpconfig-dump.c: document the different types of
paths differently.
* app/config/gimpbaseconfig.c
* app/config/gimpcoreconfig.c
* app/config/gimpguiconfig.c
* app/config/gimppluginconfig.c: register the path types.
* etc/gimprc: generated a new system gimprc.
* plug-ins/common/tiff.c: added missing spaces in warning and
removed trailing newlines in strings passed to g_message().
2003-01-10 Maurits Rijk <lpeek.mrijk@consunet.nl>
 
* plug-ins/common/tiff.c (load_image): fix compilation error and
......
......@@ -58,15 +58,22 @@ gimpconfig_libs = \
#
# extra programs, not to be built by default and never installed
# GimpConfig dump utility that generates a system gimprc and the manpage
#
EXTRA_PROGRAMS = gimpconfig-dump test-config
noinst_PROGRAMS = gimpconfig-dump
gimpconfig_dump_SOURCES = gimpconfig-dump.c
gimpconfig_dump_LDADD = $(GLIB_LIBS) $(gimpconfig_libs)
#
# unit tests for the GimpConfig system
#
EXTRA_PROGRAMS = test-config
TESTS = test-config
test_config_DEPENDENCIES = $(gimpconfig_dependencies)
......
......@@ -102,10 +102,12 @@ gimp_base_config_class_init (GimpBaseConfigClass *klass)
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_TEMP_PATH,
"temp-path", TEMP_PATH_BLURB,
GIMP_PARAM_PATH_DIR,
"${gimp_dir}" G_DIR_SEPARATOR_S "tmp",
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_SWAP_PATH,
"swap-path", SWAP_PATH_BLURB,
GIMP_PARAM_PATH_DIR,
"${gimp_dir}",
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_STINGY_MEMORY_USE,
......
......@@ -127,10 +127,10 @@ dump_system_gimprc (void)
"# By default everything in this file is commented out. The file then\n"
"# documents the default values and shows what changes are possible.\n"
"\n"
"# The variable gimp_dir is set to either the internal value\n"
"# @gimpdir@ or the environment variable GIMP_DIRECTORY. If\n"
"# the path in GIMP_DIRECTORY is relative, it is considered\n"
"# relative to your home directory.\n"
"# The variable ${gimp_dir} is set to the value of the environment\n"
"# variable GIMP_DIRECTORY or, if that is not set, the compiled-in\n"
"# default value is used. If GIMP_DIRECTORY is not an absolute path,\n"
"# it is interpreted relative to your home directory.\n"
"\n");
write (1, str->str, str->len);
......@@ -208,15 +208,44 @@ dump_get_comment (GParamSpec *param_spec)
}
else if (g_type_is_a (type, GIMP_TYPE_PATH))
{
switch (G_SEARCHPATH_SEPARATOR)
switch (gimp_param_spec_path_type (param_spec))
{
case ':':
values = "This is a colon-separated list of directories to search.";
case GIMP_PARAM_PATH_FILE:
values = "This is a single filename.";
break;
case ';':
values = "This is a semicolon-separated list of directories to search.";
case GIMP_PARAM_PATH_FILE_LIST:
switch (G_SEARCHPATH_SEPARATOR)
{
case ':':
values = "This is a colon-separated list of files.";
break;
case ';':
values = "This is a semicolon-separated list of files.";
break;
default:
g_warning ("unhandled G_SEARCHPATH_SEPARATOR value");
break;
}
break;
default:
case GIMP_PARAM_PATH_DIR:
values = "This is a single folder.";
break;
case GIMP_PARAM_PATH_DIR_LIST:
switch (G_SEARCHPATH_SEPARATOR)
{
case ':':
values = "This is a colon-separated list of folders to search.";
break;
case ';':
values = "This is a semicolon-separated list of folders to search.";
break;
default:
g_warning ("unhandled G_SEARCHPATH_SEPARATOR value");
break;
}
break;
}
}
......
......@@ -30,6 +30,10 @@
#include "gimpconfig-types.h"
/*
* GIMP_TYPE_PARAM_COLOR
*/
#define GIMP_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_COLOR, GimpParamSpecColor))
static void gimp_param_color_class_init (GParamSpecClass *class);
......@@ -184,6 +188,10 @@ gimp_param_spec_color (const gchar *name,
}
/*
* GIMP_TYPE_PARAM_MEMSIZE
*/
static void gimp_param_memsize_class_init (GParamSpecClass *class);
GType
......@@ -239,6 +247,21 @@ gimp_param_spec_memsize (const gchar *name,
}
/*
* GIMP_TYPE_PARAM_PATH
*/
#define GIMP_PARAM_SPEC_PATH(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), GIMP_TYPE_PARAM_PATH, GimpParamSpecPath))
typedef struct _GimpParamSpecPath GimpParamSpecPath;
struct _GimpParamSpecPath
{
GParamSpecString parent_instance;
GimpParamPathType type;
};
static void gimp_param_path_class_init (GParamSpecClass *class);
GType
......@@ -254,7 +277,7 @@ gimp_param_path_get_type (void)
NULL, NULL,
(GClassInitFunc) gimp_param_path_class_init,
NULL, NULL,
sizeof (GParamSpecString),
sizeof (GimpParamSpecPath),
0, NULL, NULL
};
......@@ -273,22 +296,38 @@ gimp_param_path_class_init (GParamSpecClass *class)
}
GParamSpec *
gimp_param_spec_path (const gchar *name,
const gchar *nick,
const gchar *blurb,
gchar *default_value,
GParamFlags flags)
gimp_param_spec_path (const gchar *name,
const gchar *nick,
const gchar *blurb,
GimpParamPathType type,
gchar *default_value,
GParamFlags flags)
{
GParamSpecString *pspec;
pspec = g_param_spec_internal (GIMP_TYPE_PARAM_PATH,
name, nick, blurb, flags);
pspec->default_value = default_value;
pspec->default_value = default_value;
GIMP_PARAM_SPEC_PATH (pspec)->type = type;
return G_PARAM_SPEC (pspec);
}
GimpParamPathType
gimp_param_spec_path_type (GParamSpec *pspec)
{
g_return_val_if_fail (GIMP_IS_PARAM_SPEC_PATH (pspec), 0);
return GIMP_PARAM_SPEC_PATH (pspec)->type;
}
/*
* GIMP_TYPE_PARAM_UNIT
*/
static void gimp_param_unit_class_init (GParamSpecClass *class);
static gboolean gimp_param_unit_value_validate (GParamSpec *pspec,
......
......@@ -33,6 +33,10 @@
GIMP_PARAM_SERIALIZE)
/*
* GIMP_TYPE_PARAM_COLOR
*/
#define GIMP_TYPE_PARAM_COLOR (gimp_param_color_get_type ())
#define GIMP_IS_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_COLOR))
......@@ -45,6 +49,10 @@ GParamSpec * gimp_param_spec_color (const gchar *name,
GParamFlags flags);
/*
* GIMP_TYPE_PARAM_MEMSIZE
*/
#define GIMP_TYPE_PARAM_MEMSIZE (gimp_param_memsize_get_type ())
#define GIMP_IS_PARAM_SPEC_MEMSIZE(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_MEMSIZE))
......@@ -59,17 +67,36 @@ GParamSpec * gimp_param_spec_memsize (const gchar *name,
GParamFlags flags);
/*
* GIMP_TYPE_PARAM_PATH
*/
typedef enum
{
GIMP_PARAM_PATH_FILE,
GIMP_PARAM_PATH_FILE_LIST,
GIMP_PARAM_PATH_DIR,
GIMP_PARAM_PATH_DIR_LIST
} GimpParamPathType;
#define GIMP_TYPE_PARAM_PATH (gimp_param_path_get_type ())
#define GIMP_IS_PARAM_SPEC_PATH(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_PATH))
GType gimp_param_path_get_type (void) G_GNUC_CONST;
GParamSpec * gimp_param_spec_path (const gchar *name,
const gchar *nick,
const gchar *blurb,
gchar *default_value,
GParamFlags flags);
GParamSpec * gimp_param_spec_path (const gchar *name,
const gchar *nick,
const gchar *blurb,
GimpParamPathType type,
gchar *default_value,
GParamFlags flags);
GimpParamPathType gimp_param_spec_path_type (GParamSpec *pspec);
/*
* GIMP_TYPE_PARAM_UNIT
*/
#define GIMP_TYPE_PARAM_UNIT (gimp_param_unit_get_type ())
#define GIMP_IS_PARAM_SPEC_UNIT(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_UNIT))
......@@ -129,10 +156,10 @@ GParamSpec * gimp_param_spec_unit (const gchar *name,
object_type,\
flags | GIMP_CONFIG_PARAM_FLAGS))
#define GIMP_CONFIG_INSTALL_PROP_PATH(class, id,\
name, blurb, default, flags)\
name, blurb, type, default, flags)\
g_object_class_install_property (class, id,\
gimp_param_spec_path (name, NULL, blurb,\
default,\
type, default,\
flags | GIMP_CONFIG_PARAM_FLAGS))
#define GIMP_CONFIG_INSTALL_PROP_STRING(class, id,\
name, blurb, default, flags)\
......
......@@ -132,34 +132,42 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
0);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PLUG_IN_PATH,
"plug-in-path", PLUG_IN_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_plug_in_path ("plug-ins"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_TOOL_PLUG_IN_PATH,
"tool-plug-in-path", TOOL_PLUG_IN_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_plug_in_path ("tool-plug-ins"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_MODULE_PATH,
"module-path", MODULE_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_plug_in_path ("modules"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_ENVIRON_PATH,
"environ-path", ENVIRON_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_plug_in_path ("environ"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_BRUSH_PATH,
"brush-path", BRUSH_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("brushes"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PATTERN_PATH,
"pattern-path", PATTERN_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("patterns"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_PALETTE_PATH,
"palette-path", PALETTE_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("palettes"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_GRADIENT_PATH,
"gradient-path", GRADIENT_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("gradients"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_DEFAULT_BRUSH,
......@@ -225,6 +233,7 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
GIMP_CONFIG_INSTALL_PROP_PATH (object_class,
PROP_PLUGINRC_PATH,
"pluginrc-path", PLUGINRC_PATH_BLURB,
GIMP_PARAM_PATH_FILE,
"${gimp_dir}" G_DIR_SEPARATOR_S "pluginrc",
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_MODULE_LOAD_INHIBIT,
......
......@@ -171,6 +171,7 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
0);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH,
"theme-path", THEME_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("themes"),
GIMP_PARAM_RESTART);
GIMP_CONFIG_INSTALL_PROP_STRING (object_class, PROP_THEME,
......
......@@ -104,28 +104,33 @@ gimp_plugin_config_class_init (GimpPluginConfigClass *klass)
PROP_FRACTALEXPLORER_PATH,
"fractalexplorer-path",
FRACTALEXPLORER_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("fractalexplorer"),
0);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class,
PROP_GFIG_PATH,
"gfig-path", GFIG_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("gfig"),
0);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class,
PROP_GFLARE_PATH,
"gflare-path", GFLARE_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("gflare"),
0);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class,
PROP_GIMPRESSIONIST_PATH,
"gimpressionist-path",
GIMPRESSIONIST_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("gimpressionist"),
0);
GIMP_CONFIG_INSTALL_PROP_PATH (object_class,
PROP_SCRIPT_FU_PATH,
"script-fu-path",
SCRIPT_FU_PATH_BLURB,
GIMP_PARAM_PATH_DIR_LIST,
gimp_config_build_data_path ("scripts"),
0);
}
......
......@@ -7,17 +7,16 @@
# By default everything in this file is commented out. The file then
# documents the default values and shows what changes are possible.
# The variable gimp_dir is set to either the internal value
# @gimpdir@ or the environment variable GIMP_DIRECTORY. If
# the path in GIMP_DIRECTORY is relative, it is considered
# relative to your home directory.
# 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,
# it is interpreted relative to your home directory.
# Set the temporary storage directory. Files will appear here during the
# course of running the gimp. Most files will disappear when the gimp exits,
# but some files are likely to remain, such as working palette files, so it is
# best if this directory not be one that is shared by other users or is
# cleared on machine reboot such as /tmp. This is a colon-separated list of
# directories to search.
# cleared on machine reboot such as /tmp. This is a single folder.
#
# (temp-path "${gimp_dir}/tmp")
......@@ -27,7 +26,7 @@
# gimp is used with large images. Also, things can get horribly slow if the
# swap file is created on a directory that is mounted over NFS. For these
# reasons, it may be desirable to put your swap file in "/tmp". This is a
# colon-separated list of directories to search.
# single folder.
#
# (swap-path "${gimp_dir}")
......@@ -59,41 +58,41 @@
#
# (interpolation-type linear)
# Set the plug-in search path. This is a colon-separated list of directories
# to search.
# Set the plug-in search path. This is a colon-separated list of folders to
# search.
#
# (plug-in-path "${gimp_dir}/plug-ins:${gimp_plug_in_dir}/plug-ins")
# tool-plug-in-path This is a colon-separated list of directories to search.
# tool-plug-in-path This is a colon-separated list of folders to search.
#
# (tool-plug-in-path "${gimp_dir}/tool-plug-ins:${gimp_plug_in_dir}/tool-plug-ins")
# Set the module search path. This is a colon-separated list of directories
# to search.
# Set the module search path. This is a colon-separated list of folders to
# search.
#
# (module-path "${gimp_dir}/modules:${gimp_plug_in_dir}/modules")
# environ-path This is a colon-separated list of directories to search.
# environ-path This is a colon-separated list of folders to search.
#
# (environ-path "${gimp_dir}/environ:${gimp_plug_in_dir}/environ")
# Set the brush search path. This is a colon-separated list of directories to
# Set the brush search path. This is a colon-separated list of folders to
# search.
#
# (brush-path "${gimp_dir}/brushes:${gimp_data_dir}/brushes")
# Set the pattern search path. This is a colon-separated list of directories
# to search.
# Set the pattern search path. This is a colon-separated list of folders to
# search.
#
# (pattern-path "${gimp_dir}/patterns:${gimp_data_dir}/patterns")
# Set the palette search path. This is a colon-separated list of directories
# to search.
# Set the palette search path. This is a colon-separated list of folders to
# search.
#
# (palette-path "${gimp_dir}/palettes:${gimp_data_dir}/palettes")
# Set the gradient search path. This is a colon-separated list of directories
# to search.
# Set the gradient search path. This is a colon-separated list of folders to
# search.
#
# (gradient-path "${gimp_dir}/gradients:${gimp_data_dir}/gradients")
......@@ -144,7 +143,7 @@
#
# (undo-levels 5)
# pluginrc-path This is a colon-separated list of directories to search.
# pluginrc-path This is a single filename.
#
# (pluginrc-path "${gimp_dir}/pluginrc")
......@@ -365,7 +364,7 @@
#
# (max-new-image-size 32M)
# theme-path This is a colon-separated list of directories to search.
# theme-path This is a colon-separated list of folders to search.
#
# (theme-path "${gimp_dir}/themes:${gimp_data_dir}/themes")
......@@ -378,27 +377,27 @@
# (help-browser gimp)
# Where to search for fractals used by the Fractal Explorer plug-in. This is
# a colon-separated list of directories to search.
# a colon-separated list of folders to search.
#
# (fractalexplorer-path "${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer")
# Where to search for GFig figures used by the GFig plug-in. This is a
# colon-separated list of directories to search.
# Where to search for Gfig figures used by the Gfig plug-in. This is a
# colon-separated list of folders to search.
#
# (gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig")
# Where to search for gflares used by the GFlare plug-in. This is a
# colon-separated list of directories to search.
# colon-separated list of folders to search.
#
# (gflare-path "${gimp_dir}/gflare:${gimp_data_dir}/gflare")
# Where to search for data used by the Gimpressionist plug-in. This is a
# colon-separated list of directories to search.
# colon-separated list of folders to search.
#
# (gimpressionist-path "${gimp_dir}/gimpressionist:${gimp_data_dir}/gimpressionist")
# This path will be searched for scripts when the Script-Fu plug-in is run.
# This is a colon-separated list of directories to search.
# This is a colon-separated list of folders to search.
#
# (script-fu-path "${gimp_dir}/scripts:${gimp_data_dir}/scripts")
......@@ -33,6 +33,10 @@
GIMP_PARAM_SERIALIZE)
/*
* GIMP_TYPE_PARAM_COLOR
*/
#define GIMP_TYPE_PARAM_COLOR (gimp_param_color_get_type ())
#define GIMP_IS_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_COLOR))
......@@ -45,6 +49,10 @@ GParamSpec * gimp_param_spec_color (const gchar *name,
GParamFlags flags);
/*
* GIMP_TYPE_PARAM_MEMSIZE
*/
#define GIMP_TYPE_PARAM_MEMSIZE (gimp_param_memsize_get_type ())
#define GIMP_IS_PARAM_SPEC_MEMSIZE(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_MEMSIZE))
......@@ -59,17 +67,36 @@ GParamSpec * gimp_param_spec_memsize (const gchar *name,
GParamFlags flags);
/*
* GIMP_TYPE_PARAM_PATH
*/
typedef enum
{
GIMP_PARAM_PATH_FILE,
GIMP_PARAM_PATH_FILE_LIST,
GIMP_PARAM_PATH_DIR,
GIMP_PARAM_PATH_DIR_LIST
} GimpParamPathType;
#define GIMP_TYPE_PARAM_PATH (gimp_param_path_get_type ())
#define GIMP_IS_PARAM_SPEC_PATH(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_PATH))
GType gimp_param_path_get_type (void) G_GNUC_CONST;
GParamSpec * gimp_param_spec_path (const gchar *name,
const gchar *nick,
const gchar *blurb,
gchar *default_value,
GParamFlags flags);
GParamSpec * gimp_param_spec_path (const gchar *name,
const gchar *nick,
const gchar *blurb,
GimpParamPathType type,
gchar *default_value,
GParamFlags flags);
GimpParamPathType gimp_param_spec_path_type (GParamSpec *pspec);
/*
* GIMP_TYPE_PARAM_UNIT
*/
#define GIMP_TYPE_PARAM_UNIT (gimp_param_unit_get_type ())
#define GIMP_IS_PARAM_SPEC_UNIT(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), GIMP_TYPE_PARAM_UNIT))
......@@ -129,10 +156,10 @@ GParamSpec * gimp_param_spec_unit (const gchar *name,
object_type,\
flags | GIMP_CONFIG_PARAM_FLAGS))
#define GIMP_CONFIG_INSTALL_PROP_PATH(class, id,\
name, blurb, default, flags)\
name, blurb, type, default, flags)\
g_object_class_install_property (class, id,\
gimp_param_spec_path (name, NULL, blurb,\
default,\
type, default,\
flags | GIMP_CONFIG_PARAM_FLAGS))
#define GIMP_CONFIG_INSTALL_PROP_STRING(class, id,\
name, blurb, default, flags)\
......
......@@ -442,12 +442,12 @@ load_image (gchar *filename)
tif = TIFFOpen (filename, "r");
if (!tif) {
g_message ("TIFF Can't open %s\n", filename);
g_message (_("TIFF: Can't open '%s'"), filename);
gimp_quit ();
}
if (run_mode == GIMP_RUN_INTERACTIVE) {
name = g_strdup_printf( _("Loading %s:"), filename);
name = g_strdup_printf( _("Loading '%s' ..."), filename);
gimp_progress_init (name);
g_free (name);
}
......@@ -464,17 +464,17 @@ load_image (gchar *filename)
extra = 0;
if (!TIFFGetField (tif, TIFFTAG_IMAGEWIDTH, &cols)) {
g_message ("TIFF Can't get image width\n");
g_message ("TIFF: Can't get image width");
gimp_quit ();
}
if (!TIFFGetField (tif, TIFFTAG_IMAGELENGTH, &rows)) {
g_message ("TIFF Can't get image length\n");
g_message ("TIFF: Can't get image length");
gimp_quit ();
}
if (!TIFFGetField (tif, TIFFTAG_PHOTOMETRIC, &photomet)) {
g_message("TIFF Can't get photometric\nAssuming min-is-black\n");