GNOME.org
 

[libgda] Partial correction for bug #669801

commit dbb7dc99fbce614796ffa9a617d764e27bf43449
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Jun 25 22:32:50 2012 +0200

    Partial correction for bug #669801

 .../DocBook/gda-report-docbook-document.c          |    4 +-
 libgda-report/RML/gda-report-rml-document.c        |    4 +-
 libgda-report/gda-report-document-private.h        |    4 +-
 libgda-report/gda-report-document.c                |    6 ++--
 libgda-report/libgda-report.symbols                |    2 -
 libgda-xslt/sql_backend.c                          |   26 ++++++++--------
 libgda-xslt/sql_backend.h                          |   12 ++++----
 libgda-xslt/sql_exslt_internal.c                   |   16 +++++-----
 libgda-xslt/sqlexslt.c                             |    4 +-
 libgda/dir-blob-op.c                               |   14 ++++----
 libgda/dir-blob-op.h                               |   10 +++---
 libgda/gda-column.c                                |   12 ++++----
 libgda/gda-data-model-dir.c                        |    8 ++--
 libgda/gda-data-model-iter.c                       |    4 +-
 libgda/gda-init.c                                  |   32 ++++++++++----------
 libgda/gda-meta-struct-io.c                        |    4 +-
 libgda/gda-meta-struct-private.h                   |    2 +-
 libgda/gda-meta-struct.c                           |    4 +-
 libgda/gda-server-operation.c                      |   10 +++---
 libgda/gda-tree-node.c                             |   24 +++++++-------
 libgda/gda-tree.c                                  |    8 ++--
 libgda/gda-value.c                                 |    2 +-
 libgda/libgda.symbols                              |   13 --------
 .../virtual/gda-vconnection-data-model-private.h   |    8 ++--
 libgda/sqlite/virtual/gda-vconnection-data-model.c |   22 +++++++-------
 libgda/sqlite/virtual/gda-vprovider-data-model.c   |    2 +-
 26 files changed, 121 insertions(+), 136 deletions(-)
