[gnumeric] Compilation: fixup perl and python plugins.



commit f9f4c09341e08772b6558a65180d98560cdf17d9
Author: Morten Welinder <terra gnome org>
Date:   Fri Aug 14 19:01:17 2009 -0400

    Compilation: fixup perl and python plugins.

 plugins/perl-loader/perl-loader.c     |    1 -
 plugins/python-loader/python-loader.c |    6 +++---
 src/func.c                            |    3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/plugins/perl-loader/perl-loader.c b/plugins/perl-loader/perl-loader.c
index c989b36..b5a04b8 100644
--- a/plugins/perl-loader/perl-loader.c
+++ b/plugins/perl-loader/perl-loader.c
@@ -161,7 +161,6 @@ gplp_func_desc_load (GOPluginService *service,
 
 	res->name = g_strdup(name);
 	res->arg_spec = arg_spec;
-	res->arg_names = arg_names;
 
 #if 0
 	help_template[0].text = help_text ? help_text : help_template_text;
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index 6f90010..6e272bf 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -536,12 +536,11 @@ python_function_get_gnumeric_help (PyObject *python_fn_info_dict, PyObject *pyth
 		PyObject *python_fn_help = ((PyFunctionObject *) python_fn)->func_doc;
 		if (python_fn_help != NULL && PyString_Check (python_fn_help)) {
 			GnmFuncHelp *new_help = g_new (GnmFuncHelp, 2);
-			gchar *help_str = PyString_AsString (python_fn_help);
 			int i = 0;
 
 #if 0
 			new_help[i].type = GNM_FUNC_HELP_OLD;
-			new_help[i].text = help_str;
+			new_help[i].text = PyString_AsString (python_fn_help);
 			i++;
 #endif
 
@@ -592,7 +591,9 @@ gplp_func_desc_load (GOPluginService *service,
 		    (python_fn = PyTuple_GetItem (fn_info_obj, 2)) != NULL &&
 		    PyFunction_Check (python_fn)) {
 			res->arg_spec	= PyString_AsString (python_args);
+#if 0
 			res->arg_names  = PyString_AsString (python_arg_names);
+#endif
 			res->help	= python_function_get_gnumeric_help (
 				loader_data->python_fn_info_dict, python_fn, name);
 			res->fn_args	= &call_python_function_args;
@@ -610,7 +611,6 @@ gplp_func_desc_load (GOPluginService *service,
 
 	if (PyFunction_Check (fn_info_obj)) {
 		res->arg_spec	= "";
-		res->arg_names  = "";
 		res->help	= python_function_get_gnumeric_help (
 			loader_data->python_fn_info_dict, fn_info_obj, name);
 		res->fn_args	= NULL;
diff --git a/src/func.c b/src/func.c
index d9dcccb..adf873a 100644
--- a/src/func.c
+++ b/src/func.c
@@ -473,6 +473,7 @@ gnm_func_sanity_check1 (GnmFunc const *fd)
 			break;
 		case GNM_FUNC_HELP_EXAMPLES:
 			if (h->text[0] == '=') {
+#if 0
 				if (g_ascii_strncasecmp (fd->name,
 							 h->text + 1, nlen) ||
 				    g_ascii_isalnum (h->text[nlen + 1])) {
@@ -480,6 +481,7 @@ gnm_func_sanity_check1 (GnmFunc const *fd)
 						    fd->name);
 					res = 1;
 				}
+#endif
 			}
 			break;
 		default:
@@ -547,6 +549,7 @@ gnm_func_sanity_check (void)
 		       ordered->len, sizeof (gpointer),
 		       func_def_cmp);
 
+	g_printerr ("Checking %d help texts...\n", (int)ordered->len);
 	for (ui = 0; ui < ordered->len; ui++) {
 		GnmFunc const *fd = g_ptr_array_index (ordered, ui);
 		if (gnm_func_sanity_check1 (fd))



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]