Commit 95ccd16f authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

forgot to commit this last weekend :)

2000-08-04  Michael Natterer  <mitch@gimp.org>
	    Sven Neumann  <sven@gimp.org>

	* libgimp/gimp.h
	* libgimp/gimpcompat.h
	* plug-ins/common/curve_bend.c
	* plug-ins/common/plugindetails.c
	* plug-ins/dbbrowser/dbbrowser_utils.c
	* plug-ins/gap/gap_dbbrowser_utils.c
	* plug-ins/gap/gap_filter_codegen.c
	* plug-ins/gap/gap_filter_pdb.c
	* plug-ins/gap/gap_pdb_calls.c
	* plug-ins/maze/maze_face.c
	* plug-ins/pygimp/gimpmodule.c
	* plug-ins/script-fu/script-fu-scripts.c
	* plug-ins/script-fu/script-fu.c
	* plug-ins/xjt/xpdb_calls.c: removed COMPAT_CRUFT
parent 64b27852
2000-08-04 Michael Natterer <mitch@gimp.org>
Sven Neumann <sven@gimp.org>
* libgimp/gimp.h
* libgimp/gimpcompat.h
* plug-ins/common/curve_bend.c
* plug-ins/common/plugindetails.c
* plug-ins/dbbrowser/dbbrowser_utils.c
* plug-ins/gap/gap_dbbrowser_utils.c
* plug-ins/gap/gap_filter_codegen.c
* plug-ins/gap/gap_filter_pdb.c
* plug-ins/gap/gap_pdb_calls.c
* plug-ins/maze/maze_face.c
* plug-ins/pygimp/gimpmodule.c
* plug-ins/script-fu/script-fu-scripts.c
* plug-ins/script-fu/script-fu.c
* plug-ins/xjt/xpdb_calls.c: removed COMPAT_CRUFT
2000-08-07 Sven Neumann <sven@gimp.org>
 
