Commit df108807 authored by Sven Neumann's avatar Sven Neumann Committed by Michael Natterer

Michael Natterer <mitschel@cs.tu-berlin.de>

1999-06-28  Sven Neumann  <sven@gimp.org>
	    Michael Natterer  <mitschel@cs.tu-berlin.de>

	* app/plug_in.c: return a PDB_EXECUTION_ERROR if a procedure
	requested by a plugin doesn't exist.

	* plug-ins/helpbrowser/*: The GIMP Help Browser!
	Not yet built by default. You need GtkXmHTML to make it work.
	There is a Makefile.classic for testing it.

	* Makefile.am
	* configure.in
	* help/*: some sample help files. Subdirs are possible, too.
parent c2db5a7e
1999-06-28 Sven Neumann <sven@gimp.org>
Michael Natterer <mitschel@cs.tu-berlin.de>
* app/plug_in.c: return a PDB_EXECUTION_ERROR if a procedure
requested by a plugin doesn't exist.
* plug-ins/helpbrowser/*: The GIMP Help Browser!
Not yet built by default. You need GtkXmHTML to make it work.
There is a Makefile.classic for testing it.
* Makefile.am
* configure.in
* help/*: some sample help files. Subdirs are possible, too.
1999-06-28 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/plug_in.c (plug_in_callback): removed the check for
......
## Process this file with automake to produce Makefile.in
SUBDIRS = tools po po-plug-ins intl libgimp app $(GIMP_PLUGINS) $(GIMP_MODULES) data tips $(GIMPDOCS)
SUBDIRS = tools po po-plug-ins intl libgimp app $(GIMP_PLUGINS) $(GIMP_MODULES) data tips help $(GIMPDOCS)
bin_SCRIPTS = gimptool
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -1531,15 +1531,19 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
args = plug_in_params_to_args (proc_run->params, proc_run->nparams, FALSE);
proc_rec = procedural_db_lookup (proc_run->name);
if (!proc_rec)
if (proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
return_vals = procedural_db_execute (proc_run->name, args);
}
else
{
/* if the name lookup failed, construct a
* dummy "executiuon error" return value --Michael
*/
return_vals = g_new (Argument, 1);
return_vals[0].arg_type = PDB_INT32;
return_vals[0].value.pdb_int = PDB_EXECUTION_ERROR;
}
return_vals = procedural_db_execute (proc_run->name, args);
if (return_vals)
{
......
......@@ -674,6 +674,7 @@ intl/Makefile
tools/Makefile
tools/pdbgen/Makefile
libgimp/Makefile
help/Makefile
tips/Makefile],
[
chmod +x gimptool
......@@ -688,3 +689,5 @@ tips/Makefile],
esac
]
)
Makefile.in
Makefile
## Process this file with automake to produce Makefile.in
helpdatadir = $(gimpdatadir)/help
helpdata_DATA = \
welcome.html \
contents.html \
index.html \
wilber.png
EXTRA_DIST = $(helpdata_DATA)
.PHONY: files
files:
@files=`ls $(DISTFILES) 2> /dev/null`; for p in $$files; do \
echo $$p; \
done
<html>
<head>
<title>GIMP Help Contents</title>
</head>
<body bgcolor="#ffffff">
<h1>Contents</h1>
<ol>
<li><a href="preface.html">Preface</a></li>
<li><a href="tools/index.html">Tools</a></li>
<li>...</li>