libgda: headers diff between 1.9.103 and 1.99.0 versions

	gda-connection.h	gda-connection.h

	skipping to change at line 154	skipping to change at line 154
	gboolean gda_connection_set_password (GdaConnection sr v, const gchar password);	gboolean gda_connection_set_password (GdaConnection sr v, const gchar password);

	void gda_connection_add_event (GdaConnection cn c, GdaConnectionEvent error);	void gda_connection_add_event (GdaConnection cn c, GdaConnectionEvent error);
	void gda_connection_add_event_string (GdaConnection cn c, const gchar str, ...);	void gda_connection_add_event_string (GdaConnection cn c, const gchar str, ...);
	void gda_connection_add_events_list (GdaConnection cn c, GList events_list);	void gda_connection_add_events_list (GdaConnection cn c, GList events_list);
	void gda_connection_clear_events_list (GdaConnection *cn c);	void gda_connection_clear_events_list (GdaConnection *cn c);
	const GList gda_connection_get_events (GdaConnection cn c);	const GList gda_connection_get_events (GdaConnection cn c);

	gboolean gda_connection_change_database (GdaConnection cn c, const gchar name);	gboolean gda_connection_change_database (GdaConnection cn c, const gchar name);


	#define GDA_CONNECTION_EXEC_FAILED ((void *) -1)	GdaDataModel gda_connection_execute_select_command (GdaConnection
	GdaDataModel gda_connection_execute_command (GdaConnection cn	cnc, GdaCommand *cmd,
	c, GdaCommand *cmd,	GdaParameterList
	GdaParameterList *	params, GError *error);
	params, GError **error);	gint gda_connection_execute_non_select_command (GdaConnecti
	GList gda_connection_execute_command_l (GdaConnection cn	on cnc, GdaCommand cmd,
	c, GdaCommand *cmd,	GdaParameter
		List params, GError *error);
		GList gda_connection_execute_command (GdaConnection cn
		c, GdaCommand *cmd,
	GdaParameterList * params, GError **error);	GdaParameterList * params, GError **error);
	gchar gda_connection_get_last_insert_id (GdaConnection cn c, GdaDataModel *recset);	gchar gda_connection_get_last_insert_id (GdaConnection cn c, GdaDataModel *recset);

	gboolean gda_connection_begin_transaction (GdaConnection cn c, GdaTransaction xaction);	gboolean gda_connection_begin_transaction (GdaConnection cn c, GdaTransaction xaction);
	gboolean gda_connection_commit_transaction (GdaConnection cn c, GdaTransaction xaction);	gboolean gda_connection_commit_transaction (GdaConnection cn c, GdaTransaction xaction);
	gboolean gda_connection_rollback_transaction (GdaConnection cn c, GdaTransaction xaction);	gboolean gda_connection_rollback_transaction (GdaConnection cn c, GdaTransaction xaction);

	GdaBlob gda_connection_create_blob (GdaConnection cn c);	GdaBlob gda_connection_create_blob (GdaConnection cn c);
	GdaBlob gda_connection_fetch_blob_by_id (GdaConnection cn c, const gchar *sql_id);	GdaBlob gda_connection_fetch_blob_by_id (GdaConnection cn c, const gchar *sql_id);

	gchar gda_connection_value_to_sql_string (GdaConnection cn c, GValue *from);	gchar gda_connection_value_to_sql_string (GdaConnection cn c, GValue *from);


	gboolean gda_connection_supports_feature (GdaConnec tion *cnc, GdaConnectionFeature feature);	gboolean gda_connection_supports_feature (GdaConnection *cn c, GdaConnectionFeature feature);
	GdaDataModel gda_connection_get_schema (GdaConnection cn c, GdaConnectionSchema schema,	GdaDataModel gda_connection_get_schema (GdaConnection cn c, GdaConnectionSchema schema,
	GdaParameterList * params, GError **error);	GdaParameterList * params, GError **error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	8 lines changed or deleted	11 lines changed or added

	gda-data-handler.h	gda-data-handler.h
	/* gda-data-handler.h	/* gda-data-handler.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 47	skipping to change at line 47
	{	{
	GTypeInterface g_iface;	GTypeInterface g_iface;

	/* virtual table */	/* virtual table */
	gchar ( get_sql_from_value) (GdaDataHandler dh, const G Value value);	gchar ( get_sql_from_value) (GdaDataHandler dh, const G Value value);
	gchar ( get_str_from_value) (GdaDataHandler dh, const G Value value);	gchar ( get_str_from_value) (GdaDataHandler dh, const G Value value);
	GValue ( get_value_from_sql) (GdaDataHandler dh, const g char sql, GType type);	GValue ( get_value_from_sql) (GdaDataHandler dh, const g char sql, GType type);
	GValue ( get_value_from_str) (GdaDataHandler dh, const g char str, GType type);	GValue ( get_value_from_str) (GdaDataHandler dh, const g char str, GType type);
	GValue ( get_sane_init_value) (GdaDataHandler *dh, GType t ype);	GValue ( get_sane_init_value) (GdaDataHandler *dh, GType t ype);


	guint (* get_nb_gda_types) (GdaDataHandler * dh);	guint (* get_nb_g_types) (GdaDataHandler *dh);
	GType (* get_gda_type_index) (GdaDataHandler * dh, guint	GType (* get_g_type_index) (GdaDataHandler *dh, guint i
	index);	ndex);
	gboolean (* accepts_gda_type) (GdaDataHandler * dh, GType	gboolean (* accepts_g_type) (GdaDataHandler *dh, GType t
	type);	ype);
	const gchar ( get_descr) (GdaDataHandler * dh);	const gchar ( get_descr) (GdaDataHandler *dh);
	};	};

	GType gda_data_handler_get_type (void);	GType gda_data_handler_get_type (void);

	/* Simple data manipulation */	/* Simple data manipulation */

	gchar gda_data_handler_get_sql_from_value (GdaDataHandler dh	gchar gda_data_handler_get_sql_from_value (GdaDataHandler dh,
	, const GValue *value);	const GValue *value);
	gchar gda_data_handler_get_str_from_value (GdaDataHandler dh	gchar gda_data_handler_get_str_from_value (GdaDataHandler dh,
	, const GValue *value);	const GValue *value);
	GValue gda_data_handler_get_value_from_sql (GdaDataHandler dh	GValue gda_data_handler_get_value_from_sql (GdaDataHandler dh,
	, const gchar *sql, GType type);	const gchar *sql, GType type);
	GValue gda_data_handler_get_value_from_str (GdaDataHandler dh	GValue gda_data_handler_get_value_from_str (GdaDataHandler dh,
	, const gchar *str, GType type);	const gchar *str, GType type);
	GValue gda_data_handler_get_sane_init_value (GdaDataHandler dh	GValue gda_data_handler_get_sane_init_value (GdaDataHandler dh,
	, GType type);	GType type);

	/* information about the data handler itself */	/* information about the data handler itself */

	guint gda_data_handler_get_nb_gda_types (GdaDataHandler * dh	guint gda_data_handler_get_nb_g_types (GdaDataHandler *dh)
	);	;
	GType gda_data_handler_get_gda_type_index (GdaDataHandler * dh	GType gda_data_handler_get_g_type_index (GdaDataHandler *dh,
	, guint index);	guint index);
	gboolean gda_data_handler_accepts_gda_type (GdaDataHandler * dh	gboolean gda_data_handler_accepts_g_type (GdaDataHandler *dh,
	, GType type);	GType type);
	const gchar gda_data_handler_get_descr (GdaDataHandler dh	const gchar gda_data_handler_get_descr (GdaDataHandler dh)
	);	;

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 4 change blocks.
	25 lines changed or deleted	25 lines changed or added

	gda-data-model-array.h	gda-data-model-array.h

	skipping to change at line 52	skipping to change at line 52
	struct _GdaDataModelArray {	struct _GdaDataModelArray {
	GdaDataModelRow model;	GdaDataModelRow model;
	GdaDataModelArrayPrivate *priv;	GdaDataModelArrayPrivate *priv;
	};	};

	struct _GdaDataModelArrayClass {	struct _GdaDataModelArrayClass {
	GdaDataModelRowClass parent_class;	GdaDataModelRowClass parent_class;
	};	};

	GType gda_data_model_array_get_type (void);	GType gda_data_model_array_get_type (void);

	GdaDataModel *gda_data_model_array_new_with_types (gint cols, ...);	GdaDataModel *gda_data_model_array_new_with_g_types (gint cols, ...);
	GdaDataModel *gda_data_model_array_new (gint cols);	GdaDataModel *gda_data_model_array_new (gint cols);
	GdaDataModel gda_data_model_array_copy_model (GdaDataModel src, GE rror **error);	GdaDataModel gda_data_model_array_copy_model (GdaDataModel src, GE rror **error);
	void gda_data_model_array_set_n_columns (GdaDataModelArray *mo del, gint cols);	void gda_data_model_array_set_n_columns (GdaDataModelArray *mo del, gint cols);
	void gda_data_model_array_clear (GdaDataModelArray *mo del);	void gda_data_model_array_clear (GdaDataModelArray *mo del);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	gda-data-model-extra.h	gda-data-model-extra.h

	skipping to change at line 31	skipping to change at line 31
	*/	*/

	#ifndef __GDA_DATA_MODEL_EXTRA_H__	#ifndef __GDA_DATA_MODEL_EXTRA_H__
	#define __GDA_DATA_MODEL_EXTRA_H__	#define __GDA_DATA_MODEL_EXTRA_H__

	#include <glib-object.h>	#include <glib-object.h>
	#include <libgda/gda-decl.h>	#include <libgda/gda-decl.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


	void gda_data_model_changed (GdaDataModel *model);	void gda_data_model_signal_emit_changed (GdaDataModel *mode l);

	void gda_data_model_row_inserted (GdaDataModel *model, gint row) ;	void gda_data_model_row_inserted (GdaDataModel *model, gint row) ;
	void gda_data_model_row_updated (GdaDataModel *model, gint row) ;	void gda_data_model_row_updated (GdaDataModel *model, gint row) ;
	void gda_data_model_row_removed (GdaDataModel *model, gint row) ;	void gda_data_model_row_removed (GdaDataModel *model, gint row) ;

	gboolean gda_data_model_move_iter_at_row_default (GdaDataModel model, GdaD ataModelIter iter, gint row);	gboolean gda_data_model_move_iter_at_row_default (GdaDataModel model, GdaD ataModelIter iter, gint row);
	gboolean gda_data_model_move_iter_next_default (GdaDataModel model, GdaD ataModelIter iter);	gboolean gda_data_model_move_iter_next_default (GdaDataModel model, GdaD ataModelIter iter);
	gboolean gda_data_model_move_iter_prev_default (GdaDataModel model, GdaD ataModelIter iter);	gboolean gda_data_model_move_iter_prev_default (GdaDataModel model, GdaD ataModelIter iter);
	G_END_DECLS	G_END_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	gda-data-model-private.h	gda-data-model-private.h

	skipping to change at line 37	skipping to change at line 37
	#include <glib-object.h>	#include <glib-object.h>
	#include <libxml/parser.h>	#include <libxml/parser.h>
	#include <libxml/tree.h>	#include <libxml/tree.h>
	#include <libgda/gda-command.h>	#include <libgda/gda-command.h>
	#include <libgda/gda-decl.h>	#include <libgda/gda-decl.h>
	#include <libgda/gda-column.h>	#include <libgda/gda-column.h>
	#include <libgda/gda-value.h>	#include <libgda/gda-value.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


	void gda_data_model_changed (GdaDat aModel *model);	void gda_data_model_signal_emit_changed (GdaDataModel *model);
	void gda_data_model_row_inserted (GdaDat aModel *model, gint row);	void gda_data_model_row_inserted (GdaDat aModel *model, gint row);
	void gda_data_model_row_updated (GdaDat aModel *model, gint row);	void gda_data_model_row_updated (GdaDat aModel *model, gint row);
	void gda_data_model_row_removed (GdaDat aModel *model, gint row);	void gda_data_model_row_removed (GdaDat aModel *model, gint row);

	const gchar gda_data_model_get_command_text (GdaDat aModel model);	const gchar gda_data_model_get_command_text (GdaDat aModel model);
	gboolean gda_data_model_set_command_text (GdaDat aModel model, const gchar txt);	gboolean gda_data_model_set_command_text (GdaDat aModel model, const gchar txt);
	GdaCommandType gda_data_model_get_command_type (GdaDat aModel *model);	GdaCommandType gda_data_model_get_command_type (GdaDat aModel *model);
	gboolean gda_data_model_set_command_type (GdaDat aModel *model, GdaCommandType type);	gboolean gda_data_model_set_command_type (GdaDat aModel *model, GdaCommandType type);

	xmlNodePtr gda_data_model_to_xml_node (GdaDat aModel model, const gint cols, gint nb_cols,	xmlNodePtr gda_data_model_to_xml_node (GdaDat aModel model, const gint cols, gint nb_cols,

	const g char *name);	const g int rows, gint nb_rows, const gchar name);
	gboolean gda_data_model_add_data_from_xml_node (GdaDat aModel model, xmlNodePtr node, GError *error);	gboolean gda_data_model_add_data_from_xml_node (GdaDat aModel model, xmlNodePtr node, GError *error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	gda-data-model-query.h	gda-data-model-query.h

	skipping to change at line 41	skipping to change at line 41
	#define GDA_TYPE_DATA_MODEL_QUERY (gda_data_model_query_get_type ())	#define GDA_TYPE_DATA_MODEL_QUERY (gda_data_model_query_get_type ())
	#define GDA_DATA_MODEL_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST (o bj, GDA_TYPE_DATA_MODEL_QUERY, GdaDataModelQuery))	#define GDA_DATA_MODEL_QUERY(obj) (G_TYPE_CHECK_INSTANCE_CAST (o bj, GDA_TYPE_DATA_MODEL_QUERY, GdaDataModelQuery))
	#define GDA_DATA_MODEL_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klas s, GDA_TYPE_DATA_MODEL_QUERY, GdaDataModelQueryClass))	#define GDA_DATA_MODEL_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klas s, GDA_TYPE_DATA_MODEL_QUERY, GdaDataModelQueryClass))
	#define GDA_IS_DATA_MODEL_QUERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (o bj, GDA_TYPE_DATA_MODEL_QUERY))	#define GDA_IS_DATA_MODEL_QUERY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (o bj, GDA_TYPE_DATA_MODEL_QUERY))
	#define GDA_IS_DATA_MODEL_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((kla ss), GDA_TYPE_DATA_MODEL_QUERY))	#define GDA_IS_DATA_MODEL_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((kla ss), GDA_TYPE_DATA_MODEL_QUERY))

	typedef struct _GdaDataModelQuery GdaDataModelQuery;	typedef struct _GdaDataModelQuery GdaDataModelQuery;
	typedef struct _GdaDataModelQueryClass GdaDataModelQueryClass;	typedef struct _GdaDataModelQueryClass GdaDataModelQueryClass;
	typedef struct _GdaDataModelQueryPrivate GdaDataModelQueryPrivate;	typedef struct _GdaDataModelQueryPrivate GdaDataModelQueryPrivate;


		/* error reporting */
		extern GQuark gda_data_model_query_error_quark (void);
		#define GDA_DATA_MODEL_QUERY_ERROR gda_data_model_query_error_quark ()

		enum
		{
		GDA_DATA_MODEL_QUERY_XML_LOAD_ERROR,
		};

	struct _GdaDataModelQuery {	struct _GdaDataModelQuery {
	GdaObject object;	GdaObject object;

	GdaDataModelQueryPrivate *priv;	GdaDataModelQueryPrivate *priv;
	};	};

	struct _GdaDataModelQueryClass {	struct _GdaDataModelQueryClass {
	GdaObjectClass parent_class;	GdaObjectClass parent_class;
	};	};


	GType gda_data_model_query_get_type (void);	GType gda_data_model_query_get_type (void);
	GdaDataModel gda_data_model_query_new (GdaQuery query);	GdaDataModel gda_data_model_query_new (GdaQuery que
		ry);


	GdaParameterList gda_data_model_query_get_param_list (GdaDataModelQuery m	GdaParameterList *gda_data_model_query_get_parameter_list (GdaDataModelQ
	odel);	uery *model);
	gboolean gda_data_model_query_refresh (GdaDataModelQuery *m	gboolean gda_data_model_query_refresh (GdaDataModelQ
	odel, GError **error);	uery model, GError *error);
	gboolean gda_data_model_query_set_modification_query(GdaDataModelQ uery *model,	gboolean gda_data_model_query_set_modification_query(GdaDataModelQ uery *model,
	const gchar q uery, GError *error);	const gchar q uery, GError *error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 4 change blocks.
	7 lines changed or deleted	17 lines changed or added

	gda-data-proxy.h	gda-data-proxy.h

	skipping to change at line 96	skipping to change at line 96

	gboolean gda_data_proxy_apply_all_changes (GdaDataProxy pr oxy, GError *error);	gboolean gda_data_proxy_apply_all_changes (GdaDataProxy pr oxy, GError *error);
	gboolean gda_data_proxy_cancel_all_changes (GdaDataProxy *pr oxy);	gboolean gda_data_proxy_cancel_all_changes (GdaDataProxy *pr oxy);

	void gda_data_proxy_set_sample_size (GdaDataProxy *pr oxy, gint sample_size);	void gda_data_proxy_set_sample_size (GdaDataProxy *pr oxy, gint sample_size);
	gint gda_data_proxy_get_sample_size (GdaDataProxy *pr oxy);	gint gda_data_proxy_get_sample_size (GdaDataProxy *pr oxy);
	void gda_data_proxy_set_sample_start (GdaDataProxy *pr oxy, gint sample_start);	void gda_data_proxy_set_sample_start (GdaDataProxy *pr oxy, gint sample_start);
	gint gda_data_proxy_get_sample_start (GdaDataProxy *pr oxy);	gint gda_data_proxy_get_sample_start (GdaDataProxy *pr oxy);
	gint gda_data_proxy_get_sample_end (GdaDataProxy *pr oxy);	gint gda_data_proxy_get_sample_end (GdaDataProxy *pr oxy);


	void gda_data_proxy_set_model_row_value (GdaDataProxy *pr
	oxy, GdaDataModel *model,
	gint proxy_row, g
	int extra_col, const GValue *value);
	void gda_data_proxy_clear_model_row_value (GdaDataProxy *pr
	oxy, GdaDataModel *model,
	gint proxy_row, g
	int extra_col);
	const GValue gda_data_proxy_get_model_row_value (GdaDataProxy pr
	oxy, GdaDataModel *model,
	gint proxy_row, g
	int extra_col);
	void gda_data_proxy_assign_model_col (GdaDataProxy *pr
	oxy, GdaDataModel *model,
	gint proxy_col, g
	int model_col);
	gint gda_data_proxy_get_assigned_model_col (GdaDataProxy *pr
	oxy, GdaDataModel *model, gint model_col);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 1 change blocks.
	19 lines changed or deleted	0 lines changed or added

	gda-dict-aggregate.h	gda-dict-aggregate.h
	/* gda-dict-aggregate.h	/* gda-dict-aggregate.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 56	skipping to change at line 56
	GdaObject object;	GdaObject object;
	GdaDictAggregatePrivate *priv;	GdaDictAggregatePrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaDictAggregateClass	struct _GdaDictAggregateClass
	{	{
	GdaObjectClass parent_class;	GdaObjectClass parent_class;
	};	};


	GType gda_dict_aggregate_get_type (void);	GType gda_dict_aggregate_get_type (void);
	GObject gda_dict_aggregate_new (GdaDict dict);	GObject gda_dict_aggregate_new (GdaDict dict);
	void gda_dict_aggregate_set_dbms_id (GdaDictAggregate *agg,	void gda_dict_aggregate_set_dbms_id (GdaDictAggregate *
	const gchar *id);	agg, const gchar *id);
	gchar gda_dict_aggregate_get_dbms_id (GdaDictAggregate agg);	gchar gda_dict_aggregate_get_dbms_id (GdaDictAggregate
	void gda_dict_aggregate_set_sqlname (GdaDictAggregate *agg,	agg);
	const gchar *sqlname);	void gda_dict_aggregate_set_sqlname (GdaDictAggregate *
	const gchar gda_dict_aggregate_get_sqlname (GdaDictAggregate agg);	agg, const gchar *sqlname);
	void gda_dict_aggregate_set_arg_type (GdaDictAggregate *agg,	const gchar gda_dict_aggregate_get_sqlname (GdaDictAggregate
	GdaDictType *dt);	agg);
	GdaDictType gda_dict_aggregate_get_arg_type (GdaDictAggregate agg);	void gda_dict_aggregate_set_arg_dict_type (GdaDictAggregate *
	void gda_dict_aggregate_set_ret_type (GdaDictAggregate *agg,	agg, GdaDictType *dt);
	GdaDictType *dt);	GdaDictType gda_dict_aggregate_get_arg_dict_type (GdaDictAggregate
	GdaDictType gda_dict_aggregate_get_ret_type (GdaDictAggregate agg);	agg);
		void gda_dict_aggregate_set_ret_dict_type (GdaDictAggregate *
		agg, GdaDictType *dt);
		GdaDictType gda_dict_aggregate_get_ret_dict_type (GdaDictAggregate
		agg);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	15 lines changed or deleted	19 lines changed or added

	gda-dict-function.h	gda-dict-function.h
	/* gda-dict-function.h	/* gda-dict-function.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 56	skipping to change at line 56
	GdaObject object;	GdaObject object;
	GdaDictFunctionPrivate *priv;	GdaDictFunctionPrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaDictFunctionClass	struct _GdaDictFunctionClass
	{	{
	GdaObjectClass parent_class;	GdaObjectClass parent_class;
	};	};


	GType gda_dict_function_get_type (void);	GType gda_dict_function_get_type (void);
	GObject gda_dict_function_new (GdaDict dict);	GObject gda_dict_function_new (GdaDict dict)
	void gda_dict_function_set_dbms_id (GdaDictFunction *func, c	;
	onst gchar *id);	void gda_dict_function_set_dbms_id (GdaDictFunctio
	gchar gda_dict_function_get_dbms_id (GdaDictFunction func);	n func, const gchar id);
	void gda_dict_function_set_sqlname (GdaDictFunction *func, c	gchar *gda_dict_function_get_dbms_id (GdaDictFunctio
	onst gchar *sqlname);	n *func);
	const gchar gda_dict_function_get_sqlname (GdaDictFunction func);	void gda_dict_function_set_sqlname (GdaDictFunctio
	void gda_dict_function_set_arg_types (GdaDictFunction *func, c	n func, const gchar sqlname);
	onst GSList *arg_types);	const gchar *gda_dict_function_get_sqlname (GdaDictFunctio
	const GSList gda_dict_function_get_arg_types (GdaDictFunction func);	n *func);
	void gda_dict_function_set_ret_type (GdaDictFunction *func, G	void gda_dict_function_set_arg_dict_types (GdaDictFunctio
	daDictType *dt);	n func, const GSList arg_types);
	GdaDictType gda_dict_function_get_ret_type (GdaDictFunction func);	const GSList *gda_dict_function_get_arg_dict_types (GdaDictFunctio
		n *func);
		void gda_dict_function_set_ret_dict_type (GdaDictFunctio
		n func, GdaDictType dt);
		GdaDictType *gda_dict_function_get_ret_dict_type (GdaDictFunctio
		n *func);


	gboolean gda_dict_function_accepts_args (GdaDictFunction func, c onst GSList arg_types);	gboolean gda_dict_function_accepts_arg_dict_types (GdaDictFunctio n func, const GSList arg_types);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 3 change blocks.
	16 lines changed or deleted	21 lines changed or added

	gda-dict-reg-types.h	gda-dict-reg-types.h

	skipping to change at line 26	skipping to change at line 26
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
	* USA	* USA
	*/	*/

	#ifndef __GDA_DICT_REG_TYPES_H_	#ifndef __GDA_DICT_REG_TYPES_H_
	#define __GDA_DICT_REG_TYPES_H_	#define __GDA_DICT_REG_TYPES_H_

	#include "gda-dict.h"	#include "gda-dict.h"


	GdaDictRegisterStruct *gda_types_get_register ();	GdaDictRegisterStruct *g_types_get_register ();

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	gda-dict-type.h	gda-dict-type.h
	/* gda-dict-type.h	/* gda-dict-type.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 62	skipping to change at line 62
	{	{
	GdaObjectClass parent_class;	GdaObjectClass parent_class;
	};	};

	GType gda_dict_type_get_type (void);	GType gda_dict_type_get_type (void);
	GdaDictType gda_dict_type_new (GdaDict dict);	GdaDictType gda_dict_type_new (GdaDict dict);

	void gda_dict_type_set_sqlname (GdaDictType dt, const gch ar sqlname);	void gda_dict_type_set_sqlname (GdaDictType dt, const gch ar sqlname);
	const gchar gda_dict_type_get_sqlname (GdaDictType dt);	const gchar gda_dict_type_get_sqlname (GdaDictType dt);


	void gda_dict_type_set_gda_type (GdaDictType *dt, GType gda	void gda_dict_type_set_g_type (GdaDictType *dt, GType g_t
	_type);	ype);
	GType gda_dict_type_get_gda_type (GdaDictType *dt);	GType gda_dict_type_get_g_type (GdaDictType *dt);

	void gda_dict_type_add_synonym (GdaDictType dt, const gch ar synonym);	void gda_dict_type_add_synonym (GdaDictType dt, const gch ar synonym);
	const GSList gda_dict_type_get_synonyms (GdaDictType dt);	const GSList gda_dict_type_get_synonyms (GdaDictType dt);
	void gda_dict_type_clear_synonyms(GdaDictType *dt);	void gda_dict_type_clear_synonyms(GdaDictType *dt);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	4 lines changed or deleted	4 lines changed or added

	gda-object.h	gda-object.h

	skipping to change at line 83	skipping to change at line 83

	const gchar gda_object_get_id (GdaObject object);	const gchar gda_object_get_id (GdaObject object);
	const gchar gda_object_get_name (GdaObject object);	const gchar gda_object_get_name (GdaObject object);
	const gchar gda_object_get_description (GdaObject object);	const gchar gda_object_get_description (GdaObject object);
	const gchar gda_object_get_owner (GdaObject object);	const gchar gda_object_get_owner (GdaObject object);

	void gda_object_destroy (GdaObject object); / force the o bject to completely clean itself */	void gda_object_destroy (GdaObject object); / force the o bject to completely clean itself */
	void gda_object_destroy_check (GdaObject *object);	void gda_object_destroy_check (GdaObject *object);
	gulong gda_object_connect_destroy (gpointer object, GCallback callbac k, gpointer data);	gulong gda_object_connect_destroy (gpointer object, GCallback callbac k, gpointer data);


	void gda_object_changed (GdaObject *object);	void gda_object_signal_emit_changed (GdaObject *object);
	void gda_object_block_changed (GdaObject *object);	void gda_object_block_changed (GdaObject *object);
	void gda_object_unblock_changed (GdaObject *object);	void gda_object_unblock_changed (GdaObject *object);

	#ifdef GDA_DEBUG	#ifdef GDA_DEBUG
	void gda_object_dump (GdaObject object, guint offset); / dump contents on stdout */	void gda_object_dump (GdaObject object, guint offset); / dump contents on stdout */
	#endif	#endif

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	gda-query-join.h	gda-query-join.h
	/* gda-query-join.h	/* gda-query-join.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 75	skipping to change at line 75
	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaQueryJoinClass	struct _GdaQueryJoinClass
	{	{
	GdaQueryObjectClass parent_class;	GdaQueryObjectClass parent_class;

	/* signals */	/* signals */
	void (type_changed) (GdaQueryJoin join);	void (type_changed) (GdaQueryJoin join);
	void (condition_changed) (GdaQueryJoin join);	void (condition_changed) (GdaQueryJoin join);
	};	};


	GType gda_query_join_get_type (void);	GType gda_query_join_get_type (void);
	GObject gda_query_join_new_with_targets (GdaQuery query,	GdaQueryJoin gda_query_join_new_with_targets (GdaQuery quer
	GdaQueryTarget target_1, GdaQueryTarget target_2);	y, GdaQueryTarget target_1, GdaQueryTarget target_2);
	GObject gda_query_join_new_with_xml_ids (GdaQuery query,	GdaQueryJoin gda_query_join_new_with_xml_ids (GdaQuery quer
	const gchar target_1_xml_id, const gchar target_2_xml_id);	y, const gchar target_1_xml_id, const gchar target_2_xml_id);
	GObject gda_query_join_new_copy (GdaQueryJoin ori	GdaQueryJoin gda_query_join_new_copy (GdaQueryJoin
	g, GHashTable *replacements);	orig, GHashTable *replacements);


	void gda_query_join_set_join_type (GdaQueryJoin *joi	void gda_query_join_set_join_type (GdaQueryJoin *
	n, GdaQueryJoinType type);	join, GdaQueryJoinType type);
	GdaQueryJoinType gda_query_join_get_join_type (GdaQueryJoi	GdaQueryJoinType gda_query_join_get_join_type (GdaQueryJoin *
	n *join);	join);
	GdaQuery gda_query_join_get_query (GdaQueryJoin jo	GdaQuery gda_query_join_get_query (GdaQueryJoin
	in);	join);


	GdaQueryTarget *gda_query_join_get_target_1 (GdaQueryJoi	GdaQueryTarget gda_query_join_get_target_1 (GdaQueryJoin
	n *join);	join);
	GdaQueryTarget *gda_query_join_get_target_2 (GdaQueryJoi	GdaQueryTarget gda_query_join_get_target_2 (GdaQueryJoin
	n *join);	join);
	void gda_query_join_swap_targets (GdaQueryJoin *joi	void gda_query_join_swap_targets (GdaQueryJoin *
	n);	join);


	gboolean gda_query_join_set_condition (GdaQueryJoin *joi	gboolean gda_query_join_set_condition (GdaQueryJoin *
	n, GdaQueryCondition *cond);	join, GdaQueryCondition *cond);
	GdaQueryCondition *gda_query_join_get_condition (GdaQueryJoi	GdaQueryCondition gda_query_join_get_condition (GdaQueryJoin
	n *join);	join);
	gboolean gda_query_join_set_condition_from_fkcons (GdaQueryJoin *joi	gboolean gda_query_join_set_condition_from_fkcons (GdaQueryJoin *
	n);	join);
	gboolean gda_query_join_set_condition_from_sql (GdaQueryJoin *joi	gboolean gda_query_join_set_condition_from_sql (GdaQueryJoin *
	n, const gchar cond, GError *error);	join, const gchar cond, GError *error);


	const gchar gda_query_join_render_type (GdaQueryJoin joi n);	const gchar gda_query_join_render_type (GdaQueryJoin join);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 6 change blocks.
	29 lines changed or deleted	29 lines changed or added

	gda-query-target.h	gda-query-target.h
	/* gda-query-target.h	/* gda-query-target.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 38	skipping to change at line 38

	#define GDA_TYPE_QUERY_TARGET (gda_query_target_get_type())	#define GDA_TYPE_QUERY_TARGET (gda_query_target_get_type())
	#define GDA_QUERY_TARGET(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda _query_target_get_type(), GdaQueryTarget)	#define GDA_QUERY_TARGET(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda _query_target_get_type(), GdaQueryTarget)
	#define GDA_QUERY_TARGET_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_ query_target_get_type (), GdaQueryTargetClass)	#define GDA_QUERY_TARGET_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_ query_target_get_type (), GdaQueryTargetClass)
	#define GDA_IS_QUERY_TARGET(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda _query_target_get_type ())	#define GDA_IS_QUERY_TARGET(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda _query_target_get_type ())

	/* error reporting */	/* error reporting */
	extern GQuark gda_query_target_error_quark (void);	extern GQuark gda_query_target_error_quark (void);
	#define GDA_QUERY_TARGET_ERROR gda_query_target_error_quark ()	#define GDA_QUERY_TARGET_ERROR gda_query_target_error_quark ()


	/* different possible types for a query */
	typedef enum {
	GDA_QUERY_TARGET_TYPE_INNER,
	GDA_QUERY_TARGET_TYPE_LEFT_OUTER,
	GDA_QUERY_TARGET_TYPE_RIGHT_OUTER,
	GDA_QUERY_TARGET_TYPE_FULL_OUTER,
	GDA_QUERY_TARGET_TYPE_CROSS,
	GDA_QUERY_TARGET_TYPE_LAST
	} GdaQueryTargetType;

	enum	enum
	{	{
	GDA_QUERY_TARGET_XML_LOAD_ERROR,	GDA_QUERY_TARGET_XML_LOAD_ERROR,
	GDA_QUERY_TARGET_XML_SAVE_ERROR,	GDA_QUERY_TARGET_XML_SAVE_ERROR,
	GDA_QUERY_TARGET_META_DATA_UPDATE,	GDA_QUERY_TARGET_META_DATA_UPDATE,
	GDA_QUERY_TARGET_FIELDS_ERROR	GDA_QUERY_TARGET_FIELDS_ERROR
	};	};

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaQueryTarget	struct _GdaQueryTarget

	skipping to change at line 71	skipping to change at line 61
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaQueryTargetClass	struct _GdaQueryTargetClass
	{	{
	GdaQueryObjectClass parent_class;	GdaQueryObjectClass parent_class;
	};	};

	GType gda_query_target_get_type (void);	GType gda_query_target_get_type (void);


	GObject gda_query_target_new (GdaQuery query, c	GdaQueryTarget gda_query_target_new (GdaQuery query, c
	onst gchar *table);	onst gchar *table);
	GObject gda_query_target_new_copy (GdaQueryTarget or	GdaQueryTarget gda_query_target_new_copy (GdaQueryTarget or
	ig);	ig);

	GdaQuery gda_query_target_get_query (GdaQueryTarget ta rget);	GdaQuery gda_query_target_get_query (GdaQueryTarget ta rget);
	GdaEntity gda_query_target_get_represented_entity (GdaQueryTarget ta rget);	GdaEntity gda_query_target_get_represented_entity (GdaQueryTarget ta rget);
	const gchar gda_query_target_get_represented_table_name (GdaQueryTarget target);	const gchar gda_query_target_get_represented_table_name (GdaQueryTarget target);

	void gda_query_target_set_alias (GdaQueryTarget ta rget, const gchar alias);	void gda_query_target_set_alias (GdaQueryTarget ta rget, const gchar alias);
	const gchar gda_query_target_get_alias (GdaQueryTarget ta rget);	const gchar gda_query_target_get_alias (GdaQueryTarget ta rget);
	gchar gda_query_target_get_complete_name (GdaQueryTarget ta rget);	gchar gda_query_target_get_complete_name (GdaQueryTarget ta rget);

	G_END_DECLS	G_END_DECLS