* plug-ins/gdyntext/gdyntext.[ch]
* lug-ins/gdyntext/gdyntext_ui.c: use a GimpColorButton to select
the text color (fixes bug #5302). Reintended the code so it becomes
the text color (fixes bug #5302). Reindented the code so it becomes
readable.
 
2000-08-07 Sven Neumann <sven@gimp.org>
......
......@@ -48,7 +48,7 @@
#include <libgimp/gimp_pdb.h>
#include <libgimp/gimpcompat.h> /* to be removed in 1.3 */
#include <libgimp/gimpcompat.h> /* to be removed before 1.2 */
#ifdef G_OS_WIN32
# include <stdlib.h> /* For _-argc and __argv */
......@@ -69,7 +69,6 @@ extern "C" {
#define gimp_get_data gimp_procedural_db_get_data
#define gimp_get_data_size gimp_procedural_db_get_data_size
#define gimp_set_data gimp_procedural_db_set_data
#define gimp_query_procedure gimp_procedural_db_proc_info
GIMPVAR guint gimp_major_version;
......
......@@ -65,6 +65,8 @@ extern "C" {
#define gimp_plugin_help_func gimp_standard_help_func
#define gimp_query_database gimp_procedural_db_query
#define gimp_query_procedure gimp_procedural_db_proc_info
#define gimp_query_images gimp_image_list
#define Parasite GimpParasite
......
......@@ -317,18 +317,18 @@ dialog_select (dbbrowser_t *dbbrowser,
g_free (dbbrowser->selected_params);
g_free (dbbrowser->selected_return_vals);
gimp_query_procedure (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
gimp_procedural_db_proc_info (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
/* save the "old" table */
old_table = dbbrowser->descr_table;
......
......@@ -317,18 +317,18 @@ dialog_select (dbbrowser_t *dbbrowser,
g_free (dbbrowser->selected_params);
g_free (dbbrowser->selected_return_vals);
gimp_query_procedure (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
gimp_procedural_db_proc_info (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
/* save the "old" table */
old_table = dbbrowser->descr_table;
......
......@@ -393,17 +393,15 @@ p_pdb_procedure_available (char *proc_name)
/* Query the gimp application's procedural database
* regarding a particular procedure.
*/
if (gimp_query_procedure (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
if (gimp_procedural_db_proc_info (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams, &l_nreturn_vals,
&l_params, &l_return_vals))
{
/* procedure found in PDB */
return (l_nparams);
......
......@@ -293,17 +293,15 @@ procedure_general_select_callback (PDesc *pdesc,
selected_params = NULL;
selected_return_vals = NULL;
gimp_query_procedure (pinfo->realname,
&selected_proc_blurb,
&selected_proc_help,
&selected_proc_author,
&selected_proc_copyright,
&selected_proc_date,
&selected_proc_type,
&selected_nparams,
&selected_nreturn_vals,
&selected_params,
&selected_return_vals);
gimp_procedural_db_proc_info (pinfo->realname,
&selected_proc_blurb,
&selected_proc_help,
&selected_proc_author,
&selected_proc_copyright,
&selected_proc_date,
&selected_proc_type,
&selected_nparams, &selected_nreturn_vals,
&selected_params, &selected_return_vals);
old_table = pdesc->info_table;
old_align = pdesc->info_align;
......
......@@ -293,17 +293,15 @@ procedure_general_select_callback (PDesc *pdesc,
selected_params = NULL;
selected_return_vals = NULL;
gimp_query_procedure (pinfo->realname,
&selected_proc_blurb,
&selected_proc_help,
&selected_proc_author,
&selected_proc_copyright,
&selected_proc_date,
&selected_proc_type,
&selected_nparams,
&selected_nreturn_vals,
&selected_params,
&selected_return_vals);
gimp_procedural_db_proc_info (pinfo->realname,
&selected_proc_blurb,
&selected_proc_help,
&selected_proc_author,
&selected_proc_copyright,
&selected_proc_date,
&selected_proc_type,
&selected_nparams, &selected_nreturn_vals,
&selected_params, &selected_return_vals);
old_table = pdesc->info_table;
old_align = pdesc->info_align;
......
......@@ -317,18 +317,18 @@ dialog_select (dbbrowser_t *dbbrowser,
g_free (dbbrowser->selected_params);
g_free (dbbrowser->selected_return_vals);
gimp_query_procedure (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
gimp_procedural_db_proc_info (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
/* save the "old" table */
old_table = dbbrowser->descr_table;
......
......@@ -317,18 +317,18 @@ dialog_select (dbbrowser_t *dbbrowser,
g_free (dbbrowser->selected_params);
g_free (dbbrowser->selected_return_vals);
gimp_query_procedure (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
gimp_procedural_db_proc_info (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
/* save the "old" table */
old_table = dbbrowser->descr_table;
......
......@@ -317,18 +317,18 @@ dialog_select (dbbrowser_t *dbbrowser,
g_free (dbbrowser->selected_params);
g_free (dbbrowser->selected_return_vals);
gimp_query_procedure (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
gimp_procedural_db_proc_info (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
/* save the "old" table */
old_table = dbbrowser->descr_table;
......
......@@ -293,17 +293,15 @@ procedure_general_select_callback (PDesc *pdesc,
selected_params = NULL;
selected_return_vals = NULL;
gimp_query_procedure (pinfo->realname,
&selected_proc_blurb,
&selected_proc_help,
&selected_proc_author,
&selected_proc_copyright,
&selected_proc_date,
&selected_proc_type,
&selected_nparams,
&selected_nreturn_vals,
&selected_params,
&selected_return_vals);
gimp_procedural_db_proc_info (pinfo->realname,
&selected_proc_blurb,
&selected_proc_help,
&selected_proc_author,
&selected_proc_copyright,
&selected_proc_date,
&selected_proc_type,
&selected_nparams, &selected_nreturn_vals,
&selected_params, &selected_return_vals);
old_table = pdesc->info_table;
old_align = pdesc->info_align;
......
......@@ -299,18 +299,18 @@ dialog_select (dbbrowser_t *dbbrowser,
if (dbbrowser->selected_params) g_free(dbbrowser->selected_params);
if (dbbrowser->selected_return_vals) g_free(dbbrowser->selected_return_vals);
gimp_query_procedure (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
gimp_procedural_db_proc_info (proc_name,
&(dbbrowser->selected_proc_blurb),
&(dbbrowser->selected_proc_help),
&(dbbrowser->selected_proc_author),
&(dbbrowser->selected_proc_copyright),
&(dbbrowser->selected_proc_date),
&(dbbrowser->selected_proc_type),
&(dbbrowser->selected_nparams),
&(dbbrowser->selected_nreturn_vals),
&(dbbrowser->selected_params),
&(dbbrowser->selected_return_vals));
/* save the "old" table */
old_table = dbbrowser->descr_table;
......
......@@ -175,18 +175,18 @@ gint p_gen_code_iter_ALT(char *proc_name)
/* Query the gimp application's procedural database
* regarding a particular procedure.
*/
if(gimp_query_procedure (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
if (gimp_procedural_db_proc_info (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
p_clean_name(proc_name, &l_clean_proc_name[0]);
/* procedure found in PDB */
if(gap_debug) fprintf(stderr, "DEBUG: found in PDB %s author: %s copyright: %s\n",
......@@ -367,18 +367,18 @@ gint p_gen_code_iter(char *proc_name)
/* Query the gimp application's procedural database
* regarding a particular procedure.
*/
if(gimp_query_procedure (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
if (gimp_procedural_db_proc_info (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
p_clean_name(proc_name, &l_clean_proc_name[0]);
/* procedure found in PDB */
if(gap_debug) fprintf(stderr, "DEBUG: found in PDB %s\n", proc_name);
......
......@@ -92,17 +92,17 @@ gint p_call_plugin(char *plugin_name, gint32 image_id, gint32 layer_id, GRunMode
l_drawable = gimp_drawable_get(layer_id); /* use the background layer */
/* query for plugin_name to get its argument types */
if (FALSE == gimp_query_procedure (plugin_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
if (!gimp_procedural_db_proc_info (plugin_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
fprintf(stderr, "ERROR: Plugin not available, Name was %s\n", plugin_name);
return -1;
......@@ -277,18 +277,18 @@ gint p_procedure_available(char *proc_name, t_proc_type ptype)
/* Query the gimp application's procedural database
* regarding a particular procedure.
*/
if (gimp_query_procedure (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
if (gimp_procedural_db_proc_info (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
/* procedure found in PDB */
if(gap_debug) fprintf(stderr, "DEBUG: found in PDB %s\n", proc_name);
......
......@@ -78,21 +78,21 @@ gint p_pdb_procedure_available(char *proc_name)
/* Query the gimp application's procedural database
* regarding a particular procedure.
*/
if(gimp_query_procedure (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
/* procedure found in PDB */
return (l_nparams);
}
if (gimp_procedural_db_proc_info (proc_name,
&l_proc_blurb,
&l_proc_help,
&l_proc_author,
&l_proc_copyright,
&l_proc_date,
&l_proc_type,
&l_nparams,
&l_nreturn_vals,
&l_params,
&l_return_vals))
{
/* procedure found in PDB */
return (l_nparams);
}
printf("Warning: Procedure %s not found.\n", proc_name);
return -1;
......
......@@ -586,11 +586,15 @@ maze_help (GtkWidget *widget,
gint baz;
gchar *message;
if (gimp_query_procedure ("extension_web_browser",
&proc_blurb, &proc_help,
&proc_author, &proc_copyright, &proc_date,
&proc_type, &nparams, &nreturn_vals,
&params, &return_vals))
if (gimp_procedural_db_proc_info ("extension_web_browser",
&proc_blurb,
&proc_help,
&proc_author,
&proc_copyright,
&proc_date,
&proc_type,
&nparams, &nreturn_vals,
&params, &return_vals))
{
/* open URL for help */
message = g_strdup_printf (_("Opening %s"), MAZE_URL);
......
......@@ -904,8 +904,8 @@ newpfobject(name)
int pt, np, nr, i;
GParamDef *p, *r;
if (!gimp_query_procedure(name, &b, &h, &a, &c, &d, &pt,
&np, &nr, &p, &r)) {
if (!gimp_procedural_db_proc_info (name, &b, &h, &a, &c, &d, &pt,
&np, &nr, &p, &r)) {
PyErr_SetString(ErrorObject, "procedure not found.");
return NULL;
}
......
......@@ -132,22 +132,22 @@ typedef union
typedef struct
{
GtkWidget **args_widgets;
gchar *script_name;
gchar *pdb_name;
gchar *description;
gchar *help;
gchar *author;
gchar *copyright;
gchar *date;
gchar *img_types;
gint num_args;
SFArgType *arg_types;
gchar **arg_labels;
SFArgValue *arg_defaults;
SFArgValue *arg_values;
gint32 image_based;
GParamDef *args; /* used only temporary until installed */
GtkWidget **args_widgets;
gchar *script_name;
gchar *pdb_name;
gchar *description;
gchar *help;
gchar *author;
gchar *copyright;
gchar *date;
gchar *img_types;
gint num_args;
SFArgType *arg_types;
gchar **arg_labels;
SFArgValue *arg_defaults;
SFArgValue *arg_values;
gint32 image_based;
GimpParamDef *args; /* used only temporary until installed */
} SFScript;
typedef struct
......@@ -165,36 +165,36 @@ extern long nlength (LISP obj);
* Local Functions
*/
static gint script_fu_install_script (gpointer foo,
SFScript *script,
gpointer bar);
static gint script_fu_remove_script (gpointer foo,
SFScript *script,
gpointer bar);
static void script_fu_script_proc (gchar *name,
gint nparams,
GParam *params,
gint *nreturn_vals,