d6fd55064b
2007-04-25 Michael Natterer <mitch@gimp.org>
* app/core/gimpparamspecs.[ch] (struct GimpParamSpecString)
(gimp_param_spec_string): added "gboolean non_empty" to require
the string being non-empty. Changed validation accordingly.
Also fixed validation for static strings (we were happily
freeing and modifying them before).
* app/xcf/xcf.c: filenames should be non-empty.
* app/pdb/gimp-pdb-compat.c: compat strings shouldn't.
* tools/pdbgen/app.pl: add support for $arg->{non_empty} and
changed generation of calls to gimp_param_spec_string().
* tools/pdbgen/pdb/brush_select.pdb
* tools/pdbgen/pdb/edit.pdb
* tools/pdbgen/pdb/vectors.pdb
* tools/pdbgen/pdb/plug_in.pdb
* tools/pdbgen/pdb/gradient.pdb
* tools/pdbgen/pdb/palette_select.pdb
* tools/pdbgen/pdb/palette.pdb
* tools/pdbgen/pdb/fileops.pdb
* tools/pdbgen/pdb/progress.pdb
* tools/pdbgen/pdb/procedural_db.pdb
* tools/pdbgen/pdb/font_select.pdb
* tools/pdbgen/pdb/pattern_select.pdb
* tools/pdbgen/pdb/unit.pdb
* tools/pdbgen/pdb/brush.pdb
* tools/pdbgen/pdb/gradient_select.pdb
* tools/pdbgen/pdb/buffer.pdb: require non-empty strings for data
object names, procedure names, unit strings, PDB data identifiers
and buffer names. Removed some manual strlen() checks, all other
places just got better error reporting for free (proper validation
error instead of unspecific execution error).
* app/pdb/*_cmds.c: regenerated.
svn path=/trunk/; revision=22329
176 lines
6.8 KiB
C
176 lines
6.8 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/* NOTE: This file is auto-generated by pdbgen.pl. */
|
|
|
|
#include "config.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "pdb-types.h"
|
|
#include "gimppdb.h"
|
|
#include "gimpprocedure.h"
|
|
#include "core/gimpparamspecs.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "gimp-intl.h"
|
|
#include "plug-in/gimpplugin.h"
|
|
#include "plug-in/gimppluginmanager.h"
|
|
|
|
#include "internal_procs.h"
|
|
|
|
|
|
static GValueArray *
|
|
message_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
const gchar *message;
|
|
|
|
message = g_value_get_string (&args->values[0]);
|
|
|
|
if (success)
|
|
{
|
|
const gchar *domain = NULL;
|
|
|
|
if (gimp->plug_in_manager->current_plug_in)
|
|
domain = gimp_plug_in_get_undo_desc (gimp->plug_in_manager->current_plug_in);
|
|
gimp_show_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
|
|
domain, message);
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success);
|
|
}
|
|
|
|
static GValueArray *
|
|
message_get_handler_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
GValueArray *return_vals;
|
|
gint32 handler = 0;
|
|
|
|
handler = gimp->message_handler;
|
|
|
|
return_vals = gimp_procedure_get_return_values (procedure, TRUE);
|
|
g_value_set_enum (&return_vals->values[1], handler);
|
|
|
|
return return_vals;
|
|
}
|
|
|
|
static GValueArray *
|
|
message_set_handler_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
gint32 handler;
|
|
|
|
handler = g_value_get_enum (&args->values[0]);
|
|
|
|
if (success)
|
|
{
|
|
gimp->message_handler = handler;
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success);
|
|
}
|
|
|
|
void
|
|
register_message_procs (GimpPDB *pdb)
|
|
{
|
|
GimpProcedure *procedure;
|
|
|
|
/*
|
|
* gimp-message
|
|
*/
|
|
procedure = gimp_procedure_new (message_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-message");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-message",
|
|
"Displays a dialog box with a message.",
|
|
"Displays a dialog box with a message. Useful for status or error reporting. The message must be in UTF-8 encoding.",
|
|
"Manish Singh",
|
|
"Manish Singh",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("message",
|
|
"message",
|
|
"Message to display in the dialog",
|
|
FALSE, FALSE, FALSE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-message-get-handler
|
|
*/
|
|
procedure = gimp_procedure_new (message_get_handler_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-message-get-handler");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-message-get-handler",
|
|
"Returns the current state of where warning messages are displayed.",
|
|
"This procedure returns the way g_message warnings are displayed. They can be shown in a dialog box or printed on the console where gimp was started.",
|
|
"Manish Singh",
|
|
"Manish Singh",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_return_value (procedure,
|
|
g_param_spec_enum ("handler",
|
|
"handler",
|
|
"The current handler type",
|
|
GIMP_TYPE_MESSAGE_HANDLER_TYPE,
|
|
GIMP_MESSAGE_BOX,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-message-set-handler
|
|
*/
|
|
procedure = gimp_procedure_new (message_set_handler_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-message-set-handler");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-message-set-handler",
|
|
"Controls where warning messages are displayed.",
|
|
"This procedure controls how g_message warnings are displayed. They can be shown in a dialog box or printed on the console where gimp was started.",
|
|
"Manish Singh",
|
|
"Manish Singh",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
g_param_spec_enum ("handler",
|
|
"handler",
|
|
"The new handler type",
|
|
GIMP_TYPE_MESSAGE_HANDLER_TYPE,
|
|
GIMP_MESSAGE_BOX,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
}
|