---
diff --git a/libgda-report/DocBook/gda-report-docbook-document.c b/libgda-report/DocBook/gda-report-docbook-document.c
index e29e756..e333b1d 100644
--- a/libgda-report/DocBook/gda-report-docbook-document.c
+++ b/libgda-report/DocBook/gda-report-docbook-document.c
@@ -316,7 +316,7 @@ gda_report_docbook_document_run_as_html (GdaReportDocument *doc, const gchar *fi
 	argv[7] = NULL;
 	argv[8] = NULL;
 
-	retval = gda_report_document_run_converter_argv (doc, NULL, argv, 7, 
+	retval = _gda_report_document_run_converter_argv (doc, NULL, argv, 7, 
 							 "xsltproc", error);
 	g_strfreev (argv);
 	return retval;
@@ -385,7 +385,7 @@ gda_report_docbook_document_run_as_pdf (GdaReportDocument *doc, const gchar *fil
 	for (i= 0; i< 7; i++)
 		g_print ("==%d %s\n", i, argv[i]);
 
-	retval = gda_report_document_run_converter_argv (doc, NULL, argv, 2, 
+	retval = _gda_report_document_run_converter_argv (doc, NULL, argv, 2, 
 							 "fop", error);
 	g_strfreev (argv);
 	return retval;
diff --git a/libgda-report/RML/gda-report-rml-document.c b/libgda-report/RML/gda-report-rml-document.c
index 657c7b3..d5b250a 100644
--- a/libgda-report/RML/gda-report-rml-document.c
+++ b/libgda-report/RML/gda-report-rml-document.c
@@ -214,7 +214,7 @@ gda_report_rml_document_run_as_html (GdaReportDocument *doc, const gchar *filena
 	}
 	g_static_mutex_unlock (&init_mutex);
 
-	return gda_report_document_run_converter_path (doc, filename, converter, "trml2html", error);
+	return _gda_report_document_run_converter_path (doc, filename, converter, "trml2html", error);
 }
 
 static gboolean
@@ -245,5 +245,5 @@ gda_report_rml_document_run_as_pdf (GdaReportDocument *doc, const gchar *filenam
 	}
 	g_static_mutex_unlock (&init_mutex);
 
-	return gda_report_document_run_converter_path (doc, filename, converter, "trml2pdf", error);
+	return _gda_report_document_run_converter_path (doc, filename, converter, "trml2pdf", error);
 }
diff --git a/libgda-report/gda-report-document-private.h b/libgda-report/gda-report-document-private.h
index fdfdf34..971b260 100644
--- a/libgda-report/gda-report-document-private.h
+++ b/libgda-report/gda-report-document-private.h
@@ -26,10 +26,10 @@
 
 G_BEGIN_DECLS
 
-gboolean gda_report_document_run_converter_path (GdaReportDocument *doc, const gchar *filename, 
+gboolean _gda_report_document_run_converter_path (GdaReportDocument *doc, const gchar *filename, 
 						 const gchar *full_converter_path, const gchar *converter_name, 
 						 GError **error);
-gboolean gda_report_document_run_converter_argv (GdaReportDocument *doc, const gchar *filename, 
+gboolean _gda_report_document_run_converter_argv (GdaReportDocument *doc, const gchar *filename, 
 						 gchar **argv, gint argv_index_fname, 
 						 const gchar *converter_name, GError **error);
 
diff --git a/libgda-report/gda-report-document.c b/libgda-report/gda-report-document.c
index bbf4b5e..47fdc29 100644
--- a/libgda-report/gda-report-document.c
+++ b/libgda-report/gda-report-document.c
@@ -217,7 +217,7 @@ typedef struct _SpawnedData {
 } SpawnedData;
 
 gboolean 
-gda_report_document_run_converter_path (GdaReportDocument *doc, const gchar *filename, 
+_gda_report_document_run_converter_path (GdaReportDocument *doc, const gchar *filename, 
 					const gchar *full_converter_path, const gchar *converter_name, 
 					GError **error)
 {
@@ -229,7 +229,7 @@ gda_report_document_run_converter_path (GdaReportDocument *doc, const gchar *fil
 	argv[1] = NULL;
 	argv[2] = NULL;
 
-	retval = gda_report_document_run_converter_argv (doc, filename, argv, 1, 
+	retval = _gda_report_document_run_converter_argv (doc, filename, argv, 1, 
 							 converter_name, error);
 	g_strfreev (argv);
 	return retval;
@@ -237,7 +237,7 @@ gda_report_document_run_converter_path (GdaReportDocument *doc, const gchar *fil
 
 
 gboolean
-gda_report_document_run_converter_argv (GdaReportDocument *doc, const gchar *filename, 
+_gda_report_document_run_converter_argv (GdaReportDocument *doc, const gchar *filename, 
 					gchar **argv, gint argv_index_fname, 
 					const gchar *converter_name, GError **error)
 {
diff --git a/libgda-report/libgda-report.symbols b/libgda-report/libgda-report.symbols
index 6804565..1316d37 100644
--- a/libgda-report/libgda-report.symbols
+++ b/libgda-report/libgda-report.symbols
@@ -3,8 +3,6 @@
 	gda_report_document_get_type
 	gda_report_document_run_as_html
 	gda_report_document_run_as_pdf
-	gda_report_document_run_converter_argv
-	gda_report_document_run_converter_path
 	gda_report_document_set_template
 	gda_report_engine_declare_object
 	gda_report_engine_find_declared_object
diff --git a/libgda-xslt/sql_backend.c b/libgda-xslt/sql_backend.c
index e648319..d7b9d15 100644
--- a/libgda-xslt/sql_backend.c
+++ b/libgda-xslt/sql_backend.c
@@ -66,7 +66,7 @@ static int gda_xslt_bk_internal_query (GdaXsltExCont * exec,
 				       xmlNodePtr query_node);
 
 int
-gda_xslt_holder_set_value (GdaHolder *param, xsltTransformContextPtr ctxt)
+_gda_xslt_holder_set_value (GdaHolder *param, xsltTransformContextPtr ctxt)
 {
 	GType gdatype;
 	gchar *name;
@@ -100,7 +100,7 @@ gda_xslt_holder_set_value (GdaHolder *param, xsltTransformContextPtr ctxt)
 }
 
 int
-gda_xslt_bk_section (GdaXsltExCont * exec, GdaXsltIntCont * pdata,
+_gda_xslt_bk_section (GdaXsltExCont * exec, GdaXsltIntCont * pdata,
 		     xsltTransformContextPtr ctxt, xmlNodePtr node,
 		     xmlNodePtr inst, G_GNUC_UNUSED xsltStylePreCompPtr comp)
 {
@@ -181,25 +181,25 @@ gda_xslt_bk_section (GdaXsltExCont * exec, GdaXsltIntCont * pdata,
 }
 
 xmlXPathObjectPtr
-gda_xslt_bk_fun_getnodeset (xmlChar * set, GdaXsltExCont * exec,
+_gda_xslt_bk_fun_getnodeset (xmlChar * set, GdaXsltExCont * exec,
 			    GdaXsltIntCont * pdata)
 {
 	xmlXPathObjectPtr nodeset;
 	int res;
 #ifdef GDA_DEBUG_NO
-	printf ("running function:gda_xslt_bk_fun_getnodeset\n");
+	printf ("running function:_gda_xslt_bk_fun_getnodeset\n");
 #endif
 	res = get_resultset_nodeset (pdata, (gchar*) set, &nodeset, &(exec->error));
 	if (res < 0 || nodeset == NULL) {
 		xsltGenericError (xsltGenericErrorContext,
-				  "gda_xslt_bk_fun_getnodeset error\n");
+				  "_gda_xslt_bk_fun_getnodeset error\n");
 		return NULL;
 	}
 	return nodeset;
 }
 
 xmlXPathObjectPtr
-gda_xslt_bk_fun_getvalue (xmlChar * set, xmlChar * name, GdaXsltExCont * exec,
+_gda_xslt_bk_fun_getvalue (xmlChar * set, xmlChar * name, GdaXsltExCont * exec,
 			  GdaXsltIntCont * pdata,int getXml)
 {
 	xmlXPathObjectPtr value;
@@ -208,7 +208,7 @@ gda_xslt_bk_fun_getvalue (xmlChar * set, xmlChar * name, GdaXsltExCont * exec,
 	xmlNodePtr rootnode;
 	xmlNodePtr copyrootnode;
 #ifdef GDA_DEBUG_NO
-	g_print ("running function:gda_xslt_bk_fun_getvalue (getxml [%d])", getXml);
+	g_print ("running function:_gda_xslt_bk_fun_getvalue (getxml [%d])", getXml);
 #endif
 	char *strvalue;
 	res = get_resultset_col_value (pdata, (const char *) set,
@@ -216,7 +216,7 @@ gda_xslt_bk_fun_getvalue (xmlChar * set, xmlChar * name, GdaXsltExCont * exec,
 				       &(exec->error));
 	if (res < 0) {
 		xsltGenericError (xsltGenericErrorContext,
-				  "gda_xslt_bk_fun_getvalue: internal error on get_resultset_col_value\n");
+				  "_gda_xslt_bk_fun_getvalue: internal error on get_resultset_col_value\n");
 		return NULL;
 	}
 
@@ -224,14 +224,14 @@ gda_xslt_bk_fun_getvalue (xmlChar * set, xmlChar * name, GdaXsltExCont * exec,
 		sqlxmldoc = xmlParseDoc((const xmlChar *)strvalue);
 		if (sqlxmldoc == NULL) {
 			xsltGenericError (xsltGenericErrorContext,
-					"gda_xslt_bk_fun_getvalue: xmlParseDoc fauld\n");
+					"_gda_xslt_bk_fun_getvalue: xmlParseDoc fauld\n");
 			return NULL;
 		}
 		rootnode = xmlDocGetRootElement(sqlxmldoc);
 		copyrootnode = xmlCopyNode(rootnode,1);
 		if (copyrootnode == NULL) {
 			xsltGenericError (xsltGenericErrorContext,
-					"gda_xslt_bk_fun_getvalue: get or copy of root node fauld\n");
+					"_gda_xslt_bk_fun_getvalue: get or copy of root node fauld\n");
 			return NULL;
 		}
 		value = (xmlXPathObjectPtr) xmlXPathNewNodeSet (copyrootnode);
@@ -243,14 +243,14 @@ gda_xslt_bk_fun_getvalue (xmlChar * set, xmlChar * name, GdaXsltExCont * exec,
 
 	if (value == NULL) {
 		xsltGenericError (xsltGenericErrorContext,
-				  "gda_xslt_bk_fun_getvalue: internal error\n");
+				  "_gda_xslt_bk_fun_getvalue: internal error\n");
 		return NULL;
 	}
 	return value;
 }
 
 xmlXPathObjectPtr
-gda_xslt_bk_fun_checkif (G_GNUC_UNUSED xmlChar * setname, G_GNUC_UNUSED xmlChar * sql_condition,
+_gda_xslt_bk_fun_checkif (G_GNUC_UNUSED xmlChar * setname, G_GNUC_UNUSED xmlChar * sql_condition,
 			 G_GNUC_UNUSED GdaXsltExCont * exec, G_GNUC_UNUSED GdaXsltIntCont * pdata)
 {
 	return xmlXPathNewBoolean (1);
@@ -547,7 +547,7 @@ gda_xslt_bk_internal_query (GdaXsltExCont * exec, GdaXsltIntCont * pdata,
 	if (params != NULL) {
 		plist = params->holders;
 		while (plist && ret == 0) {
-			ret = gda_xslt_holder_set_value (GDA_HOLDER (plist->data), ctxt);
+			ret = _gda_xslt_holder_set_value (GDA_HOLDER (plist->data), ctxt);
 			plist = g_slist_next (plist);
 		}
 	}
diff --git a/libgda-xslt/sql_backend.h b/libgda-xslt/sql_backend.h
index 4d2dd2f..bbfc56a 100644
--- a/libgda-xslt/sql_backend.h
+++ b/libgda-xslt/sql_backend.h
@@ -50,25 +50,25 @@ struct _GdaXsltIntCont
 
 typedef struct _GdaXsltIntCont GdaXsltIntCont;
 
-void *gda_xslt_extension_init (xsltTransformContextPtr ctxt,
+void *_gda_xslt_extension_init (xsltTransformContextPtr ctxt,
 			       const xmlChar * URI);
-void gda_xslt_extension_shutdown (xsltTransformContextPtr ctxt,
+void _gda_xslt_extension_shutdown (xsltTransformContextPtr ctxt,
 				  const xmlChar * URI, void *data);
 
 /* elements backend */
-int gda_xslt_bk_section (GdaXsltExCont * exec, GdaXsltIntCont * pdata,
+int _gda_xslt_bk_section (GdaXsltExCont * exec, GdaXsltIntCont * pdata,
 			 xsltTransformContextPtr ctxt, xmlNodePtr node,
 			 xmlNodePtr inst, xsltStylePreCompPtr comp);
 
 /* functions backend */
-xmlXPathObjectPtr gda_xslt_bk_fun_getvalue (xmlChar * set, xmlChar * name,
+xmlXPathObjectPtr _gda_xslt_bk_fun_getvalue (xmlChar * set, xmlChar * name,
 					    GdaXsltExCont * exec,
 					    GdaXsltIntCont * pdata,
 					    int getXml);
-xmlXPathObjectPtr gda_xslt_bk_fun_getnodeset (xmlChar * set,
+xmlXPathObjectPtr _gda_xslt_bk_fun_getnodeset (xmlChar * set,
 					      GdaXsltExCont * exec,
 					      GdaXsltIntCont * pdata);
-xmlXPathObjectPtr gda_xslt_bk_fun_checkif (xmlChar * setname,
+xmlXPathObjectPtr _gda_xslt_bk_fun_checkif (xmlChar * setname,
 					   xmlChar * sql_condition,
 					   GdaXsltExCont * exec,
 					   GdaXsltIntCont * pdata);
diff --git a/libgda-xslt/sql_exslt_internal.c b/libgda-xslt/sql_exslt_internal.c
index 8622cde..44fac91 100644
--- a/libgda-xslt/sql_exslt_internal.c
+++ b/libgda-xslt/sql_exslt_internal.c
@@ -44,12 +44,12 @@ static void gda_xslt_section_element (xsltTransformContextPtr tctxt,
 				      xsltStylePreCompPtr comp);
 
 void *
-gda_xslt_extension_init (xsltTransformContextPtr ctxt, const xmlChar * URI)
+_gda_xslt_extension_init (xsltTransformContextPtr ctxt, const xmlChar * URI)
 {
 	int res;
 	GdaXsltIntCont *data;
 #ifdef GDA_DEBUG_NO
-	g_print ("gda_xslt_extension_init");
+	g_print ("_gda_xslt_extension_init");
 #endif
 	if (!URI || strcmp ((gchar*) URI, GDA_XSLT_EXTENSION_URI)) {
 #ifdef GDA_DEBUG_NO
@@ -105,7 +105,7 @@ gda_xslt_extension_init (xsltTransformContextPtr ctxt, const xmlChar * URI)
 }
 
 void
-gda_xslt_extension_shutdown (G_GNUC_UNUSED xsltTransformContextPtr ctxt,
+_gda_xslt_extension_shutdown (G_GNUC_UNUSED xsltTransformContextPtr ctxt,
 			     G_GNUC_UNUSED const xmlChar * URI, void *data)
 {
 	GdaXsltIntCont *p_data = (GdaXsltIntCont *) data;
@@ -158,7 +158,7 @@ gda_xslt_getnodeset_function (xmlXPathParserContextPtr ctxt, int nargs)
 		}
 	}
 	nodeset =
-		gda_xslt_bk_fun_getnodeset (setname->stringval, execc, data);
+		_gda_xslt_bk_fun_getnodeset (setname->stringval, execc, data);
 	if (nodeset == NULL) {
 		xsltGenericError (xsltGenericErrorContext,
 				  "exsltDynMapFunctoin: ret == NULL\n");
@@ -221,7 +221,7 @@ gda_xslt_checkif_function (xmlXPathParserContextPtr ctxt, int nargs)
 			return;
 		}
 	}
-	value = gda_xslt_bk_fun_checkif (setname->stringval, sql->stringval,
+	value = _gda_xslt_bk_fun_checkif (setname->stringval, sql->stringval,
 					 execc, data);
 	if (value == NULL) {
 		xsltGenericError (xsltGenericErrorContext,
@@ -288,7 +288,7 @@ gda_xslt_getvalue_function (xmlXPathParserContextPtr ctxt, int nargs)
 		}
 	}
 
-	value = gda_xslt_bk_fun_getvalue (set->stringval, name->stringval,
+	value = _gda_xslt_bk_fun_getvalue (set->stringval, name->stringval,
 					  execc, data,0);
 	if (value == NULL) {
 		xsltGenericError (xsltGenericErrorContext,
@@ -355,7 +355,7 @@ gda_xslt_getxmlvalue_function (xmlXPathParserContextPtr ctxt, int nargs)
 		}
 	}
 
-	value = gda_xslt_bk_fun_getvalue (set->stringval, name->stringval,
+	value = _gda_xslt_bk_fun_getvalue (set->stringval, name->stringval,
 					  execc, data,1);
 	if (value == NULL) {
 		xsltGenericError (xsltGenericErrorContext,
@@ -392,7 +392,7 @@ gda_xslt_section_element (xsltTransformContextPtr tctxt,
 		tctxt->state = XSLT_STATE_STOPPED;
 		return;
 	}
-	res = gda_xslt_bk_section (execc, data, tctxt, node, inst, comp);
+	res = _gda_xslt_bk_section (execc, data, tctxt, node, inst, comp);
 	if (res < 0) {
 		xsltGenericError (xsltGenericErrorContext,
 				  "gda_xslt_section_element: execute query backend\n");
diff --git a/libgda-xslt/sqlexslt.c b/libgda-xslt/sqlexslt.c
index 80e07d6..f978a94 100644
--- a/libgda-xslt/sqlexslt.c
+++ b/libgda-xslt/sqlexslt.c
@@ -47,8 +47,8 @@ gda_xslt_register (void)
 		init = 1;
 		init_res =
 			xsltRegisterExtModule (BAD_CAST GDA_XSLT_EXTENSION_URI,
-					       gda_xslt_extension_init,
-					       gda_xslt_extension_shutdown);
+					       _gda_xslt_extension_init,
+					       _gda_xslt_extension_shutdown);
 		if (init_res != 0) {
 			g_error ("error, xsltRegisterExtModule = [%d]\n",
 				 init_res);
diff --git a/libgda/dir-blob-op.c b/libgda/dir-blob-op.c
index d3ce0f5..3b0886a 100644
--- a/libgda/dir-blob-op.c
+++ b/libgda/dir-blob-op.c
@@ -46,7 +46,7 @@ static GObjectClass *parent_class = NULL;
  * Object init and finalize
  */
 GType
-gda_dir_blob_op_get_type (void)
+_gda_dir_blob_op_get_type (void)
 {
 	static GType type = 0;
 
@@ -112,10 +112,10 @@ gda_dir_blob_op_finalize (GObject * object)
 }
 
 /**
- * gda_dir_blob_op_new
+ * _gda_dir_blob_op_new
  */
 GdaBlobOp *
-gda_dir_blob_op_new (const gchar *complete_filename)
+_gda_dir_blob_op_new (const gchar *complete_filename)
 {
 	GdaDirBlobOp *pgop;
 
@@ -128,10 +128,10 @@ gda_dir_blob_op_new (const gchar *complete_filename)
 }
 
 /**
- * gda_dir_blob_set_filename
+ * _gda_dir_blob_set_filename
  */
 void
-gda_dir_blob_set_filename (GdaDirBlobOp *blob, const gchar *complete_filename)
+_gda_dir_blob_set_filename (GdaDirBlobOp *blob, const gchar *complete_filename)
 {
 	g_return_if_fail (GDA_IS_DIR_BLOB_OP (blob));
 	g_return_if_fail (blob->priv);
@@ -142,10 +142,10 @@ gda_dir_blob_set_filename (GdaDirBlobOp *blob, const gchar *complete_filename)
 }
 
 /**
- * gda_dir_blob_get_filename
+ * _gda_dir_blob_get_filename
  */
 const gchar *
-gda_dir_blob_get_filename (GdaDirBlobOp *blob)
+_gda_dir_blob_get_filename (GdaDirBlobOp *blob)
 {
 	g_return_val_if_fail (GDA_IS_DIR_BLOB_OP (blob), NULL);
 	g_return_val_if_fail (blob->priv, NULL);
diff --git a/libgda/dir-blob-op.h b/libgda/dir-blob-op.h
index 0b40b9f..fff541e 100644
--- a/libgda/dir-blob-op.h
+++ b/libgda/dir-blob-op.h
@@ -29,7 +29,7 @@
 
 G_BEGIN_DECLS
 
-#define GDA_TYPE_DIR_BLOB_OP            (gda_dir_blob_op_get_type())
+#define GDA_TYPE_DIR_BLOB_OP            (_gda_dir_blob_op_get_type())
 #define GDA_DIR_BLOB_OP(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_DIR_BLOB_OP, GdaDirBlobOp))
 #define GDA_DIR_BLOB_OP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_DIR_BLOB_OP, GdaDirBlobOpClass))
 #define GDA_IS_DIR_BLOB_OP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_DIR_BLOB_OP))
@@ -48,10 +48,10 @@ struct _GdaDirBlobOpClass {
 	GdaBlobOpClass            parent_class;
 };
 
-GType         gda_dir_blob_op_get_type     (void) G_GNUC_CONST;
-GdaBlobOp    *gda_dir_blob_op_new          (const gchar *complete_filename);
-void          gda_dir_blob_set_filename    (GdaDirBlobOp *blob, const gchar *complete_filename);
-const gchar  *gda_dir_blob_get_filename    (GdaDirBlobOp *blob);
+GType         _gda_dir_blob_op_get_type     (void) G_GNUC_CONST;
+GdaBlobOp    *_gda_dir_blob_op_new          (const gchar *complete_filename);
+void          _gda_dir_blob_set_filename    (GdaDirBlobOp *blob, const gchar *complete_filename);
+const gchar  *_gda_dir_blob_get_filename    (GdaDirBlobOp *blob);
 
 G_END_DECLS
 
diff --git a/libgda/gda-column.c b/libgda/gda-column.c
index 82822e9..0192656 100644
--- a/libgda/gda-column.c
+++ b/libgda/gda-column.c
@@ -78,7 +78,7 @@ enum
 };
 
 static GObjectClass *parent_class = NULL;
-GdaAttributesManager *gda_column_attributes_manager;
+GdaAttributesManager *_gda_column_attributes_manager;
 
 static void
 gda_column_class_init (GdaColumnClass *klass)
@@ -135,7 +135,7 @@ gda_column_class_init (GdaColumnClass *klass)
 	object_class->finalize = gda_column_finalize;
 
 	/* extra */
-	gda_column_attributes_manager = gda_attributes_manager_new (TRUE, NULL, NULL);
+	_gda_column_attributes_manager = gda_attributes_manager_new (TRUE, NULL, NULL);
 }
 
 static void
@@ -292,7 +292,7 @@ gda_column_copy (GdaColumn *column)
 	column_copy->priv->position = column->priv->position;
 	if (column->priv->default_value)
 		column_copy->priv->default_value = gda_value_copy (column->priv->default_value);
-	gda_attributes_manager_copy (gda_column_attributes_manager, (gpointer) column, gda_column_attributes_manager, (gpointer) column_copy);
+	gda_attributes_manager_copy (_gda_column_attributes_manager, (gpointer) column, _gda_column_attributes_manager, (gpointer) column_copy);
 
 	return column_copy; 	 
 }
@@ -589,7 +589,7 @@ const GValue *
 gda_column_get_attribute (GdaColumn *column, const gchar *attribute)
 {
 	g_return_val_if_fail (GDA_IS_COLUMN (column), NULL);
-	return gda_attributes_manager_get (gda_column_attributes_manager, column, attribute);
+	return gda_attributes_manager_get (_gda_column_attributes_manager, column, attribute);
 }
 
 /**
@@ -626,10 +626,10 @@ gda_column_set_attribute (GdaColumn *column, const gchar *attribute, const GValu
 	const GValue *cvalue;
 	g_return_if_fail (GDA_IS_COLUMN (column));
 
-	cvalue = gda_attributes_manager_get (gda_column_attributes_manager, column, attribute);
+	cvalue = gda_attributes_manager_get (_gda_column_attributes_manager, column, attribute);
 	if ((value && cvalue && !gda_value_differ (cvalue, value)) ||
 	    (!value && !cvalue))
 		return;
 
-	gda_attributes_manager_set_full (gda_column_attributes_manager, column, attribute, value, destroy);
+	gda_attributes_manager_set_full (_gda_column_attributes_manager, column, attribute, value, destroy);
 }
diff --git a/libgda/gda-data-model-dir.c b/libgda/gda-data-model-dir.c
index 14dec23..1ce75f7 100644
--- a/libgda/gda-data-model-dir.c
+++ b/libgda/gda-data-model-dir.c
@@ -851,7 +851,7 @@ gda_data_model_dir_get_value_at (GdaDataModel *model, gint col, gint row, GError
 
 				/* file mapping in mem */
 				filename = compute_filename (imodel, frow);
-				op = gda_dir_blob_op_new (filename);
+				op = _gda_dir_blob_op_new (filename);
 				g_free (filename);
 				gda_blob_set_op (blob, op);
 				g_object_unref (op);
@@ -1045,7 +1045,7 @@ gda_data_model_dir_set_values (GdaDataModel *model, gint row, GList *values, GEr
 							GdaBlob *blob;
 							blob = (GdaBlob *) gda_value_get_blob (frow->data_value);
 							if (blob && blob->op)
-								gda_dir_blob_set_filename (GDA_DIR_BLOB_OP (blob->op),
+								_gda_dir_blob_set_filename (GDA_DIR_BLOB_OP (blob->op),
 											   new_filename);
 						}
 					}
@@ -1121,7 +1121,7 @@ gda_data_model_dir_set_values (GdaDataModel *model, gint row, GList *values, GEr
 					GdaBlob *blob;
 					blob = (GdaBlob *) gda_value_get_blob (frow->data_value);
 					if (blob && blob->op)
-						gda_dir_blob_set_filename (GDA_DIR_BLOB_OP (blob->op),
+						_gda_dir_blob_set_filename (GDA_DIR_BLOB_OP (blob->op),
 									   new_filename);
 				}
 			}
@@ -1147,7 +1147,7 @@ gda_data_model_dir_set_values (GdaDataModel *model, gint row, GList *values, GEr
 				GdaBlobOp *op;
 				gchar *filename;
 				filename = compute_filename (imodel, frow);
-				op = gda_dir_blob_op_new (filename);
+				op = _gda_dir_blob_op_new (filename);
 				if (gda_blob_op_write_all (op, blob) < 0) {
 					gchar *str;
 					str = g_strdup_printf (_("Could not overwrite contents of file '%s'"), filename);
diff --git a/libgda/gda-data-model-iter.c b/libgda/gda-data-model-iter.c
index af020ba..8355d9c 100644
--- a/libgda/gda-data-model-iter.c
+++ b/libgda/gda-data-model-iter.c
@@ -32,7 +32,7 @@
 #include "gda-enums.h"
 #include "gda-data-select.h"
 
-extern GdaAttributesManager *gda_column_attributes_manager;
+extern GdaAttributesManager *_gda_column_attributes_manager;
 extern GdaAttributesManager *gda_holder_attributes_manager;
 
 /* 
@@ -310,7 +310,7 @@ define_holder_for_data_model_column (GdaDataModel *model, gint col, GdaDataModel
 		gda_value_free (v);
 	}
 	/* copy extra attributes */
-	gda_attributes_manager_copy (gda_column_attributes_manager, (gpointer) column,
+	gda_attributes_manager_copy (_gda_column_attributes_manager, (gpointer) column,
 				     gda_holder_attributes_manager, (gpointer) param);
 	gda_set_add_holder ((GdaSet *) iter, param);
 	g_object_set_data (G_OBJECT (param), "model_col", GINT_TO_POINTER (col + 1));
diff --git a/libgda/gda-init.c b/libgda/gda-init.c
index ba4dafd..b919a46 100644
--- a/libgda/gda-init.c
+++ b/libgda/gda-init.c
@@ -55,9 +55,9 @@
  *     #endif
  *     IMPORT extern gchar *gda_numeric_locale;
  */
-xmlDtdPtr       gda_array_dtd = NULL;
+xmlDtdPtr       _gda_array_dtd = NULL;
 xmlDtdPtr       gda_paramlist_dtd = NULL;
-xmlDtdPtr       gda_server_op_dtd = NULL;
+xmlDtdPtr       _gda_server_op_dtd = NULL;
 
 static gboolean numeric_locale_dyn = FALSE;
 gchar          *gda_numeric_locale = "";
@@ -197,24 +197,24 @@ gda_init (void)
 	gda_gbr_init ();
 
 	/* array DTD */
-	gda_array_dtd = NULL;
+	_gda_array_dtd = NULL;
 	file = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "dtd", "libgda-array.dtd", NULL);
 	if (g_file_test (file, G_FILE_TEST_EXISTS))
-		gda_array_dtd = xmlParseDTD (NULL, (xmlChar*)file);
+		_gda_array_dtd = xmlParseDTD (NULL, (xmlChar*)file);
 	
-	if (!gda_array_dtd) {
+	if (!_gda_array_dtd) {
 		if (g_getenv ("GDA_TOP_SRC_DIR")) {
 			g_free (file);
 			file = g_build_filename (g_getenv ("GDA_TOP_SRC_DIR"), "libgda", "libgda-array.dtd", NULL);
-			gda_array_dtd = xmlParseDTD (NULL, (xmlChar*)file);
+			_gda_array_dtd = xmlParseDTD (NULL, (xmlChar*)file);
 		}
-		if (!gda_array_dtd)
+		if (!_gda_array_dtd)
 			g_message (_("Could not parse '%s': "
 				     "XML data import validation will not be performed (some weird errors may occur)"),
 				   file);
 	}
-	if (gda_array_dtd)
-		gda_array_dtd->name = xmlStrdup((xmlChar*) "gda_array");
+	if (_gda_array_dtd)
+		_gda_array_dtd->name = xmlStrdup((xmlChar*) "gda_array");
 	g_free (file);
 
 	/* paramlist DTD */
@@ -239,25 +239,25 @@ gda_init (void)
 	g_free (file);
 
 	/* server operation DTD */
-	gda_server_op_dtd = NULL;
+	_gda_server_op_dtd = NULL;
 	file = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "dtd", "libgda-server-operation.dtd", NULL);
 	if (g_file_test (file, G_FILE_TEST_EXISTS))
-		gda_server_op_dtd = xmlParseDTD (NULL, (xmlChar*)file);
+		_gda_server_op_dtd = xmlParseDTD (NULL, (xmlChar*)file);
 
-	if (!gda_server_op_dtd) {
+	if (!_gda_server_op_dtd) {
 		if (g_getenv ("GDA_TOP_SRC_DIR")) {
 			g_free (file);
 			file = g_build_filename (g_getenv ("GDA_TOP_SRC_DIR"), "libgda", "libgda-server-operation.dtd", NULL);
-			gda_server_op_dtd = xmlParseDTD (NULL, (xmlChar*)file);
+			_gda_server_op_dtd = xmlParseDTD (NULL, (xmlChar*)file);
 		}
-		if (!gda_server_op_dtd)
+		if (!_gda_server_op_dtd)
 			g_message (_("Could not parse '%s': "
 				     "Validation for XML files for server operations will not be performed (some weird errors may occur)"),
 				   file);
 	}
 
-	if (gda_server_op_dtd)
-		gda_server_op_dtd->name = xmlStrdup((xmlChar*) "serv_op");
+	if (_gda_server_op_dtd)
+		_gda_server_op_dtd->name = xmlStrdup((xmlChar*) "serv_op");
 	g_free (file);
 
 	initialized = TRUE;
diff --git a/libgda/gda-meta-struct-io.c b/libgda/gda-meta-struct-io.c
index 9889292..87dad6a 100644
--- a/libgda/gda-meta-struct-io.c
+++ b/libgda/gda-meta-struct-io.c
@@ -212,7 +212,7 @@ create_table_object (GdaMetaStruct *mstruct, const GValue *catalog, const gchar
 	dbobj->obj_name = g_strdup ((gchar *) table_name);
 	dbobj->obj_full_name = full_table_name->str;
 	g_string_free (full_table_name, FALSE);
-	dbobj = gda_meta_struct_add_db_object (mstruct, dbobj, error);
+	dbobj = _gda_meta_struct_add_db_object (mstruct, dbobj, error);
 	if (!dbobj)
 		goto onerror;
 	
@@ -334,7 +334,7 @@ create_table_object (GdaMetaStruct *mstruct, const GValue *catalog, const gchar
 				ref_obj->obj_name = name_part;
 				ref_obj->obj_schema = schema_part;
 				xmlFree (ref_table);
-				ref_obj = gda_meta_struct_add_db_object (mstruct, ref_obj, error);
+				ref_obj = _gda_meta_struct_add_db_object (mstruct, ref_obj, error);
 				if (! ref_obj) 
 					goto onerror;
 			}
diff --git a/libgda/gda-meta-struct-private.h b/libgda/gda-meta-struct-private.h
index d7310d4..f1216e1 100644
--- a/libgda/gda-meta-struct-private.h
+++ b/libgda/gda-meta-struct-private.h
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-GdaMetaDbObject    *gda_meta_struct_add_db_object      (GdaMetaStruct *mstruct, GdaMetaDbObject *dbo, GError **error);
+GdaMetaDbObject    *_gda_meta_struct_add_db_object      (GdaMetaStruct *mstruct, GdaMetaDbObject *dbo, GError **error);
 gboolean            gda_meta_struct_load_from_xml_file (GdaMetaStruct *mstruct, const gchar *catalog, const gchar *schema, 
 							const gchar *xml_spec_file, GError **error);
 
diff --git a/libgda/gda-meta-struct.c b/libgda/gda-meta-struct.c
index bc79925..21fc766 100644
--- a/libgda/gda-meta-struct.c
+++ b/libgda/gda-meta-struct.c
@@ -2546,7 +2546,7 @@ copyerror:
 }
 
 /**
- * gda_meta_struct_add_db_object:
+ * _gda_meta_struct_add_db_object:
  * @mstruct: a #GdaMetaStruct object
  * @dbo: a #GdaMetaDbObject structure
  * @error: (allow-none): a place to store errors, or %NULL
@@ -2559,7 +2559,7 @@ copyerror:
  * Returns: (transfer none): a pointer to the #GdaMetaDbObject used in @mstruct to represent the added database object (may be @dbo or not)
  */
 GdaMetaDbObject *
-gda_meta_struct_add_db_object (GdaMetaStruct *mstruct, GdaMetaDbObject *dbo, GError **error)
+_gda_meta_struct_add_db_object (GdaMetaStruct *mstruct, GdaMetaDbObject *dbo, GError **error)
 {
 	GdaMetaDbObject *edbo;
 	GValue *v1 = NULL, *v2 = NULL, *v3 = NULL;
diff --git a/libgda/gda-server-operation.c b/libgda/gda-server-operation.c
index f1f7823..bb22c2f 100644
--- a/libgda/gda-server-operation.c
+++ b/libgda/gda-server-operation.c
@@ -83,7 +83,7 @@ enum
 	PROP_SPEC_FILE
 };
 
-extern xmlDtdPtr gda_server_op_dtd;
+extern xmlDtdPtr _gda_server_op_dtd;
 static GObjectClass *parent_class = NULL;
 
 typedef struct _Node {
@@ -684,15 +684,15 @@ use_xml_spec (GdaServerOperation *op, xmlDocPtr doc, const gchar *xmlfile)
 	xmlDoValidityCheckingDefaultValue = 1;
 	
 	/* replace the DTD with ours */
-	if (gda_server_op_dtd) {
+	if (_gda_server_op_dtd) {
 		old_dtd = doc->intSubset;
-		doc->intSubset = gda_server_op_dtd;
+		doc->intSubset = _gda_server_op_dtd;
 	}
 #ifndef G_OS_WIN32
 	if (doc->intSubset && !xmlValidateDocument (validc, doc)) {
 		gchar *str;
 		
-		if (gda_server_op_dtd)
+		if (_gda_server_op_dtd)
 			doc->intSubset = old_dtd;
 		xmlFreeDoc (doc);
 		g_free (validc);
@@ -723,7 +723,7 @@ use_xml_spec (GdaServerOperation *op, xmlDocPtr doc, const gchar *xmlfile)
 	
 	xmlDoValidityCheckingDefaultValue = xmlcheck;
 	g_free (validc);
-	if (gda_server_op_dtd)
+	if (_gda_server_op_dtd)
 		doc->intSubset = old_dtd;
 	op->priv->xml_spec_doc = doc;
 
diff --git a/libgda/gda-tree-node.c b/libgda/gda-tree-node.c
index 1d61b00..5e46be2 100644
--- a/libgda/gda-tree-node.c
+++ b/libgda/gda-tree-node.c
@@ -78,7 +78,7 @@ enum {
 };
 
 static GObjectClass *parent_class = NULL;
-GdaAttributesManager *gda_tree_node_attributes_manager;
+GdaAttributesManager *_gda_tree_node_attributes_manager;
 
 static void m_node_changed (GdaTreeNode *reporting, GdaTreeNode *node);
 static void m_node_inserted (GdaTreeNode *reporting, GdaTreeNode *node);
@@ -189,7 +189,7 @@ gda_tree_node_class_init (GdaTreeNodeClass *klass)
 	object_class->dispose = gda_tree_node_dispose;
 
 	/* extra */
-	gda_tree_node_attributes_manager = gda_attributes_manager_new (TRUE, NULL, NULL);
+	_gda_tree_node_attributes_manager = gda_attributes_manager_new (TRUE, NULL, NULL);
 }
 
 static void
@@ -345,7 +345,7 @@ gda_tree_node_set_property (GObject *object,
         if (tnode->priv) {
                 switch (param_id) {
 		case PROP_NAME:
-			gda_attributes_manager_set (gda_tree_node_attributes_manager, tnode, GDA_ATTRIBUTE_NAME, value);
+			gda_attributes_manager_set (_gda_tree_node_attributes_manager, tnode, GDA_ATTRIBUTE_NAME, value);
 			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -366,7 +366,7 @@ gda_tree_node_get_property (GObject *object,
 	if (tnode->priv) {
 		switch (param_id) {
 		case PROP_NAME: {
-			const GValue *cvalue = gda_attributes_manager_get (gda_tree_node_attributes_manager, tnode,
+			const GValue *cvalue = gda_attributes_manager_get (_gda_tree_node_attributes_manager, tnode,
 									   GDA_ATTRIBUTE_NAME);
 			g_value_set_string (value, cvalue ? g_value_get_string (cvalue): NULL);
 			break;
@@ -391,7 +391,7 @@ gda_tree_node_dump_header (GdaTreeNode *node)
 {
 	const GValue *cvalue;
 
-	cvalue = gda_attributes_manager_get (gda_tree_node_attributes_manager, node,
+	cvalue = gda_attributes_manager_get (_gda_tree_node_attributes_manager, node,
 					     GDA_ATTRIBUTE_NAME);
 	if (g_getenv ("GDA_TREE_DUMP_ALL_ATTRIBUTES")) {
 		GString *string;
@@ -401,7 +401,7 @@ gda_tree_node_dump_header (GdaTreeNode *node)
 		else
 			g_string_append (string, "Unnamed node");
 		g_string_append_c (string, ':');
-		gda_attributes_manager_foreach (gda_tree_node_attributes_manager, node,
+		gda_attributes_manager_foreach (_gda_tree_node_attributes_manager, node,
 						(GdaAttributesManagerFunc) attributes_foreach_func, string);
 		return g_string_free (string, FALSE);
 	}
@@ -686,7 +686,7 @@ gda_tree_node_fetch_attribute (GdaTreeNode *node, const gchar *attribute)
 	const GValue *cvalue;
 	g_return_val_if_fail (GDA_IS_TREE_NODE (node), NULL);
 
-	cvalue = gda_attributes_manager_get (gda_tree_node_attributes_manager, node, attribute);
+	cvalue = gda_attributes_manager_get (_gda_tree_node_attributes_manager, node, attribute);
 	if (!cvalue && node->priv->parent)
 		cvalue = gda_tree_node_fetch_attribute (node->priv->parent, attribute);
 	return cvalue;
@@ -713,7 +713,7 @@ gda_tree_node_get_node_attribute (GdaTreeNode *node, const gchar *attribute)
 {
 	g_return_val_if_fail (GDA_IS_TREE_NODE (node), NULL);
 
-	return gda_attributes_manager_get (gda_tree_node_attributes_manager, node, attribute);
+	return gda_attributes_manager_get (_gda_tree_node_attributes_manager, node, attribute);
 }
 
 /**
@@ -750,7 +750,7 @@ gda_tree_node_set_node_attribute (GdaTreeNode *node, const gchar *attribute, con
 	g_return_if_fail (GDA_IS_TREE_NODE (node));
 	g_return_if_fail (attribute);
 
-	cvalue = gda_attributes_manager_get (gda_tree_node_attributes_manager, node, attribute);
+	cvalue = gda_attributes_manager_get (_gda_tree_node_attributes_manager, node, attribute);
 	if ((value && cvalue && !gda_value_differ (cvalue, value)) ||
 	    (!value && !cvalue))
 		return;
@@ -767,7 +767,7 @@ gda_tree_node_set_node_attribute (GdaTreeNode *node, const gchar *attribute, con
 			nuc = TRUE;
 
 		if (ouc != nuc) {
-			gda_attributes_manager_set_full (gda_tree_node_attributes_manager, node,
+			gda_attributes_manager_set_full (_gda_tree_node_attributes_manager, node,
 							 attribute, value, destroy);
 			g_signal_emit (node, gda_tree_node_signals[NODE_HAS_CHILD_TOGGLED], 0, node);
 			g_signal_emit (node, gda_tree_node_signals[NODE_CHANGED], 0, node);
@@ -775,7 +775,7 @@ gda_tree_node_set_node_attribute (GdaTreeNode *node, const gchar *attribute, con
 		}
 	}
 
-	gda_attributes_manager_set_full (gda_tree_node_attributes_manager, node, attribute,
+	gda_attributes_manager_set_full (_gda_tree_node_attributes_manager, node, attribute,
 					 value, destroy);
 	g_signal_emit (node, gda_tree_node_signals[NODE_CHANGED], 0, node);
 }
@@ -887,7 +887,7 @@ gda_tree_node_get_child_name (GdaTreeNode *node, const gchar *name)
 			GSList *list;
 			for (list = tn->nodes; list; list = list->next) {
 				const GValue *cvalue;
-				cvalue = gda_attributes_manager_get (gda_tree_node_attributes_manager, list->data,
+				cvalue = gda_attributes_manager_get (_gda_tree_node_attributes_manager, list->data,
 								     GDA_ATTRIBUTE_NAME);
 				if (cvalue) {
 					const gchar *cname = g_value_get_string (cvalue);
diff --git a/libgda/gda-tree.c b/libgda/gda-tree.c
index c9ec43a..0a3aca4 100644
--- a/libgda/gda-tree.c
+++ b/libgda/gda-tree.c
@@ -63,7 +63,7 @@ enum {
 };
 
 static gint gda_tree_signals[LAST_SIGNAL] = { 0, 0, 0, 0 };
-extern GdaAttributesManager *gda_tree_node_attributes_manager;
+extern GdaAttributesManager *_gda_tree_node_attributes_manager;
 
 /* properties */
 enum {
@@ -350,7 +350,7 @@ static void
 dump_root_attributes (GdaTreeNode *root)
 {
 	g_print ("DUMPING attributes for %p\n", root);
-	gda_attributes_manager_foreach (gda_tree_node_attributes_manager, root,
+	gda_attributes_manager_foreach (_gda_tree_node_attributes_manager, root,
 					(GdaAttributesManagerFunc) dump_attr_foreach_func, NULL);
 }
 #endif
@@ -373,8 +373,8 @@ gda_tree_clean (GdaTree *tree)
 
 	new_root = gda_tree_node_new (NULL);
 
-	gda_attributes_manager_copy (gda_tree_node_attributes_manager, (gpointer) tree->priv->root,
-				     gda_tree_node_attributes_manager, (gpointer) new_root);
+	gda_attributes_manager_copy (_gda_tree_node_attributes_manager, (gpointer) tree->priv->root,
+				     _gda_tree_node_attributes_manager, (gpointer) new_root);
 
 	take_root_node (tree, new_root);
 }
diff --git a/libgda/gda-value.c b/libgda/gda-value.c
index d047933..7790402 100644
--- a/libgda/gda-value.c
+++ b/libgda/gda-value.c
@@ -1513,7 +1513,7 @@ gda_value_new_blob_from_file (const gchar *filename)
 	GdaBlob *blob;
 
 	blob = g_new0 (GdaBlob, 1);
-	blob->op = gda_dir_blob_op_new (filename);
+	blob->op = _gda_dir_blob_op_new (filename);
 
         value = g_new0 (GValue, 1);
 	g_value_init (value, GDA_TYPE_BLOB);
diff --git a/libgda/libgda.symbols b/libgda/libgda.symbols
index 6815eee..2c70394 100644
--- a/libgda/libgda.symbols
+++ b/libgda/libgda.symbols
@@ -9,7 +9,6 @@
 	fnYM49765777344607__gda_gbr_find_prefix
 	fnYM49765777344607__gda_gbr_find_sbin_dir
 	gda_alphanum_to_text
-	gda_array_dtd
 	gda_attributes_manager_clear
 	gda_attributes_manager_copy
 	gda_attributes_manager_foreach
@@ -42,7 +41,6 @@
 	gda_blob_op_write_all
 	gda_blob_set_op
 	gda_blob_to_string
-	gda_column_attributes_manager
 	gda_column_copy
 	gda_column_get_allow_null
 	gda_column_get_attribute
@@ -349,10 +347,6 @@
 	gda_default_get_type
 	gda_default_unescape_string
 	gda_diff_type_get_type
-	gda_dir_blob_get_filename
-	gda_dir_blob_op_get_type
-	gda_dir_blob_op_new
-	gda_dir_blob_set_filename
 	gda_dsn_split
 	gda_gbr_get_file_path
 	gda_gbr_init
@@ -484,7 +478,6 @@
 	gda_meta_store_set_reserved_keywords_func
 	gda_meta_store_sql_identifier_quote
 	gda_meta_store_undeclare_foreign_key
-	gda_meta_struct_add_db_object
 	gda_meta_struct_complement
 	gda_meta_struct_complement_all
 	gda_meta_struct_complement_default
@@ -560,7 +553,6 @@
 	gda_row_value_is_valid
 	gda_row_value_is_valid_e
 	gda_select_alter_select_for_empty
-	gda_server_op_dtd
 	gda_server_operation_add_item_to_sequence
 	gda_server_operation_del_item_from_sequence
 	gda_server_operation_error_quark
@@ -916,7 +908,6 @@
 	gda_tree_mgr_tables_get_type
 	gda_tree_mgr_tables_new
 	gda_tree_new
-	gda_tree_node_attributes_manager
 	gda_tree_node_error_get_type
 	gda_tree_node_error_quark
 	gda_tree_node_fetch_attribute
@@ -985,10 +976,6 @@
 	gda_vconnection_data_model_get_table_name
 	gda_vconnection_data_model_get_type
 	gda_vconnection_data_model_remove
-	gda_vconnection_data_model_table_data_free
-	gda_vconnection_get_table_data_by_model
-	gda_vconnection_get_table_data_by_name
-	gda_vconnection_get_table_data_by_unique_name
 	gda_vconnection_hub_add
 	gda_vconnection_hub_foreach
 	gda_vconnection_hub_get_connection
diff --git a/libgda/sqlite/virtual/gda-vconnection-data-model-private.h b/libgda/sqlite/virtual/gda-vconnection-data-model-private.h
index ece8e0e..e2f1ed0 100644
--- a/libgda/sqlite/virtual/gda-vconnection-data-model-private.h
+++ b/libgda/sqlite/virtual/gda-vconnection-data-model-private.h
@@ -95,11 +95,11 @@ struct GdaVConnectionTableData {
 
 void                     _gda_vconnection_virtual_filtered_data_unref (VirtualFilteredData *data);
 
-void                     gda_vconnection_data_model_table_data_free (GdaVConnectionTableData *td);
+void                     _gda_vconnection_data_model_table_data_free (GdaVConnectionTableData *td);
 
-GdaVConnectionTableData *gda_vconnection_get_table_data_by_name (GdaVconnectionDataModel *cnc, const gchar *table_name);
-GdaVConnectionTableData *gda_vconnection_get_table_data_by_model (GdaVconnectionDataModel *cnc, GdaDataModel *model);
-GdaVConnectionTableData *gda_vconnection_get_table_data_by_unique_name (GdaVconnectionDataModel *cnc, const gchar *unique_name);
+GdaVConnectionTableData *_gda_vconnection_get_table_data_by_name (GdaVconnectionDataModel *cnc, const gchar *table_name);
+GdaVConnectionTableData *_gda_vconnection_get_table_data_by_model (GdaVconnectionDataModel *cnc, GdaDataModel *model);
+GdaVConnectionTableData *_gda_vconnection_get_table_data_by_unique_name (GdaVconnectionDataModel *cnc, const gchar *unique_name);
 
 void                     _gda_vconnection_set_working_obj (GdaVconnectionDataModel *cnc, GObject *obj);
 void                     _gda_vconnection_change_working_obj (GdaVconnectionDataModel *cnc, GObject *obj);
diff --git a/libgda/sqlite/virtual/gda-vconnection-data-model.c b/libgda/sqlite/virtual/gda-vconnection-data-model.c
index a79560a..8fc0977 100644
--- a/libgda/sqlite/virtual/gda-vconnection-data-model.c
+++ b/libgda/sqlite/virtual/gda-vconnection-data-model.c
@@ -78,7 +78,7 @@ static void
 vtable_dropped (GdaVconnectionDataModel *cnc, const gchar *table_name)
 {
 	GdaVConnectionTableData *td;
-	td = gda_vconnection_get_table_data_by_name (cnc, table_name);
+	td = _gda_vconnection_get_table_data_by_name (cnc, table_name);
 	if (td)
 		cnc->priv->table_data_list = g_slist_remove (cnc->priv->table_data_list, td);
 	_gda_connection_signal_meta_table_update ((GdaConnection *)cnc, table_name);
@@ -335,7 +335,7 @@ gda_vconnection_data_model_add (GdaVconnectionDataModel *cnc, GdaVconnectionData
 			     GDA_SERVER_PROVIDER_INTERNAL_ERROR,
 			     "%s", zErrMsg);
 		SQLITE3_CALL (sqlite3_free) (zErrMsg);
-		gda_vconnection_data_model_table_data_free (td);
+		_gda_vconnection_data_model_table_data_free (td);
 		cnc->priv->table_data_list = g_slist_remove (cnc->priv->table_data_list, td);
 		retval = FALSE;
 	}
@@ -382,7 +382,7 @@ get_rid_of_vtable (GdaVconnectionDataModel *cnc, GdaVConnectionTableData *td, gb
 	g_signal_emit (G_OBJECT (cnc), gda_vconnection_data_model_signals[VTABLE_DROPPED], 0,
 		       td->table_name);
 	/*g_print ("Virtual connection: removed table %s (%p)\n", td->table_name, td->spec->data_model);*/
-	gda_vconnection_data_model_table_data_free (td);
+	_gda_vconnection_data_model_table_data_free (td);
 
 	return allok;
 }
@@ -406,7 +406,7 @@ gda_vconnection_data_model_remove (GdaVconnectionDataModel *cnc, const gchar *ta
 	g_return_val_if_fail (GDA_IS_VCONNECTION_DATA_MODEL (cnc), FALSE);
 	g_return_val_if_fail (table_name && *table_name, FALSE);
 
-	td = gda_vconnection_get_table_data_by_name (cnc, table_name);
+	td = _gda_vconnection_get_table_data_by_name (cnc, table_name);
 	if (!td) {
 		g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
 			     GDA_SERVER_PROVIDER_MISUSE_ERROR,
@@ -436,7 +436,7 @@ gda_vconnection_data_model_get (GdaVconnectionDataModel *cnc, const gchar *table
 	g_return_val_if_fail (GDA_IS_VCONNECTION_DATA_MODEL (cnc), NULL);
 	if (!table_name || !(*table_name))
 		return NULL;
-	td = gda_vconnection_get_table_data_by_name (cnc, table_name);
+	td = _gda_vconnection_get_table_data_by_name (cnc, table_name);
 	if (td)
 		return td->spec;
 	else
@@ -463,7 +463,7 @@ gda_vconnection_data_model_get_model (GdaVconnectionDataModel *cnc, const gchar
 	if (!table_name || !(*table_name))
 		return NULL;
 
-	td = gda_vconnection_get_table_data_by_name (cnc, table_name);
+	td = _gda_vconnection_get_table_data_by_name (cnc, table_name);
 	if (td)
 		return td->spec->data_model;
 	else
@@ -489,7 +489,7 @@ gda_vconnection_data_model_get_table_name (GdaVconnectionDataModel *cnc, GdaData
 		return NULL;
 	g_return_val_if_fail (GDA_IS_DATA_MODEL (model), NULL);
 
-	td = gda_vconnection_get_table_data_by_model (cnc, model);
+	td = _gda_vconnection_get_table_data_by_model (cnc, model);
 	if (td)
 		return td->table_name;
 	else
@@ -531,7 +531,7 @@ gda_vconnection_data_model_foreach (GdaVconnectionDataModel *cnc,
  * private 
  */
 GdaVConnectionTableData *
-gda_vconnection_get_table_data_by_name (GdaVconnectionDataModel *cnc, const gchar *table_name)
+_gda_vconnection_get_table_data_by_name (GdaVconnectionDataModel *cnc, const gchar *table_name)
 {
 	GSList *list;
 	gchar *quoted;
@@ -549,7 +549,7 @@ gda_vconnection_get_table_data_by_name (GdaVconnectionDataModel *cnc, const gcha
 }
 
 GdaVConnectionTableData *
-gda_vconnection_get_table_data_by_unique_name (GdaVconnectionDataModel *cnc, const gchar *unique_name)
+_gda_vconnection_get_table_data_by_unique_name (GdaVconnectionDataModel *cnc, const gchar *unique_name)
 {
 	GSList *list;
 	for (list = cnc->priv->table_data_list; list; list = list->next) {
@@ -560,7 +560,7 @@ gda_vconnection_get_table_data_by_unique_name (GdaVconnectionDataModel *cnc, con
 }
 
 GdaVConnectionTableData *
-gda_vconnection_get_table_data_by_model (GdaVconnectionDataModel *cnc, GdaDataModel *model)
+_gda_vconnection_get_table_data_by_model (GdaVconnectionDataModel *cnc, GdaDataModel *model)
 {
 	GSList *list;
 	for (list = cnc->priv->table_data_list; list; list = list->next) {
@@ -571,7 +571,7 @@ gda_vconnection_get_table_data_by_model (GdaVconnectionDataModel *cnc, GdaDataMo
 }
 
 void
-gda_vconnection_data_model_table_data_free (GdaVConnectionTableData *td)
+_gda_vconnection_data_model_table_data_free (GdaVConnectionTableData *td)
 {
 	ParamType i;
 
diff --git a/libgda/sqlite/virtual/gda-vprovider-data-model.c b/libgda/sqlite/virtual/gda-vprovider-data-model.c
index edff86f..0a6f56e 100644
--- a/libgda/sqlite/virtual/gda-vprovider-data-model.c
+++ b/libgda/sqlite/virtual/gda-vprovider-data-model.c
@@ -525,7 +525,7 @@ virtualCreate (sqlite3 *db, void *pAux, int argc, const char *const *argv, sqlit
 	if (*spec_name == '\'')
 		memmove (spec_name, spec_name+1, i);
 
-	td = gda_vconnection_get_table_data_by_unique_name (cnc, spec_name);
+	td = _gda_vconnection_get_table_data_by_unique_name (cnc, spec_name);
 	g_free (spec_name);
 	if (!td) {
 		/* wrong usage! */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]