[goffice] Adjust GOCmdContextClass

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

commit cb4d5a87ab28411a8759bed2704581b4e4e45b7c
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Tue Aug 2 08:22:18 2011 -0600

    Adjust GOCmdContextClass
    
    2011-08-02  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* goffice/app/go-cmd-context-impl.h (GOCmdContextClass): move
    	error_info_list field to the error substruct
    	* goffice/app/go-cmd-context.c (go_cmd_context_error_info_list): adjust
    	for the move of the error_info_list field
    	(go_cmd_context_error_info_list_default): ditto

 ChangeLog                         |    8 ++++++++
 goffice/app/go-cmd-context-impl.h |    6 +++---
 goffice/app/go-cmd-context.c      |    5 ++---
 3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c6016f9..c5c40d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-08-02  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* goffice/app/go-cmd-context-impl.h (GOCmdContextClass): move
+	error_info_list field to the error substruct
+	* goffice/app/go-cmd-context.c (go_cmd_context_error_info_list): adjust
+	for the move of the error_info_list field
+	(go_cmd_context_error_info_list_default): ditto
+
+2011-08-02  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* goffice/utils/go-format.c (go_format_execute): insert space in case
 	of short nominators
 
diff --git a/goffice/app/go-cmd-context-impl.h b/goffice/app/go-cmd-context-impl.h
index bc9af15..7064cb4 100644
--- a/goffice/app/go-cmd-context-impl.h
+++ b/goffice/app/go-cmd-context-impl.h
@@ -1,3 +1,5 @@
+/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
 #ifndef GO_CMD_CONTEXT_IMPL_H
 #define GO_CMD_CONTEXT_IMPL_H
 
@@ -15,13 +17,11 @@ typedef struct {
 	struct {
 		void (*error)		(GOCmdContext *gcc, GError *err);
 		void (*error_info)  	(GOCmdContext *gcc, GOErrorInfo *err);
+		void (*error_info_list) (GOCmdContext *gcc, GSList *errs);
 	} error;
 
 	void    (*progress_set)		(GOCmdContext *gcc, double val);
 	void    (*progress_message_set)	(GOCmdContext *gcc, gchar const *msg);
-
-  /* This should really go into the error struct! */
-        void    (*error_info_list)  	(GOCmdContext *gcc, GSList *errs);
 } GOCmdContextClass;
 
 #define GO_CMD_CONTEXT_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), GO_TYPE_CMD_CONTEXT, GOCmdContextClass))
diff --git a/goffice/app/go-cmd-context.c b/goffice/app/go-cmd-context.c
index 54e937f..d79d0d2 100644
--- a/goffice/app/go-cmd-context.c
+++ b/goffice/app/go-cmd-context.c
@@ -40,7 +40,7 @@ void
 go_cmd_context_error_info_list (GOCmdContext *cc, GSList *stack)
 {
 	g_return_if_fail (GO_IS_CMD_CONTEXT (cc));
-	GCC_CLASS (cc)->error_info_list (cc, stack);
+	GCC_CLASS (cc)->error.error_info_list (cc, stack);
 }
 
 void
@@ -162,8 +162,7 @@ go_cmd_context_error_info_list_default 	(GOCmdContext *gcc, GSList *errs)
 static void
 go_cmd_context_base_init (GOCmdContextClass *class)
 {
-#warning class->error_info_list should really be class->error.error_info_list
-	class->error_info_list = go_cmd_context_error_info_list_default;
+	class->error.error_info_list = go_cmd_context_error_info_list_default;
 }
 
 GType