[libgda] Misc corrections
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Misc corrections
- Date: Thu, 6 May 2010 19:17:33 +0000 (UTC)
commit 977ba00323c98dd8148748ddd0685ff26b854b2a
Author: Vivien Malerba <malerba gnome-db org>
Date: Thu May 6 21:06:18 2010 +0200
Misc corrections
configure.in | 3 ++-
doc/C/Makefile.am | 5 +++--
doc/C/libgda-ui-sections.txt | 3 ---
doc/C/tmpl/gda-batch.sgml | 3 +++
doc/C/tmpl/gda-column.sgml | 7 +++++++
doc/C/tmpl/gda-config.sgml | 12 ++++++++++++
doc/C/tmpl/gda-connection.sgml | 13 +++++++++++++
doc/C/tmpl/gda-data-model-iter.sgml | 5 +++++
doc/C/tmpl/gda-data-proxy.sgml | 21 ++++++++++++++++++++-
doc/C/tmpl/gda-sql-statement.sgml | 21 +++------------------
doc/C/tmpl/provider-support.sgml | 13 +++++++++++++
libgda-ui/data-entries/plugins/Makefile.am | 3 ++-
libgda-ui/gdaui-basic-form.h | 2 ++
libgda-ui/gdaui-cloud.h | 2 +-
libgda-ui/gdaui-combo.c | 2 +-
libgda-ui/gdaui-form.h | 2 +-
libgda-ui/gdaui-grid.h | 2 +-
libgda-ui/gdaui-server-operation.c | 2 +-
libgda-ui/gdaui-tree-store.c | 4 ++--
libgda-ui/internal/utility.c | 7 ++++---
libgda/gda-blob-op.c | 2 +-
libgda/gda-server-provider-extra.c | 4 ++--
libgda/gda-sql-builder.h | 1 +
libgda/gda-tree-manager.h | 3 +++
libgda/gda-tree-mgr-columns.c | 2 ++
libgda/gda-tree-mgr-columns.h | 1 +
libgda/gda-tree-mgr-label.h | 1 +
libgda/gda-tree-mgr-schemas.h | 1 +
libgda/gda-tree-mgr-select.h | 1 +
libgda/gda-tree-mgr-tables.c | 1 +
libgda/gda-tree-mgr-tables.h | 1 +
libgda/gda-tree-node.h | 2 ++
libgda/gda-tree.h | 2 ++
libgda/gda-util.c | 2 +-
libgda/gda-util.h | 5 +++++
libgda/libgda.symbols | 1 +
libgda/thread-wrapper/gda-thread-wrapper.h | 1 +
providers/mysql/gda-mysql-recordset.c | 2 +-
38 files changed, 124 insertions(+), 41 deletions(-)
---
diff --git a/configure.in b/configure.in
index bb11fd8..d9b23fe 100644
--- a/configure.in
+++ b/configure.in
@@ -104,7 +104,6 @@ AC_PROG_CC
AC_PROG_CXX
AM_PROG_CC_C_O
AC_STDC_HEADERS
-AC_ARG_PROGRAM
AM_PROG_LIBTOOL
AC_PROG_MAKE_SET
@@ -1829,6 +1828,8 @@ mv ${srcdir}/doc/C/version.xml.tmp ${srcdir}/doc/C/version.xml
cp ${srcdir}/doc/C/libgda-sections.txt doc/C/libgda-4.0-sections.txt
echo "" >> doc/C/libgda-4.0-sections.txt
cat ${srcdir}/doc/C/libgda-ui-sections.txt >> doc/C/libgda-4.0-sections.txt
+cp doc/C/libgda-4.0-sections.txt ${srcdir}/doc/C/libgda-4.0-sections.txt.tmp
+mv ${srcdir}/doc/C/libgda-4.0-sections.txt.tmp ${srcdir}/doc/C/libgda-4.0-sections.txt
cp doc/C/libgda.types doc/C/libgda-4.0.types
if test x$have_ui != xno
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index f00f612..cc7ab31 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -48,7 +48,7 @@ GTKDOC_LIBS += $(GTK_LIBS) \
endif
# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gda --ignore-files="parser.c binreloc.c libcsv.c md5c.c"
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gda --ignore-files="parser.c delimiter.c binreloc.c libcsv.c md5c.c providers tools control-center tests samples plugins"
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
content_files = fdl-appendix.sgml version.xml
@@ -82,7 +82,8 @@ EXTRA_DIST += examples/full_example.c installation.xml limitations.xml migration
architecture.svg parts.svg stmt-unknown.svg stmt-select.svg stmt-insert1.svg stmt-insert2.svg \
stmt-update.svg stmt-compound.svg information_schema.svg howto-exec.svg thread-wrapper.svg \
version.xml.in \
- visual_index.xml prov-notes.xml
+ visual_index.xml prov-notes.xml \
+ libgda-sections.txt libgda-ui-sections.txt libgda.types libgda.types.in libgda-ui.types
# Files not to distribute
# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/doc/C/libgda-ui-sections.txt b/doc/C/libgda-ui-sections.txt
index 62266b5..f33a0ef 100644
--- a/doc/C/libgda-ui-sections.txt
+++ b/doc/C/libgda-ui-sections.txt
@@ -138,7 +138,6 @@ gdaui_data_filter_get_type
<TITLE>GdauiDataProxy</TITLE>
GdauiDataProxy
GdauiDataProxyIface
-gdaui_data_proxy_new
gdaui_data_proxy_get_proxy
gdaui_data_proxy_get_actions_group
GdauiAction
@@ -151,7 +150,6 @@ gdaui_data_proxy_get_write_mode
<SUBSECTION Standard>
GDAUI_DATA_PROXY
GDAUI_IS_DATA_PROXY
-GDAUI_DATA_PROXY_CLASS
GDAUI_TYPE_DATA_PROXY
gdaui_data_proxy_get_type
</SECTION>
@@ -297,7 +295,6 @@ gdaui_tree_store_get_type
GdauiCloud
gdaui_cloud_new
gdaui_cloud_set_selection_mode
-gdaui_cloud_get_selection
gdaui_cloud_filter
gdaui_cloud_create_filter_widget
GdauiCloudWeightFunc
diff --git a/doc/C/tmpl/gda-batch.sgml b/doc/C/tmpl/gda-batch.sgml
index 7c12079..526add7 100644
--- a/doc/C/tmpl/gda-batch.sgml
+++ b/doc/C/tmpl/gda-batch.sgml
@@ -35,6 +35,9 @@ a #GdaSqlParser object.
</para>
+@:
+@:
+
@gdabatch: the object which received the signal.
@arg1:
diff --git a/doc/C/tmpl/gda-column.sgml b/doc/C/tmpl/gda-column.sgml
index 13be76a..2673d9f 100644
--- a/doc/C/tmpl/gda-column.sgml
+++ b/doc/C/tmpl/gda-column.sgml
@@ -32,6 +32,10 @@ Management of #GdaDataModel column attributes
</para>
+@:
+@:
+@:
+
@gdacolumn: the object which received the signal.
@arg1:
@arg2:
@@ -41,6 +45,9 @@ Management of #GdaDataModel column attributes
</para>
+@:
+@:
+
@gdacolumn: the object which received the signal.
@arg1:
diff --git a/doc/C/tmpl/gda-config.sgml b/doc/C/tmpl/gda-config.sgml
index 02ef003..3fc242e 100644
--- a/doc/C/tmpl/gda-config.sgml
+++ b/doc/C/tmpl/gda-config.sgml
@@ -59,6 +59,9 @@ g_object_new (GDA_TYPE_CONFIG, "user-file", "my_file", NULL);
</para>
+@:
+@:
+
@gdaconfig: the object which received the signal.
@arg1:
@@ -67,6 +70,9 @@ g_object_new (GDA_TYPE_CONFIG, "user-file", "my_file", NULL);
</para>
+@:
+@:
+
@gdaconfig: the object which received the signal.
@arg1:
@@ -75,6 +81,9 @@ g_object_new (GDA_TYPE_CONFIG, "user-file", "my_file", NULL);
</para>
+@:
+@:
+
@gdaconfig: the object which received the signal.
@arg1:
@@ -83,6 +92,9 @@ g_object_new (GDA_TYPE_CONFIG, "user-file", "my_file", NULL);
</para>
+@:
+@:
+
@gdaconfig: the object which received the signal.
@arg1:
diff --git a/doc/C/tmpl/gda-connection.sgml b/doc/C/tmpl/gda-connection.sgml
index 7722371..6acd755 100644
--- a/doc/C/tmpl/gda-connection.sgml
+++ b/doc/C/tmpl/gda-connection.sgml
@@ -67,6 +67,8 @@ A connection to a database
</para>
+@:
+
@gdaconnection: the object which received the signal.
<!-- ##### SIGNAL GdaConnection::conn-opened ##### -->
@@ -74,6 +76,8 @@ A connection to a database
</para>
+@:
+
@gdaconnection: the object which received the signal.
<!-- ##### SIGNAL GdaConnection::conn-to-close ##### -->
@@ -81,6 +85,8 @@ A connection to a database
</para>
+@:
+
@gdaconnection: the object which received the signal.
<!-- ##### SIGNAL GdaConnection::dsn-changed ##### -->
@@ -88,6 +94,8 @@ A connection to a database
</para>
+@:
+
@gdaconnection: the object which received the signal.
<!-- ##### SIGNAL GdaConnection::error ##### -->
@@ -95,6 +103,9 @@ A connection to a database
</para>
+@:
+@:
+
@gdaconnection: the object which received the signal.
@arg1:
@@ -103,6 +114,8 @@ A connection to a database
</para>
+@:
+
@gdaconnection: the object which received the signal.
<!-- ##### ARG GdaConnection:auth-string ##### -->
diff --git a/doc/C/tmpl/gda-data-model-iter.sgml b/doc/C/tmpl/gda-data-model-iter.sgml
index db61e18..748c66b 100644
--- a/doc/C/tmpl/gda-data-model-iter.sgml
+++ b/doc/C/tmpl/gda-data-model-iter.sgml
@@ -70,6 +70,8 @@ Data model iterator
</para>
+@:
+
@gdadatamodeliter: the object which received the signal.
<!-- ##### SIGNAL GdaDataModelIter::row-changed ##### -->
@@ -77,6 +79,9 @@ Data model iterator
</para>
+@:
+@:
+
@gdadatamodeliter: the object which received the signal.
@arg1:
diff --git a/doc/C/tmpl/gda-data-proxy.sgml b/doc/C/tmpl/gda-data-proxy.sgml
index 3fc7b1a..a997ca3 100644
--- a/doc/C/tmpl/gda-data-proxy.sgml
+++ b/doc/C/tmpl/gda-data-proxy.sgml
@@ -130,6 +130,8 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
</para>
+@:
+
@gdadataproxy: the object which received the signal.
<!-- ##### SIGNAL GdaDataProxy::row-changes-applied ##### -->
@@ -137,6 +139,10 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
</para>
+@:
+@:
+@:
+
@gdadataproxy: the object which received the signal.
@arg1:
@arg2:
@@ -146,6 +152,10 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
</para>
+@:
+@:
+@:
+
@gdadataproxy: the object which received the signal.
@arg1:
@arg2:
@@ -155,6 +165,10 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
</para>
+@:
+@:
+@:
+
@gdadataproxy: the object which received the signal.
@arg1:
@arg2:
@@ -164,6 +178,9 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
</para>
+@:
+@:
+
@gdadataproxy: the object which received the signal.
@arg1:
@@ -172,12 +189,14 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
</para>
+@:
+@:
@:
+ Returns:
@Param2:
@Param3:
@Returns:
- Returns:
<!-- ##### ARG GdaDataProxy:defer-sync ##### -->
<para>
diff --git a/doc/C/tmpl/gda-sql-statement.sgml b/doc/C/tmpl/gda-sql-statement.sgml
index ac98b49..1f6f66d 100644
--- a/doc/C/tmpl/gda-sql-statement.sgml
+++ b/doc/C/tmpl/gda-sql-statement.sgml
@@ -232,26 +232,11 @@ Specifies the type of functions passed to gda_sql_any_part_foreach().
<!-- ##### STRUCT GdaSqlStatementUnknown ##### -->
<para>
- The SQL statement is of an unknown type (not any of the other parsed types). Such structure is created by the #GdaSqlParser object
- when it cannot parse the SQL string, or when operating in delimiter mode (it only tries to delimit statements if there are several
- ones in the same SQL string).
-<mediaobject>
- <imageobject role="html">
- <imagedata fileref="stmt-unknown.png" format="PNG"/>
- </imageobject>
- <caption>
- <para>
- Example of a #GdaSqlStatement having a #GdaSqlStatementUnknown as its contents (the parsed string is "a string;" which
- is not a valid SQL statement). The arrows are named after the attribute they represent (here the "expressions" attribute).
- Lists are represented by the GSList nodes and a "data" pointer which points to the data, and a "next" pointer which
- points to the next node in the list, all of the graphical items are in gray.
- </para>
- </caption>
-</mediaobject>
+
</para>
- any: inheritance structure
- expressions: a #GSList of #GdaSqlExpr expressions
+ any:
+ expressions:
@_gda_reserved1:
@_gda_reserved2:
diff --git a/doc/C/tmpl/provider-support.sgml b/doc/C/tmpl/provider-support.sgml
index e5b70f8..1e852ff 100644
--- a/doc/C/tmpl/provider-support.sgml
+++ b/doc/C/tmpl/provider-support.sgml
@@ -443,6 +443,19 @@ Methods dedicated to implementing providers
@Returns:
+<!-- ##### FUNCTION gda_compute_unique_table_row_condition_with_cnc ##### -->
+<para>
+
+</para>
+
+ cnc:
+ stsel:
+ mtable:
+ require_pk:
+ error:
+ Returns:
+
+
<!-- ##### FUNCTION gda_sql_any_part_check_structure ##### -->
<para>
diff --git a/libgda-ui/data-entries/plugins/Makefile.am b/libgda-ui/data-entries/plugins/Makefile.am
index e2bece1..26c4544 100644
--- a/libgda-ui/data-entries/plugins/Makefile.am
+++ b/libgda-ui/data-entries/plugins/Makefile.am
@@ -74,5 +74,6 @@ langspecdir=$(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/
langspec_DATA= \
gda-sql.lang
-EXTRA_DIST = $(xml_in_files)
+EXTRA_DIST = $(xml_in_files) \
+ $(langspec_DATA)
DISTCLEANFILES = $(xml_DATA)
diff --git a/libgda-ui/gdaui-basic-form.h b/libgda-ui/gdaui-basic-form.h
index c8c17ef..3ed16dd 100644
--- a/libgda-ui/gdaui-basic-form.h
+++ b/libgda-ui/gdaui-basic-form.h
@@ -30,6 +30,8 @@ G_BEGIN_DECLS
#define GDAUI_BASIC_FORM(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gdaui_basic_form_get_type(), GdauiBasicForm)
#define GDAUI_BASIC_FORM_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdaui_basic_form_get_type (), GdauiBasicFormClass)
#define GDAUI_IS_BASIC_FORM(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gdaui_basic_form_get_type ())
+#define GDAUI_IS_BASIC_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDAUI_TYPE_BASIC_FORM))
+#define GDAUI_BASIC_FORM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDAUI_TYPE_BASIC_FORM, GdauiBasicFormClass))
typedef struct _GdauiBasicForm GdauiBasicForm;
diff --git a/libgda-ui/gdaui-cloud.h b/libgda-ui/gdaui-cloud.h
index b828422..9797996 100644
--- a/libgda-ui/gdaui-cloud.h
+++ b/libgda-ui/gdaui-cloud.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
#define GDAUI_CLOUD(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gdaui_cloud_get_type(), GdauiCloud)
#define GDAUI_CLOUD_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdaui_cloud_get_type (), GdauiCloudClass)
#define GDAUI_IS_CLOUD(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gdaui_cloud_get_type ())
-
+#define GDAUI_IS_CLOUD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDAUI_TYPE_CLOUD))
typedef struct _GdauiCloud GdauiCloud;
typedef struct _GdauiCloudClass GdauiCloudClass;
diff --git a/libgda-ui/gdaui-combo.c b/libgda-ui/gdaui-combo.c
index afa351a..ee13485 100644
--- a/libgda-ui/gdaui-combo.c
+++ b/libgda-ui/gdaui-combo.c
@@ -648,7 +648,7 @@ gdaui_combo_add_null (GdauiCombo *combo, gboolean add_null)
*
* Tell if the currently selected entry represents the "undefined choice" entry.
*
- * Returns:
+ * Returns: %TRUE if the %NULL value is selected
*
* Since: 4.2
*/
diff --git a/libgda-ui/gdaui-form.h b/libgda-ui/gdaui-form.h
index b51c100..895e378 100644
--- a/libgda-ui/gdaui-form.h
+++ b/libgda-ui/gdaui-form.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
#define GDAUI_FORM(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gdaui_form_get_type(), GdauiForm)
#define GDAUI_FORM_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdaui_form_get_type (), GdauiFormClass)
#define GDAUI_IS_FORM(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gdaui_form_get_type ())
-
+#define GDAUI_IS_FORM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDAUI_TYPE_FORM))
typedef struct _GdauiForm GdauiForm;
typedef struct _GdauiFormClass GdauiFormClass;
diff --git a/libgda-ui/gdaui-grid.h b/libgda-ui/gdaui-grid.h
index cf65406..5bfd585 100644
--- a/libgda-ui/gdaui-grid.h
+++ b/libgda-ui/gdaui-grid.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
#define GDAUI_GRID(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gdaui_grid_get_type(), GdauiGrid)
#define GDAUI_GRID_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gdaui_grid_get_type (), GdauiGridClass)
#define GDAUI_IS_GRID(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gdaui_grid_get_type ())
-
+#define GDAUI_IS_GRID_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDAUI_TYPE_GRID))
typedef struct _GdauiGrid GdauiGrid;
typedef struct _GdauiGridClass GdauiGridClass;
diff --git a/libgda-ui/gdaui-server-operation.c b/libgda-ui/gdaui-server-operation.c
index 694c5c1..80de97d 100644
--- a/libgda-ui/gdaui-server-operation.c
+++ b/libgda-ui/gdaui-server-operation.c
@@ -219,7 +219,7 @@ gdaui_server_operation_init (GdauiServerOperation * wid)
/**
* gdaui_server_operation_new
- * @paramlist: a #GdaSet structure
+ * @op: a #GdaServerOperation structure
*
* Creates a new #GdauiServerOperation widget using all the parameters provided in @paramlist.
*
diff --git a/libgda-ui/gdaui-tree-store.c b/libgda-ui/gdaui-tree-store.c
index 06996d8..0d44d3c 100644
--- a/libgda-ui/gdaui-tree-store.c
+++ b/libgda-ui/gdaui-tree-store.c
@@ -380,7 +380,7 @@ gdaui_tree_store_get_property (GObject *object,
/**
* gdaui_tree_store_new
- * @model: a #GdaTree object
+ * @tree: a #GdaTree object
* @n_columns: number of columns in the tree store
* @Varargs: couples of (GType, attribute name) for each column, from first to last
*
@@ -432,7 +432,7 @@ gdaui_tree_store_new (GdaTree *tree, guint n_columns, ...)
/**
* gdaui_tree_store_newv
- * @model: a #GdaTree object
+ * @tree: a #GdaTree object
* @n_columns: number of columns in the tree store
* @types: an array of @n_columns GType to specify the type of each column
* @attribute_names: an array of @n_columns strings to specify the attribute name
diff --git a/libgda-ui/internal/utility.c b/libgda-ui/internal/utility.c
index 3dbb572..37d7a43 100644
--- a/libgda-ui/internal/utility.c
+++ b/libgda-ui/internal/utility.c
@@ -255,7 +255,8 @@ _gdaui_utility_proxy_compute_attributes_for_group (GdauiSetGroup *group, GdauiDa
}
/**
- * _gdaui_utility_proxy_compute_values_for_group
+ * _gdaui_utility_proxy_compute_values_for_group:
+ *
* Computes a list of values containing the individual values stored in @store and
* corresponding to the columns for the parameters if @group, at row pointed by @tree_iter.
*
@@ -270,8 +271,8 @@ _gdaui_utility_proxy_compute_attributes_for_group (GdauiSetGroup *group, GdauiDa
*/
GList *
_gdaui_utility_proxy_compute_values_for_group (GdauiSetGroup *group, GdauiDataStore *store,
- GdaDataModelIter *model_iter,
- GtkTreeIter *tree_iter, gboolean model_values)
+ GdaDataModelIter *model_iter,
+ GtkTreeIter *tree_iter, gboolean model_values)
{
gint offset;
GList *retval = NULL;
diff --git a/libgda/gda-blob-op.c b/libgda/gda-blob-op.c
index 7aeac97..061b072 100644
--- a/libgda/gda-blob-op.c
+++ b/libgda/gda-blob-op.c
@@ -20,7 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
-/**
+/*
* BLOB (Binary Large OBject) handling functions specific to each provider.
*/
diff --git a/libgda/gda-server-provider-extra.c b/libgda/gda-server-provider-extra.c
index 51f860d..20c6139 100644
--- a/libgda/gda-server-provider-extra.c
+++ b/libgda/gda-server-provider-extra.c
@@ -467,8 +467,8 @@ schema_get_spec (GdaConnectionSchema schema)
/**
* gda_server_provider_init_schema_model
- * @model:
- * @schema:
+ * @model: a #GdaDataModel
+ * @schema: a #GdaConnectionSchema
*
* Sets the column attributes of @model for the requested schema
*
diff --git a/libgda/gda-sql-builder.h b/libgda/gda-sql-builder.h
index 60984fe..3d9dad2 100644
--- a/libgda/gda-sql-builder.h
+++ b/libgda/gda-sql-builder.h
@@ -30,6 +30,7 @@ G_BEGIN_DECLS
#define GDA_SQL_BUILDER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_sql_builder_get_type(), GdaSqlBuilder)
#define GDA_SQL_BUILDER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_sql_builder_get_type (), GdaSqlBuilderClass)
#define GDA_IS_SQL_BUILDER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_sql_builder_get_type ())
+#define GDA_SQL_BUILDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_SQL_BUILDER, GdaSqlBuilderClass))
typedef struct _GdaSqlBuilder GdaSqlBuilder;
typedef struct _GdaSqlBuilderClass GdaSqlBuilderClass;
diff --git a/libgda/gda-tree-manager.h b/libgda/gda-tree-manager.h
index 30de4ab..1adcd0c 100644
--- a/libgda/gda-tree-manager.h
+++ b/libgda/gda-tree-manager.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
#define GDA_TREE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_TREE_MANAGER, GdaTreeManagerClass))
#define GDA_IS_TREE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_TREE_MANAGER))
#define GDA_IS_TREE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_TREE_MANAGER))
+#define GDA_TREE_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_TREE_MANAGER, GdaTreeManagerClass))
typedef GSList *(*GdaTreeManagerNodesFunc) (GdaTreeManager *manager, GdaTreeNode *node,
const GSList *children_nodes,
@@ -63,6 +64,8 @@ struct _GdaTreeManagerClass {
*/
GdaTreeManagerNodesFunc update_children;
+
+ /*< private >*/
/* Padding for future expansion */
void (*_gda_reserved1) (void);
void (*_gda_reserved2) (void);
diff --git a/libgda/gda-tree-mgr-columns.c b/libgda/gda-tree-mgr-columns.c
index be84c34..285f3c1 100644
--- a/libgda/gda-tree-mgr-columns.c
+++ b/libgda/gda-tree-mgr-columns.c
@@ -85,6 +85,7 @@ gda_tree_mgr_columns_class_init (GdaTreeMgrColumnsClass *klass)
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
/**
* GdaTreeMgrColumns:schema:
+ *
* If no set, then the table name will be fetched from the parent node using the "schema" attribute
*/
g_object_class_install_property (object_class, PROP_SCHEMA,
@@ -94,6 +95,7 @@ gda_tree_mgr_columns_class_init (GdaTreeMgrColumnsClass *klass)
/**
* GdaTreeMgrColumns:table-name:
+ *
* If no set, then the table name will be fetched from the parent node using the "table_name" attribute
*/
g_object_class_install_property (object_class, PROP_TABLE,
diff --git a/libgda/gda-tree-mgr-columns.h b/libgda/gda-tree-mgr-columns.h
index d5067ec..a9ccbd3 100644
--- a/libgda/gda-tree-mgr-columns.h
+++ b/libgda/gda-tree-mgr-columns.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
#define GDA_TREE_MGR_COLUMNS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_TREE_MGR_COLUMNS, GdaTreeMgrColumnsClass))
#define GDA_IS_TREE_MGR_COLUMNS(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_TREE_MGR_COLUMNS))
#define GDA_IS_TREE_MGR_COLUMNS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_TREE_MGR_COLUMNS))
+#define GDA_TREE_MGR_COLUMNS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_TREE_MGR_COLUMNS, GdaTreeMgrColumnsClass))
typedef struct _GdaTreeMgrColumns GdaTreeMgrColumns;
typedef struct _GdaTreeMgrColumnsPriv GdaTreeMgrColumnsPriv;
diff --git a/libgda/gda-tree-mgr-label.h b/libgda/gda-tree-mgr-label.h
index f84d827..c54e2ab 100644
--- a/libgda/gda-tree-mgr-label.h
+++ b/libgda/gda-tree-mgr-label.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
#define GDA_TREE_MGR_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_TREE_MGR_LABEL, GdaTreeMgrLabelClass))
#define GDA_IS_TREE_MGR_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_TREE_MGR_LABEL))
#define GDA_IS_TREE_MGR_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_TREE_MGR_LABEL))
+#define GDA_TREE_MGR_LABEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_TREE_MGR_LABEL, GdaTreeMgrLabelClass))
typedef struct _GdaTreeMgrLabel GdaTreeMgrLabel;
typedef struct _GdaTreeMgrLabelPriv GdaTreeMgrLabelPriv;
diff --git a/libgda/gda-tree-mgr-schemas.h b/libgda/gda-tree-mgr-schemas.h
index 3a40117..d0a0ad9 100644
--- a/libgda/gda-tree-mgr-schemas.h
+++ b/libgda/gda-tree-mgr-schemas.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
#define GDA_TREE_MGR_SCHEMAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_TREE_MGR_SCHEMAS, GdaTreeMgrSchemasClass))
#define GDA_IS_TREE_MGR_SCHEMAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_TREE_MGR_SCHEMAS))
#define GDA_IS_TREE_MGR_SCHEMAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_TREE_MGR_SCHEMAS))
+#define GDA_TREE_MGR_SCHEMAS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_TREE_MGR_SCHEMAS, GdaTreeMgrSchemasClass))
typedef struct _GdaTreeMgrSchemas GdaTreeMgrSchemas;
typedef struct _GdaTreeMgrSchemasPriv GdaTreeMgrSchemasPriv;
diff --git a/libgda/gda-tree-mgr-select.h b/libgda/gda-tree-mgr-select.h
index 832e279..811eb5d 100644
--- a/libgda/gda-tree-mgr-select.h
+++ b/libgda/gda-tree-mgr-select.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
#define GDA_TREE_MGR_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_TREE_MGR_SELECT, GdaTreeMgrSelectClass))
#define GDA_IS_TREE_MGR_SELECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_TREE_MGR_SELECT))
#define GDA_IS_TREE_MGR_SELECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_TREE_MGR_SELECT))
+#define GDA_TREE_MGR_SELECT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_TREE_MGR_SELECT, GdaTreeMgrSelectClass))
typedef struct _GdaTreeMgrSelect GdaTreeMgrSelect;
typedef struct _GdaTreeMgrSelectPriv GdaTreeMgrSelectPriv;
diff --git a/libgda/gda-tree-mgr-tables.c b/libgda/gda-tree-mgr-tables.c
index 90b0052..b4ac618 100644
--- a/libgda/gda-tree-mgr-tables.c
+++ b/libgda/gda-tree-mgr-tables.c
@@ -84,6 +84,7 @@ gda_tree_mgr_tables_class_init (GdaTreeMgrTablesClass *klass)
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
/**
* GdaTreeMgrTables:schema:
+ *
* If no set, then the table name will be fetched from the parent node using the "schema" attribute. If not
* found that way, then the list of visible tables (tables which can be identified without having to specify
* a schema) will be used
diff --git a/libgda/gda-tree-mgr-tables.h b/libgda/gda-tree-mgr-tables.h
index d716c01..f22e0da 100644
--- a/libgda/gda-tree-mgr-tables.h
+++ b/libgda/gda-tree-mgr-tables.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
#define GDA_TREE_MGR_TABLES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_TREE_MGR_TABLES, GdaTreeMgrTablesClass))
#define GDA_IS_TREE_MGR_TABLES(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_TREE_MGR_TABLES))
#define GDA_IS_TREE_MGR_TABLES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_TREE_MGR_TABLES))
+#define GDA_TREE_MGR_TABLES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_TREE_MGR_TABLES, GdaTreeMgrTablesClass))
typedef struct _GdaTreeMgrTables GdaTreeMgrTables;
typedef struct _GdaTreeMgrTablesPriv GdaTreeMgrTablesPriv;
diff --git a/libgda/gda-tree-node.h b/libgda/gda-tree-node.h
index bdfeb1b..970cc9d 100644
--- a/libgda/gda-tree-node.h
+++ b/libgda/gda-tree-node.h
@@ -33,6 +33,7 @@ G_BEGIN_DECLS
#define GDA_TREE_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_TREE_NODE, GdaTreeNodeClass))
#define GDA_IS_TREE_NODE(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_TREE_NODE))
#define GDA_IS_TREE_NODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_TREE_NODE))
+#define GDA_TREE_NODE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_TREE_NODE, GdaTreeNodeClass))
/* error reporting */
extern GQuark gda_tree_node_error_quark (void);
@@ -60,6 +61,7 @@ struct _GdaTreeNodeClass {
gchar *(*dump_header) (GdaTreeNode *node);
void (*dump_children) (GdaTreeNode *node, const gchar *prefix, GString *in_string);
+ /*< private >*/
/* Padding for future expansion */
void (*_gda_reserved1) (void);
void (*_gda_reserved2) (void);
diff --git a/libgda/gda-tree.h b/libgda/gda-tree.h
index a32efe7..d10efde 100644
--- a/libgda/gda-tree.h
+++ b/libgda/gda-tree.h
@@ -34,6 +34,7 @@ G_BEGIN_DECLS
#define GDA_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_TREE, GdaTreeClass))
#define GDA_IS_TREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_TREE))
#define GDA_IS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_TREE))
+#define GDA_TREE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_TREE, GdaTreeClass))
/* error reporting */
extern GQuark gda_tree_error_quark (void);
@@ -57,6 +58,7 @@ struct _GdaTreeClass {
void (* node_has_child_toggled) (GdaTree *tree, GdaTreeNode *node);
void (* node_deleted) (GdaTree *tree, const gchar *node_path);
+ /*< private >*/
/* Padding for future expansion */
void (*_gda_reserved1) (void);
void (*_gda_reserved2) (void);
diff --git a/libgda/gda-util.c b/libgda/gda-util.c
index 9317797..6dcff5d 100644
--- a/libgda/gda-util.c
+++ b/libgda/gda-util.c
@@ -1157,7 +1157,7 @@ gda_compute_dml_statements (GdaConnection *cnc, GdaStatement *select_stmt, gbool
* however that this GdaSqlStatement does not select anything (ie it would be rendered as "SELECT FROM ... WHERE ...")
* and before being usable, one needs to add some fields to actually select.
*
- * Returns; a new #GdaStatement if no error occurred, or %NULL otherwise
+ * Returns: a new #GdaStatement if no error occurred, or %NULL otherwise
*/
GdaSqlStatement *
gda_compute_select_statement_from_update (GdaStatement *update_stmt, GError **error)
diff --git a/libgda/gda-util.h b/libgda/gda-util.h
index b681933..fc8a052 100644
--- a/libgda/gda-util.h
+++ b/libgda/gda-util.h
@@ -72,6 +72,11 @@ gchar *gda_alphanum_to_text (gchar *text);
*/
GdaSqlExpr *gda_compute_unique_table_row_condition (GdaSqlStatementSelect *stsel, GdaMetaTable *mtable,
gboolean require_pk, GError **error);
+GdaSqlExpr *gda_compute_unique_table_row_condition_with_cnc (GdaConnection *cnc,
+ GdaSqlStatementSelect *stsel,
+ GdaMetaTable *mtable, gboolean require_pk,
+ GError **error);
+
gboolean gda_compute_dml_statements (GdaConnection *cnc, GdaStatement *select_stmt, gboolean require_pk,
GdaStatement **insert_stmt, GdaStatement **update_stmt, GdaStatement **delete_stmt,
GError **error);
diff --git a/libgda/libgda.symbols b/libgda/libgda.symbols
index d1cbf8a..75b7d4b 100644
--- a/libgda/libgda.symbols
+++ b/libgda/libgda.symbols
@@ -621,6 +621,7 @@
gda_sql_error_type_get_type
gda_sql_expr_copy
gda_sql_expr_free
+ gda_sql_expr_get_type
gda_sql_expr_new
gda_sql_expr_serialize
gda_sql_expr_take_select
diff --git a/libgda/thread-wrapper/gda-thread-wrapper.h b/libgda/thread-wrapper/gda-thread-wrapper.h
index 564c40a..534fb8c 100644
--- a/libgda/thread-wrapper/gda-thread-wrapper.h
+++ b/libgda/thread-wrapper/gda-thread-wrapper.h
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
#define GDA_THREAD_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_THREAD_WRAPPER, GdaThreadWrapperClass))
#define GDA_IS_THREAD_WRAPPER(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYPE_THREAD_WRAPPER))
#define GDA_IS_THREAD_WRAPPER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TYPE_THREAD_WRAPPER))
+#define GDA_THREAD_WRAPPER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDA_TYPE_THREAD_WRAPPER, GdaThreadWrapperClass))
typedef struct _GdaThreadWrapper GdaThreadWrapper;
typedef struct _GdaThreadWrapperClass GdaThreadWrapperClass;
diff --git a/providers/mysql/gda-mysql-recordset.c b/providers/mysql/gda-mysql-recordset.c
index e4f6921..48bd3fb 100644
--- a/providers/mysql/gda-mysql-recordset.c
+++ b/providers/mysql/gda-mysql-recordset.c
@@ -743,7 +743,7 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, gint rownum, GError **error)
g_set_error (error, GDA_SERVER_PROVIDER_ERROR,
GDA_SERVER_PROVIDER_DATA_ERROR,
_("Type %s not mapped for value %f"),
- g_type_name (type), doublevalue);
+ g_type_name (type), floatvalue);
}
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]