Commit c7943a28 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/pdb/Makefile.am removed...

2006-04-04  Michael Natterer  <mitch@gimp.org>

	* app/pdb/Makefile.am
	* app/pdb/gimpargument.[ch]: removed...

	* app/pdb/gimp-pdb-compat.[ch]: ...and added with renamed functions.
	Added gimp_pdb_compat_param_spec().

	* app/pdb/gimpprocedure.[ch]: removed gimp_procedure_add_compat_arg()
	and _add_compat_value(). Use gimp_pdb_compat_param_spec() plus
	gimp_procedure_add_argument()/return_value() instead.

	* app/pdb/procedural-db-query.c
	* app/pdb/procedural_db.c
	* app/plug-in/plug-in-message.c
	* app/plug-in/plug-in-params.c
	* app/plug-in/plug-in-rc.c
	* tools/pdbgen/pdb/procedural_db.pdb: changed accordingly.

	* app/xcf/xcf.c: no need to use compat functions here.

	* app/pdb/procedural_db_cmds.c: regnerated.
parent 3f52325f
2006-04-04 Michael Natterer <mitch@gimp.org>
* app/pdb/Makefile.am
* app/pdb/gimpargument.[ch]: removed...
* app/pdb/gimp-pdb-compat.[ch]: ...and added with renamed functions.
Added gimp_pdb_compat_param_spec().
* app/pdb/gimpprocedure.[ch]: removed gimp_procedure_add_compat_arg()
and _add_compat_value(). Use gimp_pdb_compat_param_spec() plus
gimp_procedure_add_argument()/return_value() instead.
* app/pdb/procedural-db-query.c
* app/pdb/procedural_db.c
* app/plug-in/plug-in-message.c
* app/plug-in/plug-in-params.c
* app/plug-in/plug-in-rc.c
* tools/pdbgen/pdb/procedural_db.pdb: changed accordingly.
* app/xcf/xcf.c: no need to use compat functions here.
* app/pdb/procedural_db_cmds.c: regnerated.
2006-04-04 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcontainertreeview-dnd.c
......
......@@ -5,8 +5,8 @@ noinst_LIBRARIES = libapppdb.a
libapppdb_a_SOURCES = \
pdb-types.h \
\
gimpargument.c \
gimpargument.h \
gimp-pdb-compat.c \
gimp-pdb-compat.h \
gimpprocedure.c \
gimpprocedure.h \
\
......
......@@ -25,112 +25,242 @@
#include "pdb-types.h"
#include "core/gimp.h"
#include "core/gimpparamspecs.h"
#include "gimpargument.h"
#include "gimp-pdb-compat.h"
/* public functions */
void
gimp_argument_init_compat (GValue *value,
GimpPDBArgType type)
GParamSpec *
gimp_pdb_compat_param_spec (Gimp *gimp,
GimpPDBArgType arg_type,
const gchar *name,
const gchar *desc)
{
g_return_if_fail (value != NULL);
GParamSpec *pspec = NULL;
switch (type)
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (name != NULL, NULL);
switch (arg_type)
{
case GIMP_PDB_INT32:
g_value_init (value, GIMP_TYPE_INT32);
pspec = gimp_param_spec_int32 (name, name, desc,
G_MININT32, G_MAXINT32, 0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT16:
g_value_init (value, GIMP_TYPE_INT16);
pspec = gimp_param_spec_int16 (name, name, desc,
G_MININT16, G_MAXINT16, 0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT8:
g_value_init (value, GIMP_TYPE_INT8);
pspec = gimp_param_spec_int8 (name, name, desc,
0, G_MAXUINT8, 0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_FLOAT:
g_value_init (value, G_TYPE_DOUBLE);
pspec = g_param_spec_double (name, name, desc,
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_STRING:
g_value_init (value, G_TYPE_STRING);
pspec = gimp_param_spec_string (name, name, desc,
TRUE, TRUE,
NULL,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT32ARRAY:
g_value_init (value, GIMP_TYPE_INT32_ARRAY);
pspec = gimp_param_spec_int32_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT16ARRAY:
g_value_init (value, GIMP_TYPE_INT16_ARRAY);
pspec = gimp_param_spec_int16_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT8ARRAY:
g_value_init (value, GIMP_TYPE_INT8_ARRAY);
pspec = gimp_param_spec_int8_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_FLOATARRAY:
g_value_init (value, GIMP_TYPE_FLOAT_ARRAY);
pspec = gimp_param_spec_float_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_STRINGARRAY:
g_value_init (value, GIMP_TYPE_STRING_ARRAY);
pspec = gimp_param_spec_string_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_COLOR:
g_value_init (value, GIMP_TYPE_RGB);
pspec = gimp_param_spec_rgb (name, name, desc,
NULL,
G_PARAM_READWRITE);
break;
case GIMP_PDB_REGION:
case GIMP_PDB_BOUNDARY:
break;
case GIMP_PDB_DISPLAY:
g_value_init (value, GIMP_TYPE_DISPLAY_ID);
pspec = gimp_param_spec_display_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_IMAGE:
g_value_init (value, GIMP_TYPE_IMAGE_ID);
pspec = gimp_param_spec_image_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_LAYER:
g_value_init (value, GIMP_TYPE_LAYER_ID);
pspec = gimp_param_spec_layer_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_CHANNEL:
g_value_init (value, GIMP_TYPE_CHANNEL_ID);
pspec = gimp_param_spec_channel_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_DRAWABLE:
g_value_init (value, GIMP_TYPE_DRAWABLE_ID);
pspec = gimp_param_spec_drawable_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_SELECTION:
g_value_init (value, GIMP_TYPE_SELECTION_ID);
pspec = gimp_param_spec_selection_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_BOUNDARY:
break;
case GIMP_PDB_VECTORS:
g_value_init (value, GIMP_TYPE_VECTORS_ID);
pspec = gimp_param_spec_vectors_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_PARASITE:
g_value_init (value, GIMP_TYPE_PARASITE);
pspec = gimp_param_spec_parasite (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_STATUS:
g_value_init (value, GIMP_TYPE_PDB_STATUS_TYPE);
pspec = g_param_spec_enum (name, name, desc,
GIMP_TYPE_PDB_STATUS_TYPE,
GIMP_PDB_EXECUTION_ERROR,
G_PARAM_READWRITE);
break;
case GIMP_PDB_END:
break;
}
if (! pspec)
g_warning ("%s: returning NULL for %s (%s)",
G_STRFUNC, name, gimp_pdb_compat_arg_type_to_string (arg_type));
return pspec;
}
GType
gimp_pdb_compat_arg_type_to_gtype (GimpPDBArgType type)
{
switch (type)
{
case GIMP_PDB_INT32:
return GIMP_TYPE_INT32;
case GIMP_PDB_INT16:
return GIMP_TYPE_INT16;
case GIMP_PDB_INT8:
return GIMP_TYPE_INT8;
case GIMP_PDB_FLOAT:
return G_TYPE_DOUBLE;
case GIMP_PDB_STRING:
return G_TYPE_STRING;
case GIMP_PDB_INT32ARRAY:
return GIMP_TYPE_INT32_ARRAY;
case GIMP_PDB_INT16ARRAY:
return GIMP_TYPE_INT16_ARRAY;
case GIMP_PDB_INT8ARRAY:
return GIMP_TYPE_INT8_ARRAY;
case GIMP_PDB_FLOATARRAY:
return GIMP_TYPE_FLOAT_ARRAY;
case GIMP_PDB_STRINGARRAY:
return GIMP_TYPE_STRING_ARRAY;
case GIMP_PDB_COLOR:
return GIMP_TYPE_RGB;
case GIMP_PDB_REGION:
case GIMP_PDB_BOUNDARY:
break;
case GIMP_PDB_DISPLAY:
return GIMP_TYPE_DISPLAY_ID;
case GIMP_PDB_IMAGE:
return GIMP_TYPE_IMAGE_ID;
case GIMP_PDB_LAYER:
return GIMP_TYPE_LAYER_ID;
case GIMP_PDB_CHANNEL:
return GIMP_TYPE_CHANNEL_ID;
case GIMP_PDB_DRAWABLE:
return GIMP_TYPE_DRAWABLE_ID;
case GIMP_PDB_SELECTION:
return GIMP_TYPE_SELECTION_ID;
case GIMP_PDB_VECTORS:
return GIMP_TYPE_VECTORS_ID;
case GIMP_PDB_PARASITE:
return GIMP_TYPE_PARASITE;
case GIMP_PDB_STATUS:
return GIMP_TYPE_PDB_STATUS_TYPE;
case GIMP_PDB_END:
break;
}
g_warning ("%s: returning G_TYPE_NONE for %d (%s)",
G_STRFUNC, type, gimp_pdb_compat_arg_type_to_string (type));
return G_TYPE_NONE;
}
GimpPDBArgType
gimp_argument_type_to_pdb_arg_type (GType type)
gimp_pdb_compat_arg_type_from_gtype (GType type)
{
static GQuark pdb_type_quark = 0;
GimpPDBArgType pdb_type;
......@@ -200,7 +330,7 @@ gimp_argument_type_to_pdb_arg_type (GType type)
}
gchar *
gimp_pdb_arg_type_to_string (GimpPDBArgType type)
gimp_pdb_compat_arg_type_to_string (GimpPDBArgType type)
{
const gchar *name;
......
......@@ -16,15 +16,18 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_ARGUMENT_H__
#define __GIMP_ARGUMENT_H__
#ifndef __GIMP_PDB_COMPAT_H__
#define __GIMP_PDB_COMPAT_H__
void gimp_argument_init_compat (GValue *value,
GimpPDBArgType type);
GParamSpec * gimp_pdb_compat_param_spec (Gimp *gimp,
GimpPDBArgType arg_type,
const gchar *name,
const gchar *desc);
GimpPDBArgType gimp_argument_type_to_pdb_arg_type (GType type);
gchar * gimp_pdb_arg_type_to_string (GimpPDBArgType type);
GType gimp_pdb_compat_arg_type_to_gtype (GimpPDBArgType type);
GimpPDBArgType gimp_pdb_compat_arg_type_from_gtype (GType type);
gchar * gimp_pdb_compat_arg_type_to_string (GimpPDBArgType type);
#endif /* __GIMP_ARGUMENT_H__ */
......@@ -36,8 +36,8 @@
#include "core/gimp.h"
#include "gimpargument.h"
#include "gimpprocedure.h"
#include "gimp-pdb-compat.h"
#include "procedural_db.h"
#include "procedural-db-query.h"
......@@ -409,7 +409,7 @@ procedural_db_print_entry (gpointer key,
fprintf (file, "( ");
arg_type = gimp_argument_type_to_pdb_arg_type (pspec->value_type);
arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
arg_value = g_enum_get_value (arg_class, arg_type);
......@@ -429,7 +429,7 @@ procedural_db_print_entry (gpointer key,
fprintf (file, "( ");
arg_type = gimp_argument_type_to_pdb_arg_type (pspec->value_type);
arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
arg_value = g_enum_get_value (arg_class, arg_type);
......
......@@ -41,7 +41,6 @@
#include "plug-in/plug-in-run.h"
#include "gimpargument.h"
#include "gimpprocedure.h"
#include "internal_procs.h"
#include "procedural_db.h"
......
......@@ -36,8 +36,8 @@
#include "core/gimp.h"
#include "gimpargument.h"
#include "gimpprocedure.h"
#include "gimp-pdb-compat.h"
#include "procedural_db.h"
#include "procedural-db-query.h"
......@@ -409,7 +409,7 @@ procedural_db_print_entry (gpointer key,
fprintf (file, "( ");
arg_type = gimp_argument_type_to_pdb_arg_type (pspec->value_type);
arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
arg_value = g_enum_get_value (arg_class, arg_type);
......@@ -429,7 +429,7 @@ procedural_db_print_entry (gpointer key,
fprintf (file, "( ");
arg_type = gimp_argument_type_to_pdb_arg_type (pspec->value_type);
arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
arg_value = g_enum_get_value (arg_class, arg_type);
......
......@@ -41,7 +41,6 @@
#include "plug-in/plug-in-run.h"
#include "gimpargument.h"
#include "gimpprocedure.h"
#include "internal_procs.h"
#include "procedural_db.h"
......
......@@ -40,7 +40,6 @@
#include "plug-in/plug-in-run.h"
#include "gimpargument.h"
#include "gimpprocedure.h"
#include "gimp-intl.h"
......@@ -423,181 +422,6 @@ gimp_procedure_add_return_value (GimpProcedure *procedure,
G_STRFUNC, procedure->num_values, procedure->name);
}
static GParamSpec *
gimp_procedure_compat_pspec (Gimp *gimp,
GimpPDBArgType arg_type,
const gchar *name,
const gchar *desc)
{
GParamSpec *pspec = NULL;
switch (arg_type)
{
case GIMP_PDB_INT32:
pspec = gimp_param_spec_int32 (name, name, desc,
G_MININT32, G_MAXINT32, 0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT16:
pspec = gimp_param_spec_int16 (name, name, desc,
G_MININT16, G_MAXINT16, 0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT8:
pspec = gimp_param_spec_int8 (name, name, desc,
0, G_MAXUINT8, 0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_FLOAT:
pspec = g_param_spec_double (name, name, desc,
-G_MAXDOUBLE, G_MAXDOUBLE, 0.0,
G_PARAM_READWRITE);
break;
case GIMP_PDB_STRING:
pspec = gimp_param_spec_string (name, name, desc,
TRUE, TRUE,
NULL,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT32ARRAY:
pspec = gimp_param_spec_int32_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT16ARRAY:
pspec = gimp_param_spec_int16_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_INT8ARRAY:
pspec = gimp_param_spec_int8_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_FLOATARRAY:
pspec = gimp_param_spec_float_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_STRINGARRAY:
pspec = gimp_param_spec_string_array (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_COLOR:
pspec = gimp_param_spec_rgb (name, name, desc,
NULL,
G_PARAM_READWRITE);
break;
case GIMP_PDB_REGION:
break;
case GIMP_PDB_DISPLAY:
pspec = gimp_param_spec_display_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_IMAGE:
pspec = gimp_param_spec_image_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_LAYER:
pspec = gimp_param_spec_layer_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_CHANNEL:
pspec = gimp_param_spec_channel_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_DRAWABLE:
pspec = gimp_param_spec_drawable_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_SELECTION:
pspec = gimp_param_spec_selection_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_BOUNDARY:
break;
case GIMP_PDB_VECTORS:
pspec = gimp_param_spec_vectors_id (name, name, desc,
gimp,
G_PARAM_READWRITE);
break;
case GIMP_PDB_PARASITE:
pspec = gimp_param_spec_parasite (name, name, desc,
G_PARAM_READWRITE);
break;
case GIMP_PDB_STATUS:
pspec = g_param_spec_enum (name, name, desc,
GIMP_TYPE_PDB_STATUS_TYPE,
GIMP_PDB_EXECUTION_ERROR,
G_PARAM_READWRITE);
break;
case GIMP_PDB_END:
break;
}
if (! pspec)
g_warning ("%s: returning NULL for %s (%s)",
G_STRFUNC, name, gimp_pdb_arg_type_to_string (arg_type));
return pspec;
}
void
gimp_procedure_add_compat_arg (GimpProcedure *procedure,
Gimp *gimp,
GimpPDBArgType arg_type,
const gchar *name,
const gchar *desc)
{
g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (name != NULL);
gimp_procedure_add_argument (procedure,
gimp_procedure_compat_pspec (gimp, arg_type,
name, desc));
}
void
gimp_procedure_add_compat_value (GimpProcedure *procedure,
Gimp *gimp,
GimpPDBArgType arg_type,
const gchar *name,
const gchar *desc)
{
g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (name != NULL);
gimp_procedure_add_return_value (procedure,
gimp_procedure_compat_pspec (gimp, arg_type,
name, desc));
}
/* private functions */
......
......@@ -113,7 +113,7 @@ void gimp_procedure_set_strings (GimpProcedure *procedure,
gchar *copyright,
gchar *date,
gchar *deprecated);
void gimp_procedure_set_static_strings (GimpProcedure *procedure,
void gimp_procedure_set_static_strings (GimpProcedure *procedure,
gchar *name,
gchar *original_name,
gchar *blurb,
......@@ -122,7 +122,7 @@ void gimp_procedure_set_static_strings (GimpProcedure *procedure,
gchar *copyright,
gchar *date,
gchar *deprecated);
void gimp_procedure_take_strings (GimpProcedure *procedure,
void gimp_procedure_take_strings (GimpProcedure *procedure,
gchar *name,
gchar *original_name,
gchar *blurb,
......@@ -137,17 +137,6 @@ void gimp_procedure_add_argument (GimpProcedure *procedure,
void gimp_procedure_add_return_value (GimpProcedure *procedure,
GParamSpec *pspec);
void gimp_procedure_add_compat_arg (GimpProcedure *procedure,
Gimp *gimp,
GimpPDBArgType arg_type,
const gchar *name,
const gchar *desc);
void gimp_procedure_add_compat_value (GimpProcedure *procedure,
Gimp *gimp,
GimpPDBArgType arg_type,
const gchar *name,
const gchar *desc);
GValueArray * gimp_procedure_get_arguments (GimpProcedure *procedure);
GValueArray * gimp_procedure_get_return_values (GimpProcedure *procedure,
gboolean success);
......
......@@ -36,8 +36,8 @@
#include "core/gimp.h"
#include "gimpargument.h"
#include "gimpprocedure.h"
#include "gimp-pdb-compat.h"
#include "procedural_db.h"
#include "procedural-db-query.h"
......@@ -409,7 +409,7 @@ procedural_db_print_entry (gpointer key,
fprintf (file, "( ");
arg_type = gimp_argument_type_to_pdb_arg_type (pspec->value_type);
arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
arg_value = g_enum_get_value (arg_class, arg_type);
......@@ -429,7 +429,7 @@ procedural_db_print_entry (gpointer key,
fprintf (file, "( ");
arg_type = gimp_argument_type_to_pdb_arg_type (pspec->value_type);
arg_type = gimp_pdb_compat_arg_type_from_gtype (pspec->value_type);
arg_value = g_enum_get_value (arg_class, arg_type);
......
......@@ -41,7 +41,6 @@
#include "plug-in/plug-in-run.h"
#include "gimpargument.h"
#include "gimpprocedure.h"
#include "internal_procs.h"
#include "procedural_db.h"
......
......@@ -31,7 +31,7 @@
#include "core/gimpparamspecs.h"
#include "core/gimp.h"
#include "gimpargument.h"
#include "gimp-pdb-compat.h"
#include "plug-in/plug-in-data.h"
#include "procedural-db-query.h"
......@@ -609,7 +609,7 @@ procedural_db_proc_arg_invoker (GimpProcedure *procedure,
{
GParamSpec *pspec = proc->args[arg_num];
arg_type = gimp_argument_type_to_pdb_arg_type (G_PARAM_SPEC_VALUE_TYPE (pspec));
arg_type = gimp_pdb_compat_arg_type_from_gtype (G_PARAM_SPEC_VALUE_TYPE (pspec));
arg_name = g_strdup (g_param_spec_get_name (pspec));
arg_desc = g_strdup (g_param_spec_get_blurb (pspec));
}
......@@ -688,7 +688,7 @@ procedural_db_proc_val_invoker (GimpProcedure *procedure,
{
GParamSpec *pspec = proc->values[val_num];
val_type = gimp_argument_type_to_pdb_arg_type (G_PARAM_SPEC_VALUE_TYPE (pspec));
val_type = gimp_pdb_compat_arg_type_from_gtype (G_PARAM_SPEC_VALUE_TYPE (pspec));
val_name = g_strdup (g_param_spec_get_name (pspec));
val_desc = g_strdup (g_param_spec_get_blurb (pspec));
}
......
......@@ -37,6 +37,7 @@
#include "core/gimpdrawable.h"
#include "pdb/gimpprocedure.h"
#include "pdb/gimp-pdb-compat.h"
#include "pdb/procedural_db.h"
#include "plug-in.h"
......@@ -716,11 +717,11 @@ plug_in_handle_proc_install (PlugIn *plug_in,
{
canonical = gimp_canonicalize_identifier (proc_install->params[i].name);
gimp_procedure_add_compat_arg (procedure,
plug_in->gimp,
proc_install->params[i].type,
canonical,
proc_install->params[i].description);
gimp_procedure_add_argument (procedure,
gimp_pdb_compat_param_spec (plug_in->gimp,
proc_install->params[i].type,
canonical,
proc_install->params[i].description));
g_free (canonical);
}
......@@ -729,11 +730,11 @@ plug_in_handle_proc_install (PlugIn *plug_in,
{
canonical = gimp_canonicalize_identifier (proc_install->return_vals[i].name);
gimp_procedure_add_compat_value (procedure,
plug_in->gimp,
proc_install->return_vals[i].type,
canonical,
proc_install->return_vals[i].description);
gimp_procedure_add_return_value (procedure,
gimp_pdb_compat_param_spec (plug_in->gimp,
proc_install->return_vals[i].type,
canonical,
proc_install->return_vals[i].description));
g_free (canonical);
}
......