[gnumeric] rename arg_names in GnmFuncDescriptor to facilitate removal

[Andreas J. Guelzow <guelzow src gnome org>]

commit 382d93c43615ade89f0ddb705c2dde5d25f7ff3c
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Fri Aug 14 15:33:31 2009 -0600

    rename arg_names in GnmFuncDescriptor to facilitate removal
    
    2009-08-14 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/func.h (_GnmFuncDescriptor): rename arg_names to
    	  arg_names_depreceated
    	* src/func.c (gnm_func_load_stub): don't use arg_names
    	(gnm_func_add): ditto
    	(gnm_func_add_placeholder): ditto
    
    2009-08-14 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* functions.c (help_concatenate): fix argument descriptions

 ChangeLog                     |    8 ++++++++
 plugins/fn-string/ChangeLog   |    4 ++++
 plugins/fn-string/functions.c |    2 +-
 src/func.c                    |    5 ++---
 src/func.h                    |    2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cee9e60..6483f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2009-08-14 Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/func.h (_GnmFuncDescriptor): rename arg_names to 
+	  arg_names_depreceated
+	* src/func.c (gnm_func_load_stub): don't use arg_names
+	(gnm_func_add): ditto
+	(gnm_func_add_placeholder): ditto
+
+2009-08-14 Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/func.c (function_def_get_arg_name): rewrite without using 
 	  fn_def->arg_names
 
diff --git a/plugins/fn-string/ChangeLog b/plugins/fn-string/ChangeLog
index 1051674..62877a7 100644
--- a/plugins/fn-string/ChangeLog
+++ b/plugins/fn-string/ChangeLog
@@ -1,5 +1,9 @@
 2009-08-14 Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* functions.c (help_concatenate): fix argument descriptions
+
+2009-08-14 Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* functions.c (help_len*): make desription consitent
 	(help_mid): ditto
 	(help_leftb): add argument description
diff --git a/plugins/fn-string/functions.c b/plugins/fn-string/functions.c
index 9cd2af2..d0490ef 100644
--- a/plugins/fn-string/functions.c
+++ b/plugins/fn-string/functions.c
@@ -508,7 +508,7 @@ gnumeric_upper (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
 static GnmFuncHelp const help_concatenate[] = {
         { GNM_FUNC_HELP_NAME, F_("CONCATENATE:the concatenation of the strings @{s1}, @{s2},...")},
         { GNM_FUNC_HELP_ARG, F_("s1:first string")},
-        { GNM_FUNC_HELP_ARG, F_("s2 second string")},
+        { GNM_FUNC_HELP_ARG, F_("s2:second string")},
 	{ GNM_FUNC_HELP_EXCEL, F_("This function is Excel compatible.") },
         { GNM_FUNC_HELP_EXAMPLES, "=CONCATENATE(\"aa\",\"bb\")" },
         { GNM_FUNC_HELP_SEEALSO, "LEFT,MID,RIGHT"},
diff --git a/src/func.c b/src/func.c
index 177b374..3d91851 100644
--- a/src/func.c
+++ b/src/func.c
@@ -688,7 +688,7 @@ gnm_func_load_stub (GnmFunc *func)
 	memset (&desc, 0, sizeof (GnmFuncDescriptor));
 
 	if (func->fn.load_desc (func, &desc)) {
-		func->arg_names	 = desc.arg_names;
+		func->arg_names	 = "";
 		func->help	 = desc.help ? desc.help : NULL;
 		if (desc.fn_args != NULL) {
 			func->fn_type		= GNM_FUNC_TYPE_ARGS;
@@ -801,7 +801,7 @@ gnm_func_add (GnmFuncGroup *fn_group,
 		textdomain = GETTEXT_PACKAGE;
 
 	func->name		= desc->name;
-	func->arg_names		= desc->arg_names;
+	func->arg_names		= "";
 	func->help		= desc->help ? desc->help : NULL;
 	func->textdomain        = go_string_new (textdomain);
 	func->linker		= desc->linker;
@@ -908,7 +908,6 @@ gnm_func_add_placeholder (Workbook *scope,
 	memset (&desc, 0, sizeof (GnmFuncDescriptor));
 	desc.name	  = copy_name ? g_strdup (name) : name;
 	desc.arg_spec	  = NULL;
-	desc.arg_names	  = "...";
 	desc.help	  = NULL;
 	desc.fn_args	  = NULL;
 	desc.fn_nodes	  = &unknownFunctionHandler;
diff --git a/src/func.h b/src/func.h
index 62d2f23..7c80d28 100644
--- a/src/func.h
+++ b/src/func.h
@@ -177,7 +177,7 @@ typedef struct {
 struct _GnmFuncDescriptor {
 	char const *name;
 	char const *arg_spec;
-	char const *arg_names;
+	char const *arg_names_depreceated;
 	GnmFuncHelp const *help;
 	GnmFuncArgs	  fn_args;
 	GnmFuncNodes	  fn_nodes;