End of changes. 3 change blocks.
	15 lines changed or deleted	5 lines changed or added

	gda-server-provider-extra.h	gda-server-provider-extra.h

	skipping to change at line 43	skipping to change at line 43
	*/	*/
	gint gda_server_provider_get_schema_nb_columns (GdaConnectionSchema sc hema);	gint gda_server_provider_get_schema_nb_columns (GdaConnectionSchema sc hema);
	gboolean gda_server_provider_init_schema_model (GdaDataModel *model, G daConnectionSchema schema);	gboolean gda_server_provider_init_schema_model (GdaDataModel *model, G daConnectionSchema schema);
	gboolean gda_server_provider_test_schema_model (GdaDataModel model, G daConnectionSchema schema, GError *error);	gboolean gda_server_provider_test_schema_model (GdaDataModel model, G daConnectionSchema schema, GError *error);

	/*	/*
	* Help to implement the GdaDataHandler retreiving for the providers	* Help to implement the GdaDataHandler retreiving for the providers
	*/	*/
	typedef struct {	typedef struct {
	GdaConnection *cnc;	GdaConnection *cnc;

	GType gda_type;	GType g_type;
	gchar *dbms_type;	gchar *dbms_type;
	} GdaServerProviderHandlerInfo;	} GdaServerProviderHandlerInfo;

	guint gda_server_provider_handler_info_hash_func (GdaServerProvi derHandlerInfo *key);	guint gda_server_provider_handler_info_hash_func (GdaServerProvi derHandlerInfo *key);
	gboolean gda_server_provider_handler_info_equal_func (GdaServerProvi derHandlerInfo *a,	gboolean gda_server_provider_handler_info_equal_func (GdaServerProvi derHandlerInfo *a,
	GdaServerProvid erHandlerInfo *b);	GdaServerProvid erHandlerInfo *b);
	void gda_server_provider_handler_info_free (GdaServerProvi derHandlerInfo *info);	void gda_server_provider_handler_info_free (GdaServerProvi derHandlerInfo *info);

	GdaDataHandler gda_server_provider_handler_find (GdaServerProvi der prov, GdaConnection *cnc,	GdaDataHandler gda_server_provider_handler_find (GdaServerProvi der prov, GdaConnection *cnc,

	GType gda_type, const gchar *dbms_type);	GType g_type, c onst gchar *dbms_type);
	void gda_server_provider_handler_declare (GdaServerProvi der prov, GdaDataHandler dh,	void gda_server_provider_handler_declare (GdaServerProvi der prov, GdaDataHandler dh,
	GdaConnection * cnc,	GdaConnection * cnc,

	GType gda_type, const gchar *dbms_type);	GType g_type, c onst gchar *dbms_type);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	gda-server-provider.h	gda-server-provider.h

	skipping to change at line 112	skipping to change at line 112
	GdaConnectionFeature fe ature);	GdaConnectionFeature fe ature);

	GdaDataModel ( get_schema) (GdaServerProvider *provider,	GdaDataModel ( get_schema) (GdaServerProvider *provider,
	GdaConnection *cnc,	GdaConnection *cnc,
	GdaConnectionSchema schema,	GdaConnectionSchema schema,
	GdaParameterList *params);	GdaParameterList *params);

	/* types and values manipulation */	/* types and values manipulation */
	GdaDataHandler ( get_data_handler) (GdaServerProvider *prov ider,	GdaDataHandler ( get_data_handler) (GdaServerProvider *prov ider,
	GdaConnection *cnc,	GdaConnection *cnc,

	GType gda_type,	GType g_type,
	const gchar *dbms_type) ;	const gchar *dbms_type) ;
	GValue ( string_to_value) (GdaServerProvider *provi der,	GValue ( string_to_value) (GdaServerProvider *provi der,
	GdaConnection *cnc,	GdaConnection *cnc,
	const gchar *string,	const gchar *string,
	GType prefered_type,	GType prefered_type,
	gchar **dbms_type);	gchar **dbms_type);
	const gchar (get_def_dbms_type) (GdaServerProvider *prov ider,	const gchar (get_def_dbms_type) (GdaServerProvider *prov ider,
	GdaConnection *cnc,	GdaConnection *cnc,

	GType gda_type);	GType g_type);

	/* connections management */	/* connections management */
	gboolean (* open_connection) (GdaServerProvider *provi der,	gboolean (* open_connection) (GdaServerProvider *provi der,
	GdaConnection *cnc,	GdaConnection *cnc,
	GdaQuarkList *params,	GdaQuarkList *params,
	const gchar *username,	const gchar *username,
	const gchar *password);	const gchar *password);
	gboolean (* close_connection) (GdaServerProvider *prov ider,	gboolean (* close_connection) (GdaServerProvider *prov ider,
	GdaConnection *cnc);	GdaConnection *cnc);


