diff --git a/plug-ins/script-fu/libscriptfu/scheme-wrapper.c b/plug-ins/script-fu/libscriptfu/scheme-wrapper.c index 20bda9c170c38459e1088e7f3765038a64b732db..b057df74ff62ae191f030771c3b31bf460a789fd 100644 --- a/plug-ins/script-fu/libscriptfu/scheme-wrapper.c +++ b/plug-ins/script-fu/libscriptfu/scheme-wrapper.c @@ -715,8 +715,6 @@ script_fu_marshal_procedure_call (scheme *sc, gint i; pointer return_val = sc->NIL; - g_debug ("In %s()", G_STRFUNC); - if (a == sc->NIL) /* Some ScriptFu function is calling this incorrectly. */ return implementation_error (sc, @@ -731,11 +729,13 @@ script_fu_marshal_procedure_call (scheme *sc, else proc_name = g_strdup (sc->vptr->string_value (a)); - g_debug ("proc name: %s", proc_name); - g_debug ("parms rcvd: %d", sc->vptr->list_length (sc, a)-1); + g_debug ("%s, proc name: %s, args rcvd: %d", + G_STRFUNC, + proc_name, + sc->vptr->list_length (sc, a)-1); if (deprecated ) - g_warning ("PDB procedure name %s is deprecated, please use %s.", + g_info ("PDB procedure name %s is deprecated, please use %s.", deprecated_name_for (proc_name), proc_name); @@ -756,7 +756,7 @@ script_fu_marshal_procedure_call (scheme *sc, actual_arg_count = sc->vptr->list_length (sc, a) - 1; /* Check the supplied number of arguments. - * This only gives warnings to the console. + * This only gives messages to the console. * It does not ensure that the count of supplied args equals the count of formal args. * Subsequent code must not assume that. * @@ -769,16 +769,13 @@ script_fu_marshal_procedure_call (scheme *sc, { if (actual_arg_count > n_arg_specs) { - /* Warn, but permit extra args. Will discard args from script.*/ - g_warning ("in script, permitting too many args to %s", proc_name); + /* Permit extra args. Will discard args from script, to next right paren.*/ + g_info ("in script, permitting too many args to %s", proc_name); } else if (actual_arg_count < n_arg_specs) { - /* Warn, but permit too few args. - * Scriptfu or downstream might provide missing args. - * It is author friendly to continue to parse the script for type errors. - */ - g_warning ("in script, permitting too few args to %s", proc_name); + /* Permit too few args. The config carries a sane default for most types. */ + g_info ("in script, permitting too few args to %s", proc_name); } /* else equal counts of args. */ } @@ -1429,9 +1426,8 @@ script_fu_marshal_procedure_call (scheme *sc, if (strcmp (proc_name, "script-fu-refresh") == 0) return script_error (sc, "A script cannot refresh scripts", 0); - g_debug ("calling %s", proc_name); + g_debug ("%s, calling:%s", G_STRFUNC, proc_name); values = gimp_procedure_run_config (procedure, config); - g_debug ("done."); g_clear_object (&config); /* Check the return status */ diff --git a/plug-ins/script-fu/libscriptfu/script-fu-dialog.c b/plug-ins/script-fu/libscriptfu/script-fu-dialog.c index f8faea36c813be466729863d78857a5c6d6dfeaf..6b5e4cfc1d2569685038a9ac31ae8ef28f018096 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-dialog.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-dialog.c @@ -60,8 +60,7 @@ * corresponding to SFType the author declared in script-fu-register call. */ -/* FUTURE: delete this after v3 is stable. */ -#define DEBUG_CONFIG_PROPERTIES TRUE +#define DEBUG_CONFIG_PROPERTIES FALSE #if DEBUG_CONFIG_PROPERTIES static void diff --git a/plug-ins/script-fu/libscriptfu/script-fu-errors.c b/plug-ins/script-fu/libscriptfu/script-fu-errors.c index 8482e2afd567b2a37f2afcc1cc071a6fe132943a..a623297be154663c8dad186e590fe55e1517056e 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-errors.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-errors.c @@ -272,8 +272,9 @@ debug_in_arg (scheme *sc, const guint arg_index, const gchar *type_name ) { - g_debug ("param %d - expecting type %s", arg_index + 1, type_name ); - g_debug ("actual arg is type %s (%d)", + g_debug ("param:%d, formal C type:%s, actual scheme type:%s (%d)", + arg_index + 1, + type_name, ts_types[ type(sc->vptr->pair_car (a)) ], type(sc->vptr->pair_car (a))); }