[gnumeric] namespace cleanup.

[Morten Welinder <mortenw src gnome org>]

commit 191061bce9470db43f558a04e27428cc6a641d53
Author: Morten Welinder <terra gnome org>
Date:   Thu Oct 29 11:26:48 2009 -0400

    namespace cleanup.

 src/dialogs/dialog-solver.c |    2 +-
 src/solver.h                |    4 ++--
 src/tools/solver/solver.c   |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index 02ae342..859d2bc 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -938,7 +938,7 @@ cb_dialog_solve_clicked (G_GNUC_UNUSED GtkWidget *button,
 	conv.c_listing = state->constraint_list;
 	convert_constraint_format (&conv);
 	go_slist_free_custom (param->constraints,
-			      (GFreeFunc)solver_constraint_destroy);
+			      (GFreeFunc)gnm_solver_constraint_free);
 	param->constraints = conv.c_list;
 	if (param->constraints == NULL) {
 		go_gtk_notice_nonmodal_dialog
diff --git a/src/solver.h b/src/solver.h
index 1782f1a..795ef23 100644
--- a/src/solver.h
+++ b/src/solver.h
@@ -76,6 +76,7 @@ typedef struct {
 #ifdef GNM_ENABLE_SOLVER
 
 char *gnm_solver_constraint_as_str (SolverConstraint const *c);
+void gnm_solver_constraint_free (SolverConstraint *c);
 
 typedef enum {
 	SolverRunning, SolverOptimal, SolverUnbounded, SolverInfeasible,
@@ -236,7 +237,6 @@ GnmCell		*solver_get_input_var (SolverResults *res, int n);
 
 /* Returns a pointer to a constraint. */
 SolverConstraint* solver_get_constraint (SolverResults *res, int n);
-void              solver_constraint_destroy (SolverConstraint *c);
 
 void              solver_insert_cols    (Sheet *sheet, int col, int count);
 void              solver_insert_rows    (Sheet *sheet, int row, int count);
@@ -254,7 +254,7 @@ void              solver_param_read_sax (GsfXMLIn *xin, xmlChar const **attrs);
 #define solver_insert_rows(sheet, row, count)	do {} while(0)
 #define solver_delete_cols(sheet, col, count)	do {} while(0)
 #define solver_delete_rows(sheet, row, count)	do {} while(0)
-#define solver_constraint_destroy(c) do {} while(0)
+#define gnm_solver_constraint_free(c) do {} while(0)
 #define solver_param_read_sax (void)
 
 #endif
diff --git a/src/tools/solver/solver.c b/src/tools/solver/solver.c
index 35b9cdf..81e517a 100644
--- a/src/tools/solver/solver.c
+++ b/src/tools/solver/solver.c
@@ -81,7 +81,7 @@ void
 solver_param_destroy (SolverParameters *sp)
 {
 	go_slist_free_custom (sp->constraints,
-			      (GFreeFunc)solver_constraint_destroy);
+			      (GFreeFunc)gnm_solver_constraint_free);
 	g_slist_free (sp->input_cells);
 	g_free (sp->input_entry_str);
 	g_free (sp->options.scenario_name);
@@ -261,7 +261,7 @@ solver_get_constraint (SolverResults *res, int n)
 }
 
 void
-solver_constraint_destroy (SolverConstraint *c)
+gnm_solver_constraint_free (SolverConstraint *c)
 {
 	g_free (c);
 }