End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	gda-util.h	gda-util.h

	skipping to change at line 38	skipping to change at line 38
	#include <glib/glist.h>	#include <glib/glist.h>
	#include "gda-parameter.h"	#include "gda-parameter.h"
	#include "gda-row.h"	#include "gda-row.h"
	#include "gda-connection.h"	#include "gda-connection.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/*	/*
	* Type utilities	* Type utilities
	*/	*/

	const gchar *gda_type_to_string (GType type);	const gchar *g_type_to_string (GType type);
	GType gda_type_from_string (const gchar *str);	GType g_type_from_string (const gchar *str);

	GList gda_string_hash_to_list (GHashTable hash_table);	GList gda_string_hash_to_list (GHashTable hash_table);

	/*	/*
	* SQL escaping	* SQL escaping
	*/	*/

	gchar gda_default_escape_chars (const gchar string);	gchar gda_default_escape_chars (const gchar string);
	gchar gda_default_unescape_chars (const gchar string);	gchar gda_default_unescape_chars (const gchar string);

	/*
	* SQL parsing utilities
	*/

	gchar gda_sql_replace_placeholders (const gchar sql, GdaParameterList *pa
	rams);

	/*	/*
	* File management utility functions	* File management utility functions
	*/	*/
	gchar gda_file_load (const gchar filename);	gchar gda_file_load (const gchar filename);
	gboolean gda_file_save (const gchar filename, const gchar buffer, gint l en);	gboolean gda_file_save (const gchar filename, const gchar buffer, gint l en);

	/*	/*
	* utilities dealing with storing and retreiving GdaDictField's attributes	* utilities dealing with storing and retreiving GdaDictField's attributes
	* which is a list of comma separated keywords	* which is a list of comma separated keywords

	skipping to change at line 79	skipping to change at line 73
	* XML Id encoding and decoding	* XML Id encoding and decoding
	*/	*/
	gchar utility_build_encoded_id (const gchar prefix, const gchar *id);	gchar utility_build_encoded_id (const gchar prefix, const gchar *id);
	gchar utility_build_decoded_id (const gchar prefix, const gchar *id);	gchar utility_build_decoded_id (const gchar prefix, const gchar *id);

	/*	/*
	* Param & model utilities	* Param & model utilities
	*/	*/
	gboolean utility_check_data_model (GdaDataModel *model, gint nbcols, ...);	gboolean utility_check_data_model (GdaDataModel *model, gint nbcols, ...);
	void utility_data_model_dump_data_to_xml (GdaDataModel *model, xmlNodeP tr parent,	void utility_data_model_dump_data_to_xml (GdaDataModel *model, xmlNodeP tr parent,

	const gint *cols, gint nb_cols	const gint *cols, gint nb_cols
	, gboolean use_col_ids);	, const gint *rows, gint nb_rows,
		gboolean use_col_ids);
	void utility_parameter_load_attributes (GdaParameter param, xmlNodePtr node, GSList sources);	void utility_parameter_load_attributes (GdaParameter param, xmlNodePtr node, GSList sources);
	GdaDictType utility_find_or_create_data_type (GdaDict dict, GdaServerProv ider prov, GdaConnection cnc,	GdaDictType utility_find_or_create_data_type (GdaDict dict, GdaServerProv ider prov, GdaConnection cnc,

	const gchar dbms_type, const gchar gda_type, gboolean *created);	const gchar dbms_type, const gchar g_type, gboolean *created);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 4 change blocks.
	14 lines changed or deleted	8 lines changed or added

	libgda.h	libgda.h

	skipping to change at line 103	skipping to change at line 103
	#include <libgda/gda-query-field-all.h>	#include <libgda/gda-query-field-all.h>
	#include <libgda/gda-query-field-field.h>	#include <libgda/gda-query-field-field.h>
	#include <libgda/gda-query-field-func.h>	#include <libgda/gda-query-field-func.h>
	#include <libgda/gda-query-field-value.h>	#include <libgda/gda-query-field-value.h>
	#include <libgda/gda-query-field.h>	#include <libgda/gda-query-field.h>
	#include <libgda/gda-query-parsing.h>	#include <libgda/gda-query-parsing.h>
	#include <libgda/gda-query-private.h>	#include <libgda/gda-query-private.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


		extern GQuark gda_general_error_quark (void);
		#define GDA_GENERAL_ERROR gda_general_error_quark ()

		enum {
		GDA_GENERAL_OBJECT_NAME_ERROR,
		GDA_GENERAL_INCORRECT_VALUE_ERROR,
		GDA_GENERAL_OPERATION_ERROR
		};

	void gda_init (const gchar app_id, const gchar version, g int nargs, gchar *args[]);	void gda_init (const gchar app_id, const gchar version, g int nargs, gchar *args[]);
	GdaDict *gda_get_default_dict (void);	GdaDict *gda_get_default_dict (void);

	typedef void (* GdaInitFunc) (gpointer user_data);	typedef void (* GdaInitFunc) (gpointer user_data);
	void gda_main_run (GdaInitFunc init_func, gpointer user_data);	void gda_main_run (GdaInitFunc init_func, gpointer user_data);
	void gda_main_quit (void);	void gda_main_quit (void);


		/* Convenient Functions */

		GdaConnection* gda_open_connection (const gchar *dsn,
		const gchar *username,
		const gchar *password,
		GdaConnectionOptions options
		,
		GError **error);

		gboolean gda_insert_row_into_table (GdaConnection *cnn,
		const gchar *table_name,
		GError **error, ...);
		gboolean gda_insert_row_into_table_from_string (GdaConnection *
		cnn,
		const gchar *table_name,
		GError **error, ...);
		gboolean gda_update_value_in_table (GdaConnection *cnn,
		const gchar *table_name,
		const gchar *search_for_colu
		mn,
		const GValue *condition,
		const gchar *column_name,
		const GValue *new_value, GEr
		ror **error);
		gboolean gda_update_values_in_table (GdaConnection *cnn,
		const gchar *table_name,
		const gchar *condition_colum
		n_name,
		const GValue *condition,
		GError **error, ...);
		gboolean gda_delete_row_from_table (GdaConnection *cnn, const gc
		har *table_name,
		const gchar *condition_column
		_name, const GValue *condition,
		GError **error);

		GdaDataModel* gda_execute_select_command (GdaConnection *cnn, const g
		char *sql,
		GError **error);
		gint gda_execute_sql_command (GdaConnection *cnn, const g
		char *sql,
		GError **error);

		gboolean gda_create_table (GdaConnection *cnn,
		const gchar *table_name, GEr
		ror **error, ...);
		gboolean gda_drop_table (GdaConnection *cnn,
		const gchar *table_name, GEr
		ror **error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	59 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	gda-connection.h	gda-connection.h

	skipping to change at line 154	skipping to change at line 154
	gboolean gda_connection_set_password (GdaConnection sr v, const gchar password);	gboolean gda_connection_set_password (GdaConnection sr v, const gchar password);

	void gda_connection_add_event (GdaConnection cn c, GdaConnectionEvent error);	void gda_connection_add_event (GdaConnection cn c, GdaConnectionEvent error);
	void gda_connection_add_event_string (GdaConnection cn c, const gchar str, ...);	void gda_connection_add_event_string (GdaConnection cn c, const gchar str, ...);
	void gda_connection_add_events_list (GdaConnection cn c, GList events_list);	void gda_connection_add_events_list (GdaConnection cn c, GList events_list);
	void gda_connection_clear_events_list (GdaConnection *cn c);	void gda_connection_clear_events_list (GdaConnection *cn c);
	const GList gda_connection_get_events (GdaConnection cn c);	const GList gda_connection_get_events (GdaConnection cn c);

	gboolean gda_connection_change_database (GdaConnection cn c, const gchar name);	gboolean gda_connection_change_database (GdaConnection cn c, const gchar name);


	#define GDA_CONNECTION_EXEC_FAILED ((void *) -1)	GdaDataModel gda_connection_execute_select_command (GdaConnection
	GdaDataModel gda_connection_execute_command (GdaConnection cn	cnc, GdaCommand *cmd,
	c, GdaCommand *cmd,	GdaParameterList
	GdaParameterList *	params, GError *error);
	params, GError **error);	gint gda_connection_execute_non_select_command (GdaConnecti
	GList gda_connection_execute_command_l (GdaConnection cn	on cnc, GdaCommand cmd,
	c, GdaCommand *cmd,	GdaParameter
		List params, GError *error);
		GList gda_connection_execute_command (GdaConnection cn
		c, GdaCommand *cmd,
	GdaParameterList * params, GError **error);	GdaParameterList * params, GError **error);
	gchar gda_connection_get_last_insert_id (GdaConnection cn c, GdaDataModel *recset);	gchar gda_connection_get_last_insert_id (GdaConnection cn c, GdaDataModel *recset);

	gboolean gda_connection_begin_transaction (GdaConnection cn c, GdaTransaction xaction);	gboolean gda_connection_begin_transaction (GdaConnection cn c, GdaTransaction xaction);
	gboolean gda_connection_commit_transaction (GdaConnection cn c, GdaTransaction xaction);	gboolean gda_connection_commit_transaction (GdaConnection cn c, GdaTransaction xaction);
	gboolean gda_connection_rollback_transaction (GdaConnection cn c, GdaTransaction xaction);	gboolean gda_connection_rollback_transaction (GdaConnection cn c, GdaTransaction xaction);

	GdaBlob gda_connection_create_blob (GdaConnection cn c);	GdaBlob gda_connection_create_blob (GdaConnection cn c);
	GdaBlob gda_connection_fetch_blob_by_id (GdaConnection cn c, const gchar *sql_id);	GdaBlob gda_connection_fetch_blob_by_id (GdaConnection cn c, const gchar *sql_id);

	gchar gda_connection_value_to_sql_string (GdaConnection cn c, GValue *from);	gchar gda_connection_value_to_sql_string (GdaConnection cn c, GValue *from);


	gboolean gda_connection_supports_feature (GdaConnec tion *cnc, GdaConnectionFeature feature);	gboolean gda_connection_supports_feature (GdaConnection *cn c, GdaConnectionFeature feature);
	GdaDataModel gda_connection_get_schema (GdaConnection cn c, GdaConnectionSchema schema,	GdaDataModel gda_connection_get_schema (GdaConnection cn c, GdaConnectionSchema schema,
	GdaParameterList * params, GError **error);	GdaParameterList * params, GError **error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	8 lines changed or deleted	11 lines changed or added

	gda-column.h	gda-column.h

	skipping to change at line 52	skipping to change at line 52
	struct _GdaColumn {	struct _GdaColumn {
	GObject object;	GObject object;
	GdaColumnPrivate *priv;	GdaColumnPrivate *priv;
	};	};

	struct _GdaColumnClass {	struct _GdaColumnClass {
	GObjectClass parent_class;	GObjectClass parent_class;

	/* signals */	/* signals */
	void (* name_changed) (GdaColumn column, const gchar old_name) ;	void (* name_changed) (GdaColumn column, const gchar old_name) ;

	void (* gda_type_changed) (GdaColumn *column, GType old_type, GType new_type);	void (* g_type_changed) (GdaColumn *column, GType old_type, GType ne w_type);
	};	};

	GType gda_column_get_type (void);	GType gda_column_get_type (void);
	GdaColumn *gda_column_new (void);	GdaColumn *gda_column_new (void);
	GdaColumn gda_column_copy (GdaColumn column);	GdaColumn gda_column_copy (GdaColumn column);

	const gchar gda_column_get_title (GdaColumn column);	const gchar gda_column_get_title (GdaColumn column);
	void gda_column_set_title (GdaColumn column, const gch ar title);	void gda_column_set_title (GdaColumn column, const gch ar title);

	glong gda_column_get_defined_size (GdaColumn *column);	glong gda_column_get_defined_size (GdaColumn *column);

	skipping to change at line 80	skipping to change at line 80

	const gchar gda_column_get_caption (GdaColumn column);	const gchar gda_column_get_caption (GdaColumn column);
	void gda_column_set_caption (GdaColumn column, const gch ar caption);	void gda_column_set_caption (GdaColumn column, const gch ar caption);

	glong gda_column_get_scale (GdaColumn *column);	glong gda_column_get_scale (GdaColumn *column);
	void gda_column_set_scale (GdaColumn *column, glong sca le);	void gda_column_set_scale (GdaColumn *column, glong sca le);

	const gchar* gda_column_get_dbms_type (GdaColumn *column);	const gchar* gda_column_get_dbms_type (GdaColumn *column);
	void gda_column_set_dbms_type (GdaColumn column, const gch ar dbms_type);	void gda_column_set_dbms_type (GdaColumn column, const gch ar dbms_type);


	GType gda_column_get_gda_type (GdaColumn *column);	GType gda_column_get_g_type (GdaColumn *column);
	void gda_column_set_gda_type (GdaColumn *column, GType ty	void gda_column_set_g_type (GdaColumn *column, GType typ
	pe);	e);

	gboolean gda_column_get_allow_null (GdaColumn *column);	gboolean gda_column_get_allow_null (GdaColumn *column);
	void gda_column_set_allow_null (GdaColumn *column, gboolean allow);	void gda_column_set_allow_null (GdaColumn *column, gboolean allow);

	gboolean gda_column_get_primary_key (GdaColumn *column);	gboolean gda_column_get_primary_key (GdaColumn *column);
	void gda_column_set_primary_key (GdaColumn *column, gboolean pk);	void gda_column_set_primary_key (GdaColumn *column, gboolean pk);

	gboolean gda_column_get_unique_key (GdaColumn *column);	gboolean gda_column_get_unique_key (GdaColumn *column);
	void gda_column_set_unique_key (GdaColumn *column, gboolean uk);	void gda_column_set_unique_key (GdaColumn *column, gboolean uk);


End of changes. 2 change blocks.
	4 lines changed or deleted	4 lines changed or added

	gda-data-model.h	gda-data-model.h

	skipping to change at line 117	skipping to change at line 117

	GType gda_data_model_get_type (void);	GType gda_data_model_get_type (void);

	gboolean gda_data_model_is_updatable (GdaDataModel *mo del);	gboolean gda_data_model_is_updatable (GdaDataModel *mo del);
	guint gda_data_model_get_access_flags (GdaDataModel *mo del);	guint gda_data_model_get_access_flags (GdaDataModel *mo del);

	gint gda_data_model_get_n_rows (GdaDataModel *mo del);	gint gda_data_model_get_n_rows (GdaDataModel *mo del);
	gint gda_data_model_get_n_columns (GdaDataModel *mo del);	gint gda_data_model_get_n_columns (GdaDataModel *mo del);

	GdaColumn gda_data_model_describe_column (GdaDataModel mo del, gint col);	GdaColumn gda_data_model_describe_column (GdaDataModel mo del, gint col);

		gint gda_data_model_get_column_index_by_name(GdaDataModel m odel, const gchar name);
	const gchar gda_data_model_get_column_title (GdaDataModel mo del, gint col);	const gchar gda_data_model_get_column_title (GdaDataModel mo del, gint col);
	void gda_data_model_set_column_title (GdaDataModel mo del, gint col, const gchar title);	void gda_data_model_set_column_title (GdaDataModel mo del, gint col, const gchar title);

	const GValue gda_data_model_get_value_at (GdaDataModel mo del, gint col, gint row);	const GValue gda_data_model_get_value_at (GdaDataModel mo del, gint col, gint row);

		const GValue gda_data_model_get_value_at_col_name (GdaDataModel mo
		del,
		const gchar *colu
		mn_name, gint row);
	guint gda_data_model_get_attributes_at (GdaDataModel *mo del, gint col, gint row);	guint gda_data_model_get_attributes_at (GdaDataModel *mo del, gint col, gint row);
	GdaDataModelIter gda_data_model_create_iter (GdaDataModel mo del);	GdaDataModelIter gda_data_model_create_iter (GdaDataModel mo del);
	gboolean gda_data_model_move_iter_at_row (GdaDataModel mo del, GdaDataModelIter iter, gint row);	gboolean gda_data_model_move_iter_at_row (GdaDataModel mo del, GdaDataModelIter iter, gint row);
	gboolean gda_data_model_move_iter_next (GdaDataModel mo del, GdaDataModelIter iter);	gboolean gda_data_model_move_iter_next (GdaDataModel mo del, GdaDataModelIter iter);
	gboolean gda_data_model_move_iter_prev (GdaDataModel mo del, GdaDataModelIter iter);	gboolean gda_data_model_move_iter_prev (GdaDataModel mo del, GdaDataModelIter iter);
	void gda_data_model_freeze (GdaDataModel *mo del);	void gda_data_model_freeze (GdaDataModel *mo del);
	void gda_data_model_thaw (GdaDataModel *mo del);	void gda_data_model_thaw (GdaDataModel *mo del);
	gboolean gda_data_model_set_value_at (GdaDataModel *mo del, gint col, gint row,	gboolean gda_data_model_set_value_at (GdaDataModel *mo del, gint col, gint row,
	const GValue val ue, GError *error);	const GValue val ue, GError *error);
	gboolean gda_data_model_set_values (GdaDataModel *mo del, gint row,	gboolean gda_data_model_set_values (GdaDataModel *mo del, gint row,
	GList values, GE rror *error);	GList values, GE rror *error);
	gint gda_data_model_append_row (GdaDataModel mo del, GError *error);	gint gda_data_model_append_row (GdaDataModel mo del, GError *error);
	gint gda_data_model_append_values (GdaDataModel mo del, const GList values, GError **error);	gint gda_data_model_append_values (GdaDataModel mo del, const GList values, GError **error);
	gboolean gda_data_model_remove_row (GdaDataModel mo del, gint row, GError *error);	gboolean gda_data_model_remove_row (GdaDataModel mo del, gint row, GError *error);
	gint gda_data_model_get_row_from_values (GdaDataModel mo del, GSList values, gint *cols_index);	gint gda_data_model_get_row_from_values (GdaDataModel mo del, GSList values, gint *cols_index);

	void gda_data_model_send_hint (GdaDataModel mo del, GdaDataModelHint hint, const GValue hint_value);	void gda_data_model_send_hint (GdaDataModel mo del, GdaDataModelHint hint, const GValue hint_value);

	/* contents saving and loading */	/* contents saving and loading */
	gchar gda_data_model_export_to_string (GdaDataModel mo del, GdaDataModelIOFormat format,	gchar gda_data_model_export_to_string (GdaDataModel mo del, GdaDataModelIOFormat format,

	const gint *cols,	const gint *cols,
	gint nb_cols, GdaParameterList *options);	gint nb_cols,
		const gint *rows,
		gint nb_rows, GdaParameterList *options);
	gboolean gda_data_model_export_to_file (GdaDataModel *mo del, GdaDataModelIOFormat format,	gboolean gda_data_model_export_to_file (GdaDataModel *mo del, GdaDataModelIOFormat format,
	const gchar *file ,	const gchar *file ,
	const gint *cols, gint nb_cols,	const gint *cols, gint nb_cols,

		const gint *rows, gint nb_rows,
	GdaParameterList options, GError *error);	GdaParameterList options, GError *error);

	gboolean gda_data_model_import_from_model (GdaDataModel to , GdaDataModel from,	gboolean gda_data_model_import_from_model (GdaDataModel to , GdaDataModel from,
	GHashTable cols_ trans, GError *error);	GHashTable cols_ trans, GError *error);
	gboolean gda_data_model_import_from_string (GdaDataModel *mo del,	gboolean gda_data_model_import_from_string (GdaDataModel *mo del,
	const gchar stri ng, GHashTable cols_trans,	const gchar stri ng, GHashTable cols_trans,
	GdaParameterList options, GError *error);	GdaParameterList options, GError *error);
	gboolean gda_data_model_import_from_file (GdaDataModel *mo del,	gboolean gda_data_model_import_from_file (GdaDataModel *mo del,
	const gchar file , GHashTable cols_trans,	const gchar file , GHashTable cols_trans,
	GdaParameterList options, GError *error);	GdaParameterList options, GError *error);

End of changes. 4 change blocks.
	2 lines changed or deleted	10 lines changed or added

	gda-dict.h	gda-dict.h
	/* gda-dict.h	/* gda-dict.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 83	skipping to change at line 83
	/* signal that a change in the whole dictionary has occurred */	/* signal that a change in the whole dictionary has occurred */
	void (changed) (GdaDict dict);	void (changed) (GdaDict dict);

	/* class variable */	/* class variable */
	GSList class_registry_list; / list of GdaDictRegFunc functions * /	GSList class_registry_list; / list of GdaDictRegFunc functions * /
	gpointer reserved1;	gpointer reserved1;
	gpointer reserved2;	gpointer reserved2;
	};	};

	GType gda_dict_get_type (void);	GType gda_dict_get_type (void);

	GObject *gda_dict_new (void);	GdaDict *gda_dict_new (void);
	void gda_dict_extend_with_functions (GdaDict *dict);	void gda_dict_extend_with_functions (GdaDict *dict);

	void gda_dict_set_connection (GdaDict dict, GdaConnection cnc);	void gda_dict_set_connection (GdaDict dict, GdaConnection cnc);
	GdaConnection gda_dict_get_connection (GdaDict dict);	GdaConnection gda_dict_get_connection (GdaDict dict);
	GdaDictDatabase gda_dict_get_database (GdaDict dict);	GdaDictDatabase gda_dict_get_database (GdaDict dict);

	void gda_dict_declare_object_string_id_change (GdaDict dict, GdaObject obj, const gchar *oldid);	void gda_dict_declare_object_string_id_change (GdaDict dict, GdaObject obj, const gchar *oldid);
	GdaObject gda_dict_get_object_by_string_id (GdaDict dict, const gchar *strid);	GdaObject gda_dict_get_object_by_string_id (GdaDict dict, const gchar *strid);


	gboolean gda_dict_update_dbms_data (GdaDict dict, GType limit_to_type, const gchar limit_obj_name,	gboolean gda_dict_update_dbms_meta_data (GdaDict dict, GType limit_to_type, const gchar limit_obj_name,
	GError **error);	GError **error);

	void gda_dict_stop_update_dbms_data (GdaDict *dict);	void gda_dict_stop_update_dbms_meta_data (GdaDict *dict);

	gchar gda_dict_compute_xml_filename (GdaDict dict, const gchar *datasource,	gchar gda_dict_compute_xml_filename (GdaDict dict, const gchar *datasource,
	const gchar app _id, GError *error);	const gchar app _id, GError *error);
	void gda_dict_set_xml_filename (GdaDict dict, const gchar xmlfile);	void gda_dict_set_xml_filename (GdaDict dict, const gchar xmlfile);
	const gchar gda_dict_get_xml_filename (GdaDict dict);	const gchar gda_dict_get_xml_filename (GdaDict dict);
	gboolean gda_dict_load (GdaDict dict, GError *error);	gboolean gda_dict_load (GdaDict dict, GError *error);
	gboolean gda_dict_save (GdaDict dict, GError *error);	gboolean gda_dict_save (GdaDict dict, GError *error);
	gboolean gda_dict_load_xml_file (GdaDict dict, const gchar xmlfile, GError **error);	gboolean gda_dict_load_xml_file (GdaDict dict, const gchar xmlfile, GError **error);
	gboolean gda_dict_save_xml_file (GdaDict dict, const gchar xmlfile, GError **error);	gboolean gda_dict_save_xml_file (GdaDict dict, const gchar xmlfile, GError **error);


	skipping to change at line 137	skipping to change at line 137
	#define gda_dict_get_aggregates_by_name(dict,aggname) gda_aggregates_get_by _name((dict), (aggname))	#define gda_dict_get_aggregates_by_name(dict,aggname) gda_aggregates_get_by _name((dict), (aggname))
	#define gda_dict_get_aggregate_by_name_arg(dict,argname,argtype) gda_aggreg ates_get_by_name_arg ((dict), (argname), (argtype))	#define gda_dict_get_aggregate_by_name_arg(dict,argname,argtype) gda_aggreg ates_get_by_name_arg ((dict), (argname), (argtype))
	#define gda_dict_get_aggregate_by_xml_id(dict,xml_id) gda_dict_get_object_b y_xml_id((dict), GDA_TYPE_DICT_AGGREGATE, (xml_id))	#define gda_dict_get_aggregate_by_xml_id(dict,xml_id) gda_dict_get_object_b y_xml_id((dict), GDA_TYPE_DICT_AGGREGATE, (xml_id))
	#define gda_dict_get_aggregate_by_dbms_id(dict,dbmsid) gda_aggregates_get_b y_dbms_id((dict),(dbmsid))	#define gda_dict_get_aggregate_by_dbms_id(dict,dbmsid) gda_aggregates_get_b y_dbms_id((dict),(dbmsid))

	void gda_dict_declare_object (GdaDict dict, GdaObject object);	void gda_dict_declare_object (GdaDict dict, GdaObject object);
	void gda_dict_declare_object_as (GdaDict dict, GdaObject object, GType as_type);	void gda_dict_declare_object_as (GdaDict dict, GdaObject object, GType as_type);
	void gda_dict_assume_object (GdaDict dict, GdaObject object);	void gda_dict_assume_object (GdaDict dict, GdaObject object);
	void gda_dict_assume_object_as (GdaDict dict, GdaObject object, GType as_type);	void gda_dict_assume_object_as (GdaDict dict, GdaObject object, GType as_type);
	void gda_dict_unassume_object (GdaDict dict, GdaObject object);	void gda_dict_unassume_object (GdaDict dict, GdaObject object);

		gboolean gda_dict_object_is_assumed (GdaDict dict, GdaObject object);
	GSList gda_dict_get_objects (GdaDict dict, GType type);	GSList gda_dict_get_objects (GdaDict dict, GType type);
	GdaObject gda_dict_get_object_by_name (GdaDict dict, GType type, const gchar *name);	GdaObject gda_dict_get_object_by_name (GdaDict dict, GType type, const gchar *name);
	GdaObject gda_dict_get_object_by_xml_id (GdaDict dict, GType type, const gchar *xml_id);	GdaObject gda_dict_get_object_by_xml_id (GdaDict dict, GType type, const gchar *xml_id);

	#ifdef GDA_DEBUG	#ifdef GDA_DEBUG
	void gda_dict_dump (GdaDict *dict);	void gda_dict_dump (GdaDict *dict);
	#endif	#endif
	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 5 change blocks.
	4 lines changed or deleted	5 lines changed or added

	gda-entity-field.h	gda-entity-field.h
	/* gda-entity-field.h	/* gda-entity-field.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 42	skipping to change at line 42
	#define GDA_IS_ENTITY_FIELD(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA _TYPE_ENTITY_FIELD)	#define GDA_IS_ENTITY_FIELD(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA _TYPE_ENTITY_FIELD)
	#define GDA_ENTITY_FIELD_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((o bj), GDA_TYPE_ENTITY_FIELD, GdaEntityFieldIface))	#define GDA_ENTITY_FIELD_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((o bj), GDA_TYPE_ENTITY_FIELD, GdaEntityFieldIface))

	/* struct for the interface */	/* struct for the interface */
	struct _GdaEntityFieldIface	struct _GdaEntityFieldIface
	{	{
	GTypeInterface g_iface;	GTypeInterface g_iface;

	/* virtual table */	/* virtual table */
	GdaEntity ( get_entity) (GdaEntityField *iface);	GdaEntity ( get_entity) (GdaEntityField *iface);

	GType (* get_gda_type) (GdaEntityField *iface);	GType (* get_g_type) (GdaEntityField *iface);
	GdaDictType ( get_data_type) (GdaEntityField *iface);	GdaDictType ( get_data_type) (GdaEntityField *iface);
	const gchar ( get_alias) (GdaEntityField *iface);	const gchar ( get_alias) (GdaEntityField *iface);
	};	};

	GType gda_entity_field_get_type (void) G_GNUC_CONST;	GType gda_entity_field_get_type (void) G_GNUC_CONST;

	GdaEntity gda_entity_field_get_entity (GdaEntityField iface);	GdaEntity gda_entity_field_get_entity (GdaEntityField iface);

	GType gda_entity_field_get_gda_type (GdaEntityField *iface);	GType gda_entity_field_get_g_type (GdaEntityField *iface);
	GdaDictType gda_entity_field_get_dict_type (GdaEntityField iface);	GdaDictType gda_entity_field_get_dict_type (GdaEntityField iface);
	const gchar gda_entity_field_get_name (GdaEntityField iface);	const gchar gda_entity_field_get_name (GdaEntityField iface);
	const gchar gda_entity_field_get_description (GdaEntityField iface);	const gchar gda_entity_field_get_description (GdaEntityField iface);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	gda-enum-types.h	gda-enum-types.h

	skipping to change at line 73	skipping to change at line 73
	GType gda_query_condition_type_get_type (void);	GType gda_query_condition_type_get_type (void);
	#define GDA_TYPE_QUERY_CONDITION_TYPE (gda_query_condition_type_get_type())	#define GDA_TYPE_QUERY_CONDITION_TYPE (gda_query_condition_type_get_type())
	GType gda_query_condition_operator_get_type (void);	GType gda_query_condition_operator_get_type (void);
	#define GDA_TYPE_QUERY_CONDITION_OPERATOR (gda_query_condition_operator_get _type())	#define GDA_TYPE_QUERY_CONDITION_OPERATOR (gda_query_condition_operator_get _type())
	/* enumerations from "gda-query.h" */	/* enumerations from "gda-query.h" */
	GType gda_query_type_get_type (void);	GType gda_query_type_get_type (void);
	#define GDA_TYPE_QUERY_TYPE (gda_query_type_get_type())	#define GDA_TYPE_QUERY_TYPE (gda_query_type_get_type())
	/* enumerations from "gda-query-join.h" */	/* enumerations from "gda-query-join.h" */
	GType gda_query_join_type_get_type (void);	GType gda_query_join_type_get_type (void);
	#define GDA_TYPE_QUERY_JOIN_TYPE (gda_query_join_type_get_type())	#define GDA_TYPE_QUERY_JOIN_TYPE (gda_query_join_type_get_type())

	/* enumerations from "gda-query-target.h" */
	GType gda_query_target_type_get_type (void);
	#define GDA_TYPE_QUERY_TARGET_TYPE (gda_query_target_type_get_type())
	/* enumerations from "gda-renderer.h" */	/* enumerations from "gda-renderer.h" */
	GType gda_renderer_options_get_type (void);	GType gda_renderer_options_get_type (void);
	#define GDA_TYPE_RENDERER_OPTIONS (gda_renderer_options_get_type())	#define GDA_TYPE_RENDERER_OPTIONS (gda_renderer_options_get_type())
	/* enumerations from "gda-server-operation.h" */	/* enumerations from "gda-server-operation.h" */
	GType gda_server_operation_type_get_type (void);	GType gda_server_operation_type_get_type (void);
	#define GDA_TYPE_SERVER_OPERATION_TYPE (gda_server_operation_type_get_type( ))	#define GDA_TYPE_SERVER_OPERATION_TYPE (gda_server_operation_type_get_type( ))
	GType gda_server_operation_node_type_get_type (void);	GType gda_server_operation_node_type_get_type (void);
	#define GDA_TYPE_SERVER_OPERATION_NODE_TYPE (gda_server_operation_node_type _get_type())	#define GDA_TYPE_SERVER_OPERATION_NODE_TYPE (gda_server_operation_node_type _get_type())
	GType gda_server_operation_node_status_get_type (void);	GType gda_server_operation_node_status_get_type (void);
	#define GDA_TYPE_SERVER_OPERATION_NODE_STATUS (gda_server_operation_node_st atus_get_type())	#define GDA_TYPE_SERVER_OPERATION_NODE_STATUS (gda_server_operation_node_st atus_get_type())

End of changes. 1 change blocks.
	3 lines changed or deleted	0 lines changed or added

	gda-parameter-list.h	gda-parameter-list.h

	skipping to change at line 122	skipping to change at line 122
	struct _GdaParameterListClass	struct _GdaParameterListClass
	{	{
	GdaObjectClass parent_class;	GdaObjectClass parent_class;

	void (param_changed) (GdaParameterList paramlist, GdaParameter *param);	void (param_changed) (GdaParameterList paramlist, GdaParameter *param);
	void (public_data_changed) (GdaParameterList para mlist);	void (public_data_changed) (GdaParameterList para mlist);
	};	};

	GType gda_parameter_list_get_type (void);	GType gda_parameter_list_get_type (void);
	GdaParameterList gda_parameter_list_new (GSList params);	GdaParameterList gda_parameter_list_new (GSList params);

		GdaParameterList gda_parameter_list_new_inline (GdaDic t dict, ...);

	GdaParameterList gda_parameter_list_new_from_spec_string (GdaDic t dict, const gchar xml_spec, GError *error);	GdaParameterList gda_parameter_list_new_from_spec_string (GdaDic t dict, const gchar xml_spec, GError *error);
	GdaParameterList gda_parameter_list_new_from_spec_node (GdaDic t dict, xmlNodePtr xml_spec, GError **error);	GdaParameterList gda_parameter_list_new_from_spec_node (GdaDic t dict, xmlNodePtr xml_spec, GError **error);
	gchar gda_parameter_list_get_spec (GdaPar ameterList paramlist);	gchar gda_parameter_list_get_spec (GdaPar ameterList paramlist);

	guint gda_parameter_list_get_length (GdaPar ameterList *plist);	guint gda_parameter_list_get_length (GdaPar ameterList *plist);

	void gda_parameter_list_add_param (GdaPar ameterList paramlist, GdaParameter param);	void gda_parameter_list_add_param (GdaPar ameterList paramlist, GdaParameter param);
	GdaParameter gda_parameter_list_add_param_from_string (GdaPar ameterList paramlist, const gchar *name,	GdaParameter gda_parameter_list_add_param_from_string (GdaPar ameterList paramlist, const gchar *name,
	GType t ype, const gchar *str);	GType t ype, const gchar *str);

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	gda-parameter.h	gda-parameter.h
	/* gda-parameter.h	/* gda-parameter.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 59	skipping to change at line 59
	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaParameterClass	struct _GdaParameterClass
	{	{
	GdaObjectClass parent_class;	GdaObjectClass parent_class;
	void (restrict_changed) (GdaParameter param);	void (restrict_changed) (GdaParameter param);
	};	};

	GType gda_parameter_get_type (void);	GType gda_parameter_get_type (void);
	GdaParameter *gda_parameter_new (GType type);	GdaParameter *gda_parameter_new (GType type);
	GdaParameter gda_parameter_new_copy (GdaParameter orig);	GdaParameter gda_parameter_new_copy (GdaParameter orig);

	GType gda_parameter_get_gda_type (GdaParameter *param);	GType gda_parameter_get_g_type (GdaParameter *param);

	GdaParameter gda_parameter_new_string (const gchar name, const gchar *str);	GdaParameter gda_parameter_new_string (const gchar name, const gchar *str);
	GdaParameter gda_parameter_new_boolean (const gchar name, gboolean value);	GdaParameter gda_parameter_new_boolean (const gchar name, gboolean value);

	void gda_parameter_declare_param_user (GdaParameter param, GdaObject user);	void gda_parameter_declare_param_user (GdaParameter param, GdaObject user);
	GSList gda_parameter_get_param_users (GdaParameter param);	GSList gda_parameter_get_param_users (GdaParameter param);
	void gda_parameter_replace_param_users (GdaParameter param, GHashTable replacements);	void gda_parameter_replace_param_users (GdaParameter param, GHashTable replacements);

	const GValue gda_parameter_get_value (GdaParameter param);	const GValue gda_parameter_get_value (GdaParameter param);
	void gda_parameter_set_value (GdaParameter param, const GValue value);	void gda_parameter_set_value (GdaParameter param, const GValue value);

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	gda-query-condition.h	gda-query-condition.h

	skipping to change at line 88	skipping to change at line 88
	GdaQueryConditionPrivate *priv;	GdaQueryConditionPrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaQueryConditionClass	struct _GdaQueryConditionClass
	{	{
	GdaQueryObjectClass parent_class;	GdaQueryObjectClass parent_class;
	};	};

	GType gda_query_condition_get_type (void);	GType gda_query_condition_get_type (void);

	GObject *gda_query_condition_new (GdaQuery	GdaQueryCondition *gda_query_condition_new (GdaQuery
	*query, GdaQueryConditionType type);	*query, GdaQueryConditionType type);
	GObject *gda_query_condition_new_copy (GdaQuery	GdaQueryCondition *gda_query_condition_new_copy (GdaQuery
	Condition orig, GHashTable replacements);	Condition orig, GHashTable replacements);
	GObject *gda_query_condition_new_from_sql (GdaQuery	GdaQueryCondition *gda_query_condition_new_from_sql (GdaQuery
	query, const gchar sql_cond,	query, const gchar sql_cond,
	GSList targets, GError error);	GSList targets, GError error);

	void gda_query_condition_set_cond_type (GdaQuery Condition *condition, GdaQueryConditionType type);	void gda_query_condition_set_cond_type (GdaQuery Condition *condition, GdaQueryConditionType type);
	GdaQueryConditionType gda_query_condition_get_cond_type (GdaQuery Condition *condition);	GdaQueryConditionType gda_query_condition_get_cond_type (GdaQuery Condition *condition);

	GSList gda_query_condition_get_children (GdaQuery Condition condition);	GSList gda_query_condition_get_children (GdaQuery Condition condition);
	GdaQueryCondition gda_query_condition_get_parent (GdaQuery Condition condition);	GdaQueryCondition gda_query_condition_get_parent (GdaQuery Condition condition);
	GdaQueryCondition gda_query_condition_get_child_by_xml_id (GdaQuery Condition condition, const gchar *xml_id);	GdaQueryCondition gda_query_condition_get_child_by_xml_id (GdaQuery Condition condition, const gchar *xml_id);
	gboolean gda_query_condition_is_ancestor (GdaQuery Condition condition, GdaQueryCondition ancestor);	gboolean gda_query_condition_is_ancestor (GdaQuery Condition condition, GdaQueryCondition ancestor);
	gboolean gda_query_condition_is_leaf (GdaQuery Condition *condition);	gboolean gda_query_condition_is_leaf (GdaQuery Condition *condition);

End of changes. 1 change blocks.
	6 lines changed or deleted	6 lines changed or added

	gda-query-field-agg.h	gda-query-field-agg.h
	/* gda-query-field-agg.h	/* gda-query-field-agg.h
	*	*

	* Copyright (C) 2005 Vivien Malerba	* Copyright (C) 2005 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 58	skipping to change at line 58
	GdaQueryFieldAggPrivate *priv;	GdaQueryFieldAggPrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaQueryFieldAggClass	struct _GdaQueryFieldAggClass
	{	{
	GdaQueryFieldClass parent_class;	GdaQueryFieldClass parent_class;
	};	};

	GType gda_query_field_agg_get_type (void);	GType gda_query_field_agg_get_type (void);

	GObject gda_query_field_agg_new (GdaQuery que ry, const gchar *agg_name);	GdaQueryField gda_query_field_agg_new (GdaQuery que ry, const gchar *agg_name);

	GdaDictAggregate gda_query_field_agg_get_ref_agg (GdaQueryField Agg agg);	GdaDictAggregate gda_query_field_agg_get_ref_agg (GdaQueryField Agg agg);
	gboolean gda_query_field_agg_set_arg (GdaQueryField Agg agg, GdaQueryField arg);	gboolean gda_query_field_agg_set_arg (GdaQueryField Agg agg, GdaQueryField arg);
	GdaQueryField gda_query_field_agg_get_arg (GdaQueryField Agg agg);	GdaQueryField gda_query_field_agg_get_arg (GdaQueryField Agg agg);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	gda-query-field-all.h	gda-query-field-all.h
	/* gda-query-field-all.h	/* gda-query-field-all.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 58	skipping to change at line 58
	GdaQueryFieldAllPrivate *priv;	GdaQueryFieldAllPrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaQueryFieldAllClass	struct _GdaQueryFieldAllClass
	{	{
	GdaQueryFieldClass parent_class;	GdaQueryFieldClass parent_class;
	};	};

	GType gda_query_field_all_get_type (void);	GType gda_query_field_all_get_type (void);

	GObject gda_query_field_all_new (GdaQuery query, const gchar *target);	GdaQueryField gda_query_field_all_new (GdaQuery query, const gchar *target);

	GdaQueryTarget gda_query_field_all_get_target (GdaQueryFieldAll field);	GdaQueryTarget gda_query_field_all_get_target (GdaQueryFieldAll field);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	gda-server-operation.h		gda-server-operation.h

	skipping to change at line 107		skipping to change at line 107
	void (seq_item_remove) (GdaServerOperation op, const gchar *seq_path, gint item_index);		void (seq_item_remove) (GdaServerOperation op, const gchar *seq_path, gint item_index);

	};		};

	GType gda_server_operation_get_type (vo id);		GType gda_server_operation_get_type (vo id);
	GdaServerOperation gda_server_operation_new (Gd aServerOperationType op_type, const gchar xml_file);		GdaServerOperation gda_server_operation_new (Gd aServerOperationType op_type, const gchar xml_file);
	GdaServerOperationType gda_server_operation_get_op_type (Gd aServerOperation *op);		GdaServerOperationType gda_server_operation_get_op_type (Gd aServerOperation *op);
	const gchar *gda_server_operation_op_type_to_string (Gd aServerOperationType type);		const gchar *gda_server_operation_op_type_to_string (Gd aServerOperationType type);
	GdaServerOperationNode gda_server_operation_get_node_info (Gd aServerOperation op, const gchar *path_format, ...);		GdaServerOperationNode gda_server_operation_get_node_info (Gd aServerOperation op, const gchar *path_format, ...);


			const GValue *gda_server_operation_get_value_at (Gd
			aServerOperation op, const gchar path_format, ...);
			gboolean gda_server_operation_set_value_at (Gd
			aServerOperation op, const gchar value,
			GEr
			ror *error, const gchar path_format, ...);

	xmlNodePtr gda_server_operation_save_data_to_xml (Gd aServerOperation op, GError *error);		xmlNodePtr gda_server_operation_save_data_to_xml (Gd aServerOperation op, GError *error);
	gboolean gda_server_operation_load_data_from_xml (Gd aServerOperation *op,		gboolean gda_server_operation_load_data_from_xml (Gd aServerOperation *op,
	xml NodePtr node, GError **error);		xml NodePtr node, GError **error);

	gchar** gda_server_operation_get_root_nodes (Gd aServerOperation *op);		gchar** gda_server_operation_get_root_nodes (Gd aServerOperation *op);
	GdaServerOperationNodeType gda_server_operation_get_node_type (Gd aServerOperation op, const gchar path,		GdaServerOperationNodeType gda_server_operation_get_node_type (Gd aServerOperation op, const gchar path,
	Gda ServerOperationNodeStatus *status);		Gda ServerOperationNodeStatus *status);
	gchar gda_server_operation_get_node_parent (Gd aServerOperation op, const gchar *path);		gchar gda_server_operation_get_node_parent (Gd aServerOperation op, const gchar *path);
	gchar gda_server_operation_get_node_path_portion (Gd aServerOperation op, const gchar *path);		gchar gda_server_operation_get_node_path_portion (Gd aServerOperation op, const gchar *path);

	const gchar gda_server_operation_get_sequence_name (Gd aServerOperation op, const gchar *path);		const gchar gda_server_operation_get_sequence_name (Gd aServerOperation op, const gchar *path);
	guint gda_server_operation_get_sequence_size (Gd aServerOperation op, const gchar path);		guint gda_server_operation_get_sequence_size (Gd aServerOperation op, const gchar path);
	guint gda_server_operation_get_sequence_max_size (Gd aServerOperation op, const gchar path);		guint gda_server_operation_get_sequence_max_size (Gd aServerOperation op, const gchar path);
	guint gda_server_operation_get_sequence_min_size (Gd aServerOperation op, const gchar path);		guint gda_server_operation_get_sequence_min_size (Gd aServerOperation op, const gchar path);
	gchar *gda_server_operation_get_sequence_item_names (Gd aServerOperation op, const gchar *path);		gchar *gda_server_operation_get_sequence_item_names (Gd aServerOperation op, const gchar *path);

	guint gda_server_operation_add_item_to_sequence (Gd aServerOperation op, const gchar path);		guint gda_server_operation_add_item_to_sequence (Gd aServerOperation op, const gchar path);
	gboolean gda_server_operation_del_item_from_sequence (Gd aServerOperation op, const gchar item_path);		gboolean gda_server_operation_del_item_from_sequence (Gd aServerOperation op, const gchar item_path);

	gda-query-field-field.h	gda-query-field-field.h
	/* gda-query-field-field.h	/* gda-query-field-field.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 58	skipping to change at line 58
	GdaQueryFieldFieldPrivate *priv;	GdaQueryFieldFieldPrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaQueryFieldFieldClass	struct _GdaQueryFieldFieldClass
	{	{
	GdaQueryFieldClass parent_class;	GdaQueryFieldClass parent_class;
	};	};

	GType gda_query_field_field_get_type (void);	GType gda_query_field_field_get_type (void);

	GObject gda_query_field_field_new (GdaQuery quer y, const gchar *field);	GdaQueryField gda_query_field_field_new (GdaQuery quer y, const gchar *field);

	gchar gda_query_field_field_get_ref_field_name (GdaQueryFieldF ield field);	gchar gda_query_field_field_get_ref_field_name (GdaQueryFieldF ield field);
	GdaEntityField gda_query_field_field_get_ref_field (GdaQueryFieldF ield field);	GdaEntityField gda_query_field_field_get_ref_field (GdaQueryFieldF ield field);
	GdaQueryTarget gda_query_field_field_get_target (GdaQueryFieldF ield field);	GdaQueryTarget gda_query_field_field_get_target (GdaQueryFieldF ield field);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	gda-query-field-func.h	gda-query-field-func.h
	/* gda-query-field-func.h	/* gda-query-field-func.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 59	skipping to change at line 59
	GdaQueryFieldFuncPrivate *priv;	GdaQueryFieldFuncPrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaQueryFieldFuncClass	struct _GdaQueryFieldFuncClass
	{	{
	GdaQueryFieldClass parent_class;	GdaQueryFieldClass parent_class;
	};	};

	GType gda_query_field_func_get_type (void);	GType gda_query_field_func_get_type (void);

	GObject gda_query_field_func_new (GdaQuery qu ery, const gchar *func_name);	GdaQueryField gda_query_field_func_new (GdaQuery qu ery, const gchar *func_name);

	GdaDictFunction gda_query_field_func_get_ref_func (GdaQueryFiel dFunc func);	GdaDictFunction gda_query_field_func_get_ref_func (GdaQueryFiel dFunc func);
	const gchar gda_query_field_func_get_ref_func_name (GdaQueryFiel dFunc func);	const gchar gda_query_field_func_get_ref_func_name (GdaQueryFiel dFunc func);
	gboolean gda_query_field_func_set_args (GdaQueryFiel dFunc func, GSList args);	gboolean gda_query_field_func_set_args (GdaQueryFiel dFunc func, GSList args);
	GSList gda_query_field_func_get_args (GdaQueryFiel dFunc func);	GSList gda_query_field_func_get_args (GdaQueryFiel dFunc func);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	gda-query-field-value.h	gda-query-field-value.h
	/* gda-query-field-value.h	/* gda-query-field-value.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2006 Vivien Malerba
	*	*
	* This program is free software; you can redistribute it and/or	* This program is free software; you can redistribute it and/or
	* modify it under the terms of the GNU General Public License as	* modify it under the terms of the GNU General Public License as
	* published by the Free Software Foundation; either version 2 of the	* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.	* License, or (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.

	skipping to change at line 60	skipping to change at line 60
	GdaQueryFieldValuePrivate *priv;	GdaQueryFieldValuePrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaQueryFieldValueClass	struct _GdaQueryFieldValueClass
	{	{
	GdaQueryFieldClass parent_class;	GdaQueryFieldClass parent_class;
	};	};

	GType gda_query_field_value_get_type (void);	GType gda_query_field_value_get_type (void);

	GObject gda_query_field_value_new (GdaQuery quer y, GType type);	GdaQueryField gda_query_field_value_new (GdaQuery quer y, GType type);

	void gda_query_field_value_set_value (GdaQueryFieldV alue field, const GValue val);	void gda_query_field_value_set_value (GdaQueryFieldV alue field, const GValue val);

	const GValue gda_query_field_value_get_value (GdaQueryFieldVal ue field);	const GValue gda_query_field_value_get_value (GdaQueryFieldV alue field);
	void gda_query_field_value_set_default_value (GdaQueryFieldV alue field, const GValue default_val);	void gda_query_field_value_set_default_value (GdaQueryFieldV alue field, const GValue default_val);

	const GValue *gda_query_field_value_get_default_value (GdaQueryFieldVal	const GValue *gda_query_field_value_get_default_value (GdaQueryFieldV
	ue *field);	alue *field);
	GType gda_query_field_value_get_gda_type (GdaQueryFieldValue *fie	GType gda_query_field_value_get_g_type (GdaQueryFieldV
	ld);	alue *field);

	void gda_query_field_value_set_dict_type (GdaQueryFieldV alue field, GdaDictType type);	void gda_query_field_value_set_dict_type (GdaQueryFieldV alue field, GdaDictType type);
	GdaDictType gda_query_field_value_get_dict_type (GdaQueryFieldV alue field);	GdaDictType gda_query_field_value_get_dict_type (GdaQueryFieldV alue field);

	void gda_query_field_value_set_is_parameter (GdaQueryFieldV alue *field, gboolean is_param);	void gda_query_field_value_set_is_parameter (GdaQueryFieldV alue *field, gboolean is_param);
	gboolean gda_query_field_value_is_parameter (GdaQueryFieldV alue *field);	gboolean gda_query_field_value_is_parameter (GdaQueryFieldV alue *field);

	void gda_query_field_value_set_not_null (GdaQueryFieldV alue *field, gboolean not_null);	void gda_query_field_value_set_not_null (GdaQueryFieldV alue *field, gboolean not_null);
	gboolean gda_query_field_value_get_not_null (GdaQueryFieldV alue *field);	gboolean gda_query_field_value_get_not_null (GdaQueryFieldV alue *field);
	gboolean gda_query_field_value_is_value_null (GdaQueryFieldV alue field, GdaParameterList context);	gboolean gda_query_field_value_is_value_null (GdaQueryFieldV alue field, GdaParameterList context);

End of changes. 4 change blocks.
	7 lines changed or deleted	7 lines changed or added

	gda-query.h	gda-query.h

	skipping to change at line 96	skipping to change at line 96
	void (join_added) (GdaQuery query, GdaQueryJoin *join) ;	void (join_added) (GdaQuery query, GdaQueryJoin *join) ;
	void (join_removed) (GdaQuery query, GdaQueryJoin *join) ;	void (join_removed) (GdaQuery query, GdaQueryJoin *join) ;
	void (join_updated) (GdaQuery query, GdaQueryJoin *join) ;	void (join_updated) (GdaQuery query, GdaQueryJoin *join) ;

	void (sub_query_added) (GdaQuery query, GdaQuery *sub_query );	void (sub_query_added) (GdaQuery query, GdaQuery *sub_query );
	void (sub_query_removed) (GdaQuery query, GdaQuery *sub_query );	void (sub_query_removed) (GdaQuery query, GdaQuery *sub_query );
	void (sub_query_updated) (GdaQuery query, GdaQuery *sub_query );	void (sub_query_updated) (GdaQuery query, GdaQuery *sub_query );
	};	};

	GType gda_query_get_type (void);	GType gda_query_get_type (void);

	GObject gda_query_new (GdaDict dict);	GdaQuery gda_query_new (GdaDict dict);
	GObject gda_query_new_copy (GdaQuery orig, GHashT	GdaQuery gda_query_new_copy (GdaQuery orig, GHashT
	able *replacements);	able *replacements);
	GObject gda_query_new_from_sql (GdaDict dict, const g	GdaQuery gda_query_new_from_sql (GdaDict dict, const g
	char sql, GError *error);	char sql, GError *error);

	void gda_query_set_query_type (GdaQuery *query, GdaQu eryType type);	void gda_query_set_query_type (GdaQuery *query, GdaQu eryType type);
	GdaQueryType gda_query_get_query_type (GdaQuery *query);	GdaQueryType gda_query_get_query_type (GdaQuery *query);
	const gchar gda_query_get_query_type_string (GdaQuery query);	const gchar gda_query_get_query_type_string (GdaQuery query);
	gboolean gda_query_is_select_query (GdaQuery *query);	gboolean gda_query_is_select_query (GdaQuery *query);
	gboolean gda_query_is_insert_query (GdaQuery *query);	gboolean gda_query_is_insert_query (GdaQuery *query);
	gboolean gda_query_is_update_query (GdaQuery *query);	gboolean gda_query_is_update_query (GdaQuery *query);
	gboolean gda_query_is_delete_query (GdaQuery *query);	gboolean gda_query_is_delete_query (GdaQuery *query);
	gboolean gda_query_is_modif_query (GdaQuery *query);	gboolean gda_query_is_modif_query (GdaQuery *query);
	GdaQuery gda_query_get_parent_query (GdaQuery query);	GdaQuery gda_query_get_parent_query (GdaQuery query);

	GSList gda_query_get_parameters (GdaQuery query);	GSList gda_query_get_parameters (GdaQuery query);

	GdaParameterList gda_query_get_parameters_boxed (GdaQuery query);	GdaParameterList gda_query_get_parameter_list (GdaQuery query);
	#define GDA_QUERY_EXEC_FAILED ((void *) -1)	#define GDA_QUERY_EXEC_FAILED ((void *) -1)
	GdaDataModel gda_query_execute (GdaQuery query, GdaPa rameterList *params,	GdaDataModel gda_query_execute (GdaQuery query, GdaPa rameterList *params,
	gboolean iter_model_onl y_requested, GError **error);	gboolean iter_model_onl y_requested, GError **error);

	/* if SQL queries */	/* if SQL queries */
	void gda_query_set_sql_text (GdaQuery query, const gchar sql, GError **error);	void gda_query_set_sql_text (GdaQuery query, const gchar sql, GError **error);
	const gchar gda_query_get_sql_text (GdaQuery query);	const gchar gda_query_get_sql_text (GdaQuery query);

	/* for other types of queries */	/* for other types of queries */
	GSList gda_query_get_sub_queries (GdaQuery query);	GSList gda_query_get_sub_queries (GdaQuery query);

	skipping to change at line 154	skipping to change at line 154
	void gda_query_append_condition (GdaQuery query, GdaQu eryCondition cond, gboolean append_as_and);	void gda_query_append_condition (GdaQuery query, GdaQu eryCondition cond, gboolean append_as_and);

	void gda_query_set_order_by_field (GdaQuery query, GdaQu eryField field, gint order, gboolean ascendant);	void gda_query_set_order_by_field (GdaQuery query, GdaQu eryField field, gint order, gboolean ascendant);
	gint gda_query_get_order_by_field (GdaQuery query, GdaQu eryField field, gboolean *ascendant);	gint gda_query_get_order_by_field (GdaQuery query, GdaQu eryField field, gboolean *ascendant);

	/* utility functions */	/* utility functions */
	GdaQueryField gda_query_add_field_from_sql (GdaQuery query, const gchar field, GError *error);	GdaQueryField gda_query_add_field_from_sql (GdaQuery query, const gchar field, GError *error);

	GSList gda_query_get_all_fields (GdaQuery query);	GSList gda_query_get_all_fields (GdaQuery query);
	GdaQueryField gda_query_get_field_by_sql_naming (GdaQuery quer y, const gchar *sql_naming);	GdaQueryField gda_query_get_field_by_sql_naming (GdaQuery quer y, const gchar *sql_naming);

	GdaQueryField gda_query_get_field_by_ref_field (GdaQuery quer	GdaQueryField gda_query_get_field_by_param_name (GdaQuery quer
	y, GdaQueryTarget target, GdaEntityField ref_field,	y, const gchar *param_name);
	GdaQueryFie	GdaQueryField gda_query_get_field_by_ref_field (GdaQuery quer
	ldState field_state);	y, GdaQueryTarget *target,
		GdaEntityField
		*ref_field,
		GdaQueryFieldSt
		ate field_state);
	GdaQueryField gda_query_get_first_field_for_target (GdaQuery quer y, GdaQueryTarget *target);	GdaQueryField gda_query_get_first_field_for_target (GdaQuery quer y, GdaQueryTarget *target);
	GSList gda_query_expand_all_field (GdaQuery quer y, GdaQueryTarget *target);	GSList gda_query_expand_all_field (GdaQuery quer y, GdaQueryTarget *target);
	void gda_query_order_fields_using_join_conds (GdaQuery *quer y);	void gda_query_order_fields_using_join_conds (GdaQuery *quer y);
	GSList gda_query_get_fields_by_target (GdaQuery quer y, GdaQueryTarget *target, gboolean visible_fields_only);	GSList gda_query_get_fields_by_target (GdaQuery quer y, GdaQueryTarget *target, gboolean visible_fields_only);

	void gda_query_declare_condition (GdaQuery query, GdaQu eryCondition cond);	void gda_query_declare_condition (GdaQuery query, GdaQu eryCondition cond);
	void gda_query_undeclare_condition (GdaQuery query, GdaQu eryCondition cond);	void gda_query_undeclare_condition (GdaQuery query, GdaQu eryCondition cond);

	G_END_DECLS	G_END_DECLS


End of changes. 3 change blocks.
	10 lines changed or deleted	14 lines changed or added