libgda: headers diff between 3.1.5 and 3.99.2 versions

	gda-config.h	gda-config.h

	/* GDA common library	/* GDA library
	* Copyright (C) 1998 - 2007 The GNOME Foundation.	* Copyright (C) 2007 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:

	* Rodrigo Moya <rodrigo@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_CONFIG_H__	#ifndef __GDA_CONFIG_H__
	#define __GDA_CONFIG_H__	#define __GDA_CONFIG_H__


	#include <glib/gmacros.h>	#include "gda-decl.h"
	#include <libgda/gda-data-model.h>	#include <libgda/gda-data-model.h>

	#include <libgda/gda-parameter.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


	/*	#define GDA_TYPE_CONFIG (gda_config_get_type())
	* Basic configuration access	#define GDA_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TY
	*/	PE_CONFIG, GdaConfig))
		#define GDA_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYP
	gchar gda_config_get_string (const gchar path);	E_CONFIG, GdaConfigClass))
	gint gda_config_get_int (const gchar *path);	#define GDA_IS_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA_TYP
	gdouble gda_config_get_float (const gchar *path);	E_CONFIG))
	gboolean gda_config_get_boolean (const gchar *path);	#define GDA_IS_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GDA_TY
	gboolean gda_config_set_string (const gchar path, const gchar new_val	PE_CONFIG))
	ue);
	gboolean gda_config_set_int (const gchar *path, gint new_value);
	gboolean gda_config_set_float (const gchar *path, gdouble new_value);
	gboolean gda_config_set_boolean (const gchar *path, gboolean new_value);

	void gda_config_remove_section (const gchar *path);
	void gda_config_remove_key (const gchar *path);
	gboolean gda_config_has_section (const gchar *path);
	gboolean gda_config_has_key (const gchar *path);
	GList gda_config_list_sections (const gchar path);
	GList gda_config_list_keys (const gchar path);
	gchar gda_config_get_type (const gchar path);

	void gda_config_free_list (GList *list);


	typedef void (* GdaConfigListenerFunc) (const gchar *path, gpointer user_da	typedef struct _GdaConfigPrivate GdaConfigPrivate;
	ta);	typedef struct _GdaDataSourceInfo GdaDataSourceInfo;
		typedef struct _GdaProviderInfo GdaProviderInfo;


	guint gda_config_add_listener (const gchar *path, GdaConfigListenerFun	/* error reporting */
	c func,	extern GQuark gda_config_error_quark (void);
	gpointer user_data);	#define GDA_CONFIG_ERROR gda_config_error_quark ()
	void gda_config_remove_listener (guint id);


	/*	typedef enum {
	* Providers configuration	GDA_CONFIG_DSN_NOT_FOUND_ERROR,
	*/	GDA_CONFIG_PERMISSION_ERROR,
		GDA_CONFIG_PROVIDER_NOT_FOUND_ERROR,
		GDA_CONFIG_PROVIDER_CREATION_ERROR
		} GdaConfigError;


	typedef struct _GdaProviderInfo GdaProviderInfo;	struct _GdaDataSourceInfo {
		gchar *name;
		gchar *provider;
		gchar *description;
		gchar *cnc_string;
		gchar *auth_string;
		gboolean is_system;
		};


	/*
	* REM about the @gda_params and @dsn_spec fields:
	*
	* The @gda_params holds all the parameters required to create a DSN, and i
	s historically the
	* way to create a DSN. However the @dsn_spec field has been introduced to
	produce a more
	* detailled spec on what is required to create a DSN.
	*
	* When both fields are present, they are guaranted to list the _same_ para
	meters, using
	* different representations.
	*/
	struct _GdaProviderInfo {	struct _GdaProviderInfo {

	gchar *id;	gchar *id;
	gchar *location;	gchar *location;
	gchar *description;	gchar *description;
	GdaParameterList gda_params; / Contains a list of GdaParameter to	GdaSet dsn_params; / Specs to create a DSN */
	create a DSN */	GdaSet auth_params; / Specs to authenticate a client */
	gchar dsn_spec; / XML string with all the parameters re
	quired to create a DSN */
	};	};


	#define GDA_TYPE_PROVIDER_INFO (gda_provider_info_get_type ())	struct _GdaConfig {
		GObject object;
	GType gda_provider_info_get_type (void) G_GNUC_CONST;	GdaConfigPrivate *priv;
	GdaProviderInfo* gda_provider_info_copy (GdaProviderInfo *src);	};
	void gda_provider_info_free (GdaProviderInfo *provider
	_info);

	GList *gda_config_get_provider_list (void);
	void gda_config_free_provider_list (GList *list);
	GdaProviderInfo gda_config_get_provider_by_name (const gchar name);
	GdaDataModel *gda_config_get_provider_model (void);

	/*
	* Data sources configuration
	*/


	typedef struct _GdaDataSourceInfo GdaDataSourceInfo;	struct _GdaConfigClass {
		GObjectClass object_class;


	struct _GdaDataSourceInfo {	/* signals */
	gchar *name;	void (dsn_added) (GdaConfig conf, GdaDataSourceI
	gchar *provider;	nfo *new_dsn);
	gchar *cnc_string;	void (dsn_to_be_removed) (GdaConfig conf, GdaDataSourceI
	gchar *description;	nfo *old_dsn);
	gchar *username;	void (dsn_removed) (GdaConfig conf, GdaDataSourceI
	gchar *password;	nfo *old_dsn);
	gboolean is_global;	void (dsn_changed) (GdaConfig conf, GdaDataSourceI
		nfo *dsn);
	};	};


	#define GDA_TYPE_DATA_SOURCE_INFO (gda_data_source_info_get_type ())	GType gda_config_get_type (void) G_GNUC_CONST;
		GdaConfig* gda_config_get (void);
	GType gda_data_source_info_get_type (void) G_GNUC_CONST;
	GdaDataSourceInfo gda_data_source_info_copy (GdaDataSourceInfo src
	);
	gboolean gda_data_source_info_equal (GdaDataSourceInfo *inf
	o1, GdaDataSourceInfo *info2);
	GdaDataSourceInfo gda_config_find_data_source (const gchar name);


	void gda_data_source_info_free (GdaDataSourceInfo *inf	GdaDataSourceInfo gda_config_get_dsn (const gchar dsn_name);
	o);	gboolean gda_config_define_dsn (const GdaDataSourceInfo
		info, GError *error);
		gboolean gda_config_remove_dsn (const gchar *dsn_name, G
		Error **error);
		GdaDataModel *gda_config_list_dsn (void);
		gboolean gda_config_can_modify_system_config (void);


	GList *gda_config_get_data_source_list (void);	gint gda_config_get_nb_dsn (void);
	void gda_config_free_data_source_list (GList *list);	gint gda_config_get_dsn_index (const gchar *dsn_name);
		GdaDataSourceInfo *gda_config_get_dsn_at_index (gint index);


	GdaDataModel *gda_config_get_data_source_model (void);	GdaProviderInfo gda_config_get_provider_info (const gchar provider_na
	gboolean gda_config_can_modify_global_config (void);	me);
	gboolean gda_config_save_data_source (const gchar *name,	GdaServerProvider gda_config_get_provider_object (const gchar provider_na
	const gchar *provider,	me, GError **error);
	const gchar *cnc_string	GdaDataModel *gda_config_list_providers (void);
	,
	const gchar *descriptio
	n,
	const gchar *username,
	const gchar *password,
	gboolean is_global);
	gboolean gda_config_save_data_source_info (GdaDataSourceInfo *dsn
	_info);
	void gda_config_remove_data_source (const gchar *name);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 18 change blocks.
	108 lines changed or deleted	70 lines changed or added

	gda-connection-private.h	gda-connection-private.h
	/* GDA library	/* GDA library

	* Copyright (C) 2006 - 2007 The GNOME Foundation.	* Copyright (C) 2006 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library is distributed in the hope that it will be useful,

	skipping to change at line 26	skipping to change at line 26
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_CONNECTION_PRIVATE_H_	#ifndef __GDA_CONNECTION_PRIVATE_H_
	#define __GDA_CONNECTION_PRIVATE_H_	#define __GDA_CONNECTION_PRIVATE_H_


		#include <libgda/gda-meta-store.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


		/*
		* Provider's specific connection data management
		*/
		void gda_connection_internal_set_provider_data (GdaConnection *cnc, gpo
		inter data, GDestroyNotify destroy_func);
		gpointer gda_connection_internal_get_provider_data (GdaConnection *cnc);

		/*
		* Transaction related
		*/
	void gda_connection_internal_transaction_started (GdaConnection cnc, const gchar parent_trans, const gchar *trans_name,	void gda_connection_internal_transaction_started (GdaConnection cnc, const gchar parent_trans, const gchar *trans_name,
	GdaTransactionIsolation is ol_level);	GdaTransactionIsolation is ol_level);
	void gda_connection_internal_transaction_rolledback (GdaConnection cnc, co nst gchar trans_name);	void gda_connection_internal_transaction_rolledback (GdaConnection cnc, co nst gchar trans_name);
	void gda_connection_internal_transaction_committed (GdaConnection cnc, con st gchar trans_name);	void gda_connection_internal_transaction_committed (GdaConnection cnc, con st gchar trans_name);


	void gda_connection_internal_sql_executed (GdaConnection cnc, const gchar sql, GdaConnectionEvent *error);	void gda_connection_internal_statement_executed (GdaConnection cnc, GdaSta tement stmt, GdaSet params, GdaConnectionEvent error);

	void gda_connection_internal_savepoint_added (GdaConnection cnc, const gch ar parent_trans, const gchar *svp_name);	void gda_connection_internal_savepoint_added (GdaConnection cnc, const gch ar parent_trans, const gchar *svp_name);
	void gda_connection_internal_savepoint_rolledback (GdaConnection cnc, cons t gchar svp_name);	void gda_connection_internal_savepoint_rolledback (GdaConnection cnc, cons t gchar svp_name);
	void gda_connection_internal_savepoint_removed (GdaConnection cnc, const g char svp_name);	void gda_connection_internal_savepoint_removed (GdaConnection cnc, const g char svp_name);
	void gda_connection_internal_change_transaction_state (GdaConnection *cnc,	void gda_connection_internal_change_transaction_state (GdaConnection *cnc,
	GdaTransactionStatusS tate newstate);	GdaTransactionStatusS tate newstate);


	/* helper function, fuzzy analysis of "standard" SQL for transactions */	/*
	void gda_connection_internal_treat_sql (GdaConnection cnc, const gchar sq	* prepared statements support
	l, GdaConnectionEvent *error);	*/
		void gda_connection_add_prepared_statement (GdaConnection *cnc, GdaStat
	void gda_connection_force_status (GdaConnection *cnc, gboolean opened);	ement *gda_stmt, gpointer prepared_stmt);
		void gda_connection_del_prepared_statement (GdaConnection *cnc, GdaStat
		ement *gda_stmt);
		gpointer gda_connection_get_prepared_statement (GdaConnection *cnc, GdaStat
		ement *gda_stmt);


	/* prepared statements support */	/*
	void gda_connection_init_prepared_statement_hash (GdaConnection *cnc, G	* GdaMetaStore handling
	DestroyNotify stmt_destroy_func);	*/
	void gda_connection_destroy_prepared_statement_hash (GdaConnection *cnc	GdaMetaStore gda_connection_get_meta_store (GdaConnection cnc);
	);
	void gda_connection_add_prepared_statement (GdaConnection *cnc, GdaQuer
	y *query, gpointer prepared_stmt);
	void gda_connection_del_prepared_statement (GdaConnection *cnc, GdaQuer
	y *query);
	gpointer gda_connection_get_prepared_statement (GdaConnection *cnc, GdaQuer
	y *query);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-connection.h	gda-connection.h

	/* GDA client library	/* GDA library
	* Copyright (C) 1998 - 2007 The GNOME Foundation.	* Copyright (C) 1998 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Michael Lausch <michael@lausch.at>	* Michael Lausch <michael@lausch.at>
	* Rodrigo Moya <rodrigo@gnome-db.org>	* Rodrigo Moya <rodrigo@gnome-db.org>
	* Bas Driessen <bas.driessen@xobas.com>	* Bas Driessen <bas.driessen@xobas.com>
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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

	skipping to change at line 30	skipping to change at line 30
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_CONNECTION_H__	#ifndef __GDA_CONNECTION_H__
	#define __GDA_CONNECTION_H__	#define __GDA_CONNECTION_H__

	#include "gda-decl.h"	#include "gda-decl.h"

	#include <libgda/gda-object.h>
	#include <libgda/gda-command.h>
	#include <libgda/gda-data-model.h>	#include <libgda/gda-data-model.h>
	#include <libgda/gda-data-model-index.h>	#include <libgda/gda-data-model-index.h>
	#include <libgda/gda-connection-event.h>	#include <libgda/gda-connection-event.h>

	#include <libgda/gda-parameter.h>
	#include <libgda/gda-transaction-status.h>	#include <libgda/gda-transaction-status.h>

		#include <libgda/gda-statement.h>
		#include <libgda/gda-meta-store.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_CONNECTION (gda_connection_get_type())	#define GDA_TYPE_CONNECTION (gda_connection_get_type())
	#define GDA_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GD A_TYPE_CONNECTION, GdaConnection))	#define GDA_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GD A_TYPE_CONNECTION, GdaConnection))
	#define GDA_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA _TYPE_CONNECTION, GdaConnectionClass))	#define GDA_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA _TYPE_CONNECTION, GdaConnectionClass))
	#define GDA_IS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA _TYPE_CONNECTION))	#define GDA_IS_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj, GDA _TYPE_CONNECTION))
	#define GDA_IS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GD A_TYPE_CONNECTION))	#define GDA_IS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GD A_TYPE_CONNECTION))

	/* error reporting */	/* error reporting */
	extern GQuark gda_connection_error_quark (void);	extern GQuark gda_connection_error_quark (void);
	#define GDA_CONNECTION_ERROR gda_connection_error_quark ()	#define GDA_CONNECTION_ERROR gda_connection_error_quark ()

	typedef enum {	typedef enum {

		GDA_CONNECTION_DSN_NOT_FOUND_ERROR,
		GDA_CONNECTION_PROVIDER_NOT_FOUND_ERROR,
		GDA_CONNECTION_PROVIDER_ERROR,
	GDA_CONNECTION_CONN_OPEN_ERROR,	GDA_CONNECTION_CONN_OPEN_ERROR,
	GDA_CONNECTION_DO_QUERY_ERROR,	GDA_CONNECTION_DO_QUERY_ERROR,
	GDA_CONNECTION_NONEXIST_DSN_ERROR,	GDA_CONNECTION_NONEXIST_DSN_ERROR,
	GDA_CONNECTION_NO_CNC_SPEC_ERROR,	GDA_CONNECTION_NO_CNC_SPEC_ERROR,
	GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR,	GDA_CONNECTION_NO_PROVIDER_SPEC_ERROR,
	GDA_CONNECTION_OPEN_ERROR,	GDA_CONNECTION_OPEN_ERROR,

	GDA_CONNECTION_EXECUTE_COMMAND_ERROR	GDA_CONNECTION_EXECUTE_COMMAND_ERROR,
		GDA_CONNECTION_STATEMENT_TYPE_ERROR
	} GdaConnectionError;	} GdaConnectionError;

	struct _GdaConnection {	struct _GdaConnection {
	GObject object;	GObject object;
	GdaConnectionPrivate *priv;	GdaConnectionPrivate *priv;
	};	};

	struct _GdaConnectionClass {	struct _GdaConnectionClass {
	GObjectClass object_class;	GObjectClass object_class;


	skipping to change at line 80	skipping to change at line 83
	void (conn_opened) (GdaConnection obj);	void (conn_opened) (GdaConnection obj);
	void (conn_to_close) (GdaConnection obj);	void (conn_to_close) (GdaConnection obj);
	void (conn_closed) (GdaConnection obj);	void (conn_closed) (GdaConnection obj);
	void (dsn_changed) (GdaConnection obj);	void (dsn_changed) (GdaConnection obj);
	void (transaction_status_changed)(GdaConnection obj);	void (transaction_status_changed)(GdaConnection obj);
	};	};

	typedef enum {	typedef enum {
	GDA_CONNECTION_OPTIONS_NONE = 0,	GDA_CONNECTION_OPTIONS_NONE = 0,
	GDA_CONNECTION_OPTIONS_READ_ONLY = 1 << 0,	GDA_CONNECTION_OPTIONS_READ_ONLY = 1 << 0,

	GDA_CONNECTION_OPTIONS_DONT_SHARE = 2 << 0
	} GdaConnectionOptions;	} GdaConnectionOptions;

	typedef enum {	typedef enum {
	GDA_CONNECTION_FEATURE_AGGREGATES,	GDA_CONNECTION_FEATURE_AGGREGATES,
	GDA_CONNECTION_FEATURE_BLOBS,	GDA_CONNECTION_FEATURE_BLOBS,
	GDA_CONNECTION_FEATURE_INDEXES,	GDA_CONNECTION_FEATURE_INDEXES,
	GDA_CONNECTION_FEATURE_INHERITANCE,	GDA_CONNECTION_FEATURE_INHERITANCE,
	GDA_CONNECTION_FEATURE_NAMESPACES,	GDA_CONNECTION_FEATURE_NAMESPACES,
	GDA_CONNECTION_FEATURE_PROCEDURES,	GDA_CONNECTION_FEATURE_PROCEDURES,
	GDA_CONNECTION_FEATURE_SEQUENCES,	GDA_CONNECTION_FEATURE_SEQUENCES,

	skipping to change at line 121	skipping to change at line 123
	GDA_CONNECTION_SCHEMA_SEQUENCES,	GDA_CONNECTION_SCHEMA_SEQUENCES,
	GDA_CONNECTION_SCHEMA_TABLES,	GDA_CONNECTION_SCHEMA_TABLES,
	GDA_CONNECTION_SCHEMA_TRIGGERS,	GDA_CONNECTION_SCHEMA_TRIGGERS,
	GDA_CONNECTION_SCHEMA_TYPES,	GDA_CONNECTION_SCHEMA_TYPES,
	GDA_CONNECTION_SCHEMA_USERS,	GDA_CONNECTION_SCHEMA_USERS,
	GDA_CONNECTION_SCHEMA_VIEWS,	GDA_CONNECTION_SCHEMA_VIEWS,
	GDA_CONNECTION_SCHEMA_CONSTRAINTS,	GDA_CONNECTION_SCHEMA_CONSTRAINTS,
	GDA_CONNECTION_SCHEMA_TABLE_CONTENTS	GDA_CONNECTION_SCHEMA_TABLE_CONTENTS
	} GdaConnectionSchema;	} GdaConnectionSchema;


	GType gda_connection_get_type (void) G_GNUC_CONST	typedef enum {
	;	GDA_CONNECTION_META_NAMESPACES,
	GdaConnection gda_connection_new (GdaClient client,	GDA_CONNECTION_META_TYPES,
	GdaServerProvider *	GDA_CONNECTION_META_TABLES,
	provider,	GDA_CONNECTION_META_VIEWS,
	const gchar *dsn,	GDA_CONNECTION_META_FIELDS
	const gchar *userna	} GdaConnectionMetaType;
	me,
	const gchar *passwo	GType gda_connection_get_type (void) G_GNUC_CONS
	rd,	T;
	GdaConnectionOption	GdaConnection gda_connection_open_from_dsn (const gchar dsn,
	s options);	const gchar *auth_string,
		GdaConnectionOptio
		ns options, GError **error);
		GdaConnection gda_connection_open_from_string (const gchar prov
		ider_name,
		const gchar *cnc_s
		tring, const gchar *auth_string,
		GdaConnectionOptio
		ns options, GError **error);
	gboolean gda_connection_open (GdaConnection cn c, GError *error);	gboolean gda_connection_open (GdaConnection cn c, GError *error);
	void gda_connection_close (GdaConnection *cn c);	void gda_connection_close (GdaConnection *cn c);
	void gda_connection_close_no_warning (GdaConnection *cn c);	void gda_connection_close_no_warning (GdaConnection *cn c);
	gboolean gda_connection_is_opened (GdaConnection *cn c);	gboolean gda_connection_is_opened (GdaConnection *cn c);


	GdaClient gda_connection_get_client (GdaConnection cn c);	GdaConnectionOptions gda_connection_get_options (GdaConnection *cn c);


	const gchar gda_connection_get_provider (GdaConnection cn c);
	GdaServerProvider gda_connection_get_provider_obj (GdaConnection cn c);	GdaServerProvider gda_connection_get_provider_obj (GdaConnection cn c);

	GdaServerProviderInfo gda_connection_get_infos (GdaConnection cn	const gchar gda_connection_get_provider_name (GdaConnection cn
	c);	c);
	GdaConnectionOptions gda_connection_get_options (GdaConnection *cn
	c);


	const gchar gda_connection_get_server_version (GdaConnection cn
	c);
	const gchar gda_connection_get_database (GdaConnection cn
	c);
	const gchar gda_connection_get_dsn (GdaConnection cn c);	const gchar gda_connection_get_dsn (GdaConnection cn c);
	gboolean gda_connection_set_dsn (GdaConnection cn c, const gchar datasource);	gboolean gda_connection_set_dsn (GdaConnection cn c, const gchar datasource);
	const gchar gda_connection_get_cnc_string (GdaConnection cn c);	const gchar gda_connection_get_cnc_string (GdaConnection cn c);

	const gchar gda_connection_get_username (GdaConnection cn	const gchar gda_connection_get_authentification (GdaConnection cn
	c);	c);
	gboolean gda_connection_set_username (GdaConnection *cn
	c, const gchar *username);
	const gchar gda_connection_get_password (GdaConnection cn
	c);
	gboolean gda_connection_set_password (GdaConnection *cn
	c, const gchar *password);

	void gda_connection_add_event (GdaConnection cn c, GdaConnectionEvent event);	void gda_connection_add_event (GdaConnection cn c, GdaConnectionEvent event);
	GdaConnectionEvent gda_connection_add_event_string (GdaConnection cn c, const gchar *str, ...);	GdaConnectionEvent 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	GdaSqlParser gda_connection_create_parser (GdaConnection cn
	c, const gchar *name);	c);
		GObject gda_connection_batch_execute (GdaConnection cn
		c,
		GdaBatch *batch, G
		daSet *params,
		GdaStatementModelU
		sage model_usage, GError **error);


	GdaDataModel gda_connection_execute_select_command (GdaConnection	gchar gda_connection_statement_to_sql (GdaConnection cn
	cnc, GdaCommand *cmd,	c,
	GdaParameterList	GdaStatement *stmt
	params, GError *error);	, GdaSet *params, GdaStatementSqlFlag flags,
	gint gda_connection_execute_non_select_command (GdaConnecti	GSList **params_us
	on cnc, GdaCommand cmd,	ed, GError **error);
	GdaParameter	gboolean gda_connection_statement_prepare (GdaConnection *cn
	List params, GError *error);	c,
	GList gda_connection_execute_command (GdaConnection cn	GdaStatement *stmt
	c, GdaCommand *cmd,	, GError **error);
	GdaParameterList *	GObject gda_connection_statement_execute (GdaConnection cn
	params, GError **error);	c, GdaStatement stmt, GdaSet params,
	gchar gda_connection_get_last_insert_id (GdaConnection cn	GdaStatementModelU
	c, GdaDataModel *recset);	sage model_usage, GdaSet **last_insert_row,
		GError **error);
		GdaDataModel *gda_connection_statement_execute_select (GdaConnection
		cnc, GdaStatement stmt,
		GdaSet *params
		, GError **error);
		GdaDataModel *gda_connection_statement_execute_select_fullv (GdaConn
		ection cnc, GdaStatement stmt,
		GdaSet *
		params, GdaStatementModelUsage model_usage,
		GError *
		*error, ...);
		GdaDataModel *gda_connection_statement_execute_select_full (GdaConne
		ction cnc, GdaStatement stmt,
		GdaSet *p
		arams, GdaStatementModelUsage model_usage,
		GType *co
		l_types, GError **error);
		gint gda_connection_statement_execute_non_select (GdaConnec
		tion cnc, GdaStatement stmt,
		GdaSet *pa
		rams, GdaSet last_insert_row, GError error);

	gboolean gda_connection_begin_transaction (GdaConnection cn c, const gchar name,	gboolean gda_connection_begin_transaction (GdaConnection cn c, const gchar name,
	GdaTransactionIsol ation level, GError **error);	GdaTransactionIsol ation level, GError **error);
	gboolean gda_connection_commit_transaction (GdaConnection cn c, const gchar name, GError **error);	gboolean gda_connection_commit_transaction (GdaConnection cn c, const gchar name, GError **error);
	gboolean gda_connection_rollback_transaction (GdaConnection cn c, const gchar name, GError **error);	gboolean gda_connection_rollback_transaction (GdaConnection cn c, const gchar name, GError **error);

	gboolean gda_connection_add_savepoint (GdaConnection cn c, const gchar name, GError **error);	gboolean gda_connection_add_savepoint (GdaConnection cn c, const gchar name, GError **error);
	gboolean gda_connection_rollback_savepoint (GdaConnection cn c, const gchar name, GError **error);	gboolean gda_connection_rollback_savepoint (GdaConnection cn c, const gchar name, GError **error);
	gboolean gda_connection_delete_savepoint (GdaConnection cn c, const gchar name, GError **error);	gboolean gda_connection_delete_savepoint (GdaConnection cn c, const gchar name, GError **error);

	GdaTransactionStatus gda_connection_get_transaction_status (GdaConnection cnc);	GdaTransactionStatus gda_connection_get_transaction_status (GdaConnection cnc);

	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 (GdaConnection *cn c, GdaConnectionFeature feature);	gboolean gda_connection_supports_feature (GdaConnection *cn c, GdaConnectionFeature feature);

	GdaDataModel gda_connection_get_schema (GdaConnection cn	GdaMetaStore gda_connection_get_meta_store (GdaConnection cn
	c, GdaConnectionSchema schema,	c);
	GdaParameterList *	gboolean gda_connection_update_meta_store (GdaConnection *cn
	params, GError **error);	c, GdaMetaContext context, GError *error);
		GdaDataModel gda_connection_get_meta_store_data (GdaConnection cn
		c, GdaConnectionMetaType meta_type,
		GError **error, gi
		nt nb_filters, ...);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 16 change blocks.
	57 lines changed or deleted	85 lines changed or added

	gda-data-model-array.h	gda-data-model-array.h
	/* GDA common library	/* GDA common library

	* Copyright (C) 1998 - 2006 The GNOME Foundation.	* Copyright (C) 1998 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Rodrigo Moya <rodrigo@gnome-db.org>	* Rodrigo Moya <rodrigo@gnome-db.org>
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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.
	*	*

	skipping to change at line 43	skipping to change at line 43
	#define GDA_DATA_MODEL_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_CAST (o bj, GDA_TYPE_DATA_MODEL_ARRAY, GdaDataModelArray))	#define GDA_DATA_MODEL_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_CAST (o bj, GDA_TYPE_DATA_MODEL_ARRAY, GdaDataModelArray))
	#define GDA_DATA_MODEL_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klas s, GDA_TYPE_DATA_MODEL_ARRAY, GdaDataModelArrayClass))	#define GDA_DATA_MODEL_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klas s, GDA_TYPE_DATA_MODEL_ARRAY, GdaDataModelArrayClass))
	#define GDA_IS_DATA_MODEL_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (o bj, GDA_TYPE_DATA_MODEL_ARRAY))	#define GDA_IS_DATA_MODEL_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (o bj, GDA_TYPE_DATA_MODEL_ARRAY))
	#define GDA_IS_DATA_MODEL_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((kla ss), GDA_TYPE_DATA_MODEL_ARRAY))	#define GDA_IS_DATA_MODEL_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((kla ss), GDA_TYPE_DATA_MODEL_ARRAY))

	typedef struct _GdaDataModelArray GdaDataModelArray;	typedef struct _GdaDataModelArray GdaDataModelArray;
	typedef struct _GdaDataModelArrayClass GdaDataModelArrayClass;	typedef struct _GdaDataModelArrayClass GdaDataModelArrayClass;
	typedef struct _GdaDataModelArrayPrivate GdaDataModelArrayPrivate;	typedef struct _GdaDataModelArrayPrivate GdaDataModelArrayPrivate;

	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) G_GNUC_CONST;	GType gda_data_model_array_get_type (void) G_GNUC_CON
	GdaDataModel *gda_data_model_array_new_with_g_types (gint cols, ...);	ST;
	GdaDataModel *gda_data_model_array_new (gint cols);	GdaDataModel *gda_data_model_array_new_with_g_types (gint cols, ...);
	GdaDataModel gda_data_model_array_copy_model (GdaDataModel src, GE	GdaDataModel *gda_data_model_array_new (gint cols);
	rror **error);	GdaDataModelArray gda_data_model_array_copy_model (GdaDataModel sr
	void gda_data_model_array_set_n_columns (GdaDataModelArray *mo	c, GError **error);
	del, gint cols);	void gda_data_model_array_set_n_columns (GdaDataModelArra
	void gda_data_model_array_clear (GdaDataModelArray *mo	y *model, gint cols);
	del);	void gda_data_model_array_clear (GdaDataModelArra
		y *model);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-data-model-import.h	gda-data-model-import.h
	/* GDA common library	/* GDA common library

	* Copyright (C) 2006 The GNOME Foundation.	* Copyright (C) 2006 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library is distributed in the hope that it will be useful,

	skipping to change at line 26	skipping to change at line 26
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_DATA_MODEL_IMPORT_H__	#ifndef __GDA_DATA_MODEL_IMPORT_H__
	#define __GDA_DATA_MODEL_IMPORT_H__	#define __GDA_DATA_MODEL_IMPORT_H__


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

		#include <libgda/gda-set.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_DATA_MODEL_IMPORT (gda_data_model_import_get_ty pe())	#define GDA_TYPE_DATA_MODEL_IMPORT (gda_data_model_import_get_ty pe())
	#define GDA_DATA_MODEL_IMPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ( obj, GDA_TYPE_DATA_MODEL_IMPORT, GdaDataModelImport))	#define GDA_DATA_MODEL_IMPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ( obj, GDA_TYPE_DATA_MODEL_IMPORT, GdaDataModelImport))
	#define GDA_DATA_MODEL_IMPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (kla ss, GDA_TYPE_DATA_MODEL_IMPORT, GdaDataModelImportClass))	#define GDA_DATA_MODEL_IMPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (kla ss, GDA_TYPE_DATA_MODEL_IMPORT, GdaDataModelImportClass))
	#define GDA_IS_DATA_MODEL_IMPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE(o bj, GDA_TYPE_DATA_MODEL_IMPORT))	#define GDA_IS_DATA_MODEL_IMPORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE(o bj, GDA_TYPE_DATA_MODEL_IMPORT))
	#define GDA_IS_DATA_MODEL_IMPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((kla ss), GDA_TYPE_DATA_MODEL_IMPORT))	#define GDA_IS_DATA_MODEL_IMPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((kla ss), GDA_TYPE_DATA_MODEL_IMPORT))

	typedef struct _GdaDataModelImport GdaDataModelImport;	typedef struct _GdaDataModelImport GdaDataModelImport;
	typedef struct _GdaDataModelImportClass GdaDataModelImportClass;	typedef struct _GdaDataModelImportClass GdaDataModelImportClass;
	typedef struct _GdaDataModelImportPrivate GdaDataModelImportPrivate;	typedef struct _GdaDataModelImportPrivate GdaDataModelImportPrivate;

	struct _GdaDataModelImport {	struct _GdaDataModelImport {

	GdaObject object;	GObject object;
	GdaDataModelImportPrivate *priv;	GdaDataModelImportPrivate *priv;
	};	};

	struct _GdaDataModelImportClass {	struct _GdaDataModelImportClass {

	GdaObjectClass parent_class;	GObjectClass parent_class;
	};	};

	GType gda_data_model_import_get_type (void) G_GNUC_CONST;	GType gda_data_model_import_get_type (void) G_GNUC_CONST;

	GdaDataModel gda_data_model_import_new_file (const gchar filename, gb	GdaDataModel gda_data_model_import_new_file (const gchar filename, gb
	oolean random_access,	oolean random_access, GdaSet *options);
	GdaParameterList *options)	GdaDataModel gda_data_model_import_new_mem (const gchar data, gboole
	;	an random_access, GdaSet *options);
	GdaDataModel gda_data_model_import_new_mem (const gchar data, gboole
	an random_access,
	GdaParameterList *options)
	;
	GdaDataModel *gda_data_model_import_new_xml_node (xmlNodePtr node);	GdaDataModel *gda_data_model_import_new_xml_node (xmlNodePtr node);

	GSList gda_data_model_import_get_errors (GdaDataModelImport model );	GSList gda_data_model_import_get_errors (GdaDataModelImport model );
	void gda_data_model_import_clean_errors (GdaDataModelImport *model );	void gda_data_model_import_clean_errors (GdaDataModelImport *model );

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

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

	skipping to change at line 30	skipping to change at line 30
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_DATA_MODEL_PRIVATE_H__	#ifndef __GDA_DATA_MODEL_PRIVATE_H__
	#define __GDA_DATA_MODEL_PRIVATE_H__	#define __GDA_DATA_MODEL_PRIVATE_H__

	#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-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>
	#include <libgda/gda-data-model-extra.h>	#include <libgda/gda-data-model-extra.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


	/* Not implemented. See bug http://bugzilla.gnome.org/show_bug.cgi?id=41181
	1:
	const gchar *gda_data_model_get_command_text (GdaDat
	aModel *model);
	gboolean gda_data_model_set_command_text (GdaDat
	aModel model, const gchar txt);
	GdaCommandType gda_data_model_get_command_type (GdaDat
	aModel *model);
	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 int rows, gint nb_rows, const gchar 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);

	gboolean gda_data_model_move_iter_at_row (GdaDat aModel model, GdaDataModelIter iter, gint row);	gboolean gda_data_model_move_iter_at_row (GdaDat aModel model, GdaDataModelIter iter, gint row);
	gboolean gda_data_model_move_iter_next (GdaDat aModel model, GdaDataModelIter iter);	gboolean gda_data_model_move_iter_next (GdaDat aModel model, GdaDataModelIter iter);
	gboolean gda_data_model_move_iter_prev (GdaDat aModel model, GdaDataModelIter iter);	gboolean gda_data_model_move_iter_prev (GdaDat aModel model, GdaDataModelIter iter);

	G_END_DECLS	G_END_DECLS


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

	gda-data-model-query.h	gda-data-model-query.h
	/* GDA common library	/* GDA common library

	* Copyright (C) 2005 The GNOME Foundation.	* Copyright (C) 2005 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library is distributed in the hope that it will be useful,

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_DATA_MODEL_QUERY_H__	#ifndef __GDA_DATA_MODEL_QUERY_H__
	#define __GDA_DATA_MODEL_QUERY_H__	#define __GDA_DATA_MODEL_QUERY_H__

	#include <libgda/gda-data-model.h>	#include <libgda/gda-data-model.h>

	#include <libgda/gda-object.h>	#include <libgda/gda-connection.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#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 */	/* error reporting */
	extern GQuark gda_data_model_query_error_quark (void);	extern GQuark gda_data_model_query_error_quark (void);
	#define GDA_DATA_MODEL_QUERY_ERROR gda_data_model_query_error_quark ()	#define GDA_DATA_MODEL_QUERY_ERROR gda_data_model_query_error_quark ()

	typedef enum {	typedef enum {
	GDA_DATA_MODEL_QUERY_XML_LOAD_ERROR,	GDA_DATA_MODEL_QUERY_XML_LOAD_ERROR,

	GDA_DATA_MODEL_QUERY_COMPUTE_MODIF_QUERIES_ERROR	GDA_DATA_MODEL_QUERY_COMPUTE_MODIF_STATEMENTS_ERROR,
		GDA_DATA_MODEL_QUERY_MODIF_STATEMENT_ERROR,
		GDA_DATA_MODEL_QUERY_CONNECTION_ERROR
	} GdaDataModelQueryError;	} GdaDataModelQueryError;

	typedef enum {	typedef enum {
	GDA_DATA_MODEL_QUERY_OPTION_USE_ALL_FIELDS_IF_NO_PK = 1 << 0	GDA_DATA_MODEL_QUERY_OPTION_USE_ALL_FIELDS_IF_NO_PK = 1 << 0
	} GdaDataModelQueryOptions;	} GdaDataModelQueryOptions;

	struct _GdaDataModelQuery {	struct _GdaDataModelQuery {

	GdaObject object;	GObject object;
	GdaDataModelQueryPrivate *priv;	GdaDataModelQueryPrivate *priv;
	};	};

	struct _GdaDataModelQueryClass {	struct _GdaDataModelQueryClass {

	GdaObjectClass parent_class;	GObjectClass parent_class;
	};	};

	GType gda_data_model_query_get_type (void) G_GNUC_CONST;	GType gda_data_model_query_get_type (void) G_GNUC_CONST;

	GdaDataModel gda_data_model_query_new (GdaQue ry query);	GdaDataModel gda_data_model_query_new (GdaCon nection cnc, GdaStatement *select_stmt);


	GdaParameterList gda_data_model_query_get_parameter_list (GdaDat aModelQuery model);	GdaSet gda_data_model_query_get_parameter_list (GdaDat aModelQuery model);
	gboolean gda_data_model_query_refresh (GdaDat aModelQuery model, GError *error);	gboolean gda_data_model_query_refresh (GdaDat aModelQuery model, GError *error);
	gboolean gda_data_model_query_set_modification_query (GdaDat aModelQuery *model,	gboolean gda_data_model_query_set_modification_query (GdaDat aModelQuery *model,

	const g char query, GError *error);	GdaStat ement mod_stmt, GError *error);
	gboolean gda_data_model_query_compute_modification_queries (GdaDat aModelQuery model, const gchar target,	gboolean gda_data_model_query_compute_modification_queries (GdaDat aModelQuery model, const gchar target,
	GdaData ModelQueryOptions options, GError **error);	GdaData ModelQueryOptions options, GError **error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

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

	skipping to change at line 27	skipping to change at line 27
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_DATA_MODEL_ROW_H__	#ifndef __GDA_DATA_MODEL_ROW_H__
	#define __GDA_DATA_MODEL_ROW_H__	#define __GDA_DATA_MODEL_ROW_H__


	#include <libgda/gda-object.h>	#include <glib-object.h>
	#include <libgda/gda-command.h>
	#include <libgda/gda-value.h>	#include <libgda/gda-value.h>
	#include <libgda/gda-row.h>	#include <libgda/gda-row.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_DATA_MODEL_ROW (gda_data_model_row_get_type())	#define GDA_TYPE_DATA_MODEL_ROW (gda_data_model_row_get_type())
	#define GDA_DATA_MODEL_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj , GDA_TYPE_DATA_MODEL_ROW, GdaDataModelRow))	#define GDA_DATA_MODEL_ROW(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj , GDA_TYPE_DATA_MODEL_ROW, GdaDataModelRow))
	#define GDA_DATA_MODEL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_DATA_MODEL_ROW, GdaDataModelRowClass))	#define GDA_DATA_MODEL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_DATA_MODEL_ROW, GdaDataModelRowClass))
	#define GDA_IS_DATA_MODEL_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj , GDA_TYPE_DATA_MODEL_ROW))	#define GDA_IS_DATA_MODEL_ROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj , GDA_TYPE_DATA_MODEL_ROW))
	#define GDA_IS_DATA_MODEL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass ), GDA_TYPE_DATA_MODEL_ROW))	#define GDA_IS_DATA_MODEL_ROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass ), GDA_TYPE_DATA_MODEL_ROW))

	typedef struct _GdaDataModelRow GdaDataModelRow;	typedef struct _GdaDataModelRow GdaDataModelRow;
	typedef struct _GdaDataModelRowClass GdaDataModelRowClass;	typedef struct _GdaDataModelRowClass GdaDataModelRowClass;
	typedef struct _GdaDataModelRowPrivate GdaDataModelRowPrivate;	typedef struct _GdaDataModelRowPrivate GdaDataModelRowPrivate;

	struct _GdaDataModelRow {	struct _GdaDataModelRow {

	GdaObject object;	GObject object;
	GdaDataModelRowPrivate *priv;	GdaDataModelRowPrivate *priv;
	};	};

	struct _GdaDataModelRowClass {	struct _GdaDataModelRowClass {

	GdaObjectClass parent_class;	GObjectClass parent_class;

	/* virtual methods */	/* virtual methods */
	gint (* get_n_rows) (GdaDataModelRow *model);	gint (* get_n_rows) (GdaDataModelRow *model);
	gint (* get_n_columns) (GdaDataModelRow *model);	gint (* get_n_columns) (GdaDataModelRow *model);
	GdaRow ( get_row) (GdaDataModelRow model, gin t row, GError *error);	GdaRow ( get_row) (GdaDataModelRow model, gin t row, GError *error);
	const GValue ( get_value_at) (GdaDataModelRow *model, gin t col, gint row);	const GValue ( get_value_at) (GdaDataModelRow *model, gin t col, gint row);

	gboolean (* is_updatable) (GdaDataModelRow *model);	gboolean (* is_updatable) (GdaDataModelRow *model);

	GdaRow ( append_values) (GdaDataModelRow model, con st GList values, GError **error);	GdaRow ( append_values) (GdaDataModelRow model, con st GList values, GError **error);

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

	gda-data-model.h	gda-data-model.h
	/* GDA common library	/* GDA common library

	* Copyright (C) 1998 - 2007 The GNOME Foundation.	* Copyright (C) 1998 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Rodrigo Moya <rodrigo@gnome-db.org>	* Rodrigo Moya <rodrigo@gnome-db.org>
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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.
	*	*

	skipping to change at line 30	skipping to change at line 30
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_DATA_MODEL_H__	#ifndef __GDA_DATA_MODEL_H__
	#define __GDA_DATA_MODEL_H__	#define __GDA_DATA_MODEL_H__

	#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-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>
	#include <libgda/gda-enums.h>	#include <libgda/gda-enums.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_DATA_MODEL (gda_data_model_get_type())	#define GDA_TYPE_DATA_MODEL (gda_data_model_get_type())
	#define GDA_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GD A_TYPE_DATA_MODEL, GdaDataModel))	#define GDA_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GD A_TYPE_DATA_MODEL, GdaDataModel))
	#define GDA_IS_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GD A_TYPE_DATA_MODEL))	#define GDA_IS_DATA_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GD A_TYPE_DATA_MODEL))
	#define GDA_DATA_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj ), GDA_TYPE_DATA_MODEL, GdaDataModelClass))	#define GDA_DATA_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj ), GDA_TYPE_DATA_MODEL, GdaDataModelClass))

	typedef enum {	typedef enum {
	GDA_DATA_MODEL_ACCESS_RANDOM = 1 << 0,	GDA_DATA_MODEL_ACCESS_RANDOM = 1 << 0,
	GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD = 1 << 1,	GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD = 1 << 1,
	GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD = 1 << 2,	GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD = 1 << 2,

		GDA_DATA_MODEL_ACCESS_CURSOR = GDA_DATA_MODEL_ACCESS_CURSOR_FORWARD \| GDA_DATA_MODEL_ACCESS_CURSOR_BACKWARD,
	GDA_DATA_MODEL_ACCESS_INSERT = 1 << 3,	GDA_DATA_MODEL_ACCESS_INSERT = 1 << 3,
	GDA_DATA_MODEL_ACCESS_UPDATE = 1 << 4,	GDA_DATA_MODEL_ACCESS_UPDATE = 1 << 4,
	GDA_DATA_MODEL_ACCESS_DELETE = 1 << 5,	GDA_DATA_MODEL_ACCESS_DELETE = 1 << 5,
	GDA_DATA_MODEL_ACCESS_WRITE = GDA_DATA_MODEL_ACCESS_INSERT \| GDA_DAT A_MODEL_ACCESS_UPDATE \|	GDA_DATA_MODEL_ACCESS_WRITE = GDA_DATA_MODEL_ACCESS_INSERT \| GDA_DAT A_MODEL_ACCESS_UPDATE \|
	GDA_DATA_MODEL_ACCESS_DELETE	GDA_DATA_MODEL_ACCESS_DELETE
	} GdaDataModelAccessFlags;	} GdaDataModelAccessFlags;

	typedef enum {	typedef enum {
	GDA_DATA_MODEL_HINT_START_BATCH_UPDATE,	GDA_DATA_MODEL_HINT_START_BATCH_UPDATE,
	GDA_DATA_MODEL_HINT_END_BATCH_UPDATE,	GDA_DATA_MODEL_HINT_END_BATCH_UPDATE,

	skipping to change at line 102	skipping to change at line 102
	gboolean (* i_set_values) (GdaDataModel model, gi nt row, GList values,	gboolean (* i_set_values) (GdaDataModel model, gi nt row, GList values,
	GError **error);	GError **error);
	gint (* i_append_values) (GdaDataModel model, co nst GList values, GError **error);	gint (* i_append_values) (GdaDataModel model, co nst GList values, GError **error);
	gint (* i_append_row) (GdaDataModel model, GE rror *error);	gint (* i_append_row) (GdaDataModel model, GE rror *error);
	gboolean (* i_remove_row) (GdaDataModel model, gi nt row, GError *error);	gboolean (* i_remove_row) (GdaDataModel model, gi nt row, GError *error);
	gint (* i_find_row) (GdaDataModel model, GS List values, gint *cols_index);	gint (* i_find_row) (GdaDataModel model, GS List values, gint *cols_index);

	void (* i_set_notify) (GdaDataModel *model, gb oolean do_notify_changes);	void (* i_set_notify) (GdaDataModel *model, gb oolean do_notify_changes);
	gboolean (* i_get_notify) (GdaDataModel *model);	gboolean (* i_get_notify) (GdaDataModel *model);
	void (* i_send_hint) (GdaDataModel model, Gd aDataModelHint hint, const GValue hint_value);	void (* i_send_hint) (GdaDataModel model, Gd aDataModelHint hint, const GValue hint_value);

	gpointer reserved1;
	gpointer reserved2;
	gpointer reserved3;
	gpointer reserved4;

	/* signals */	/* signals */
	void (* row_inserted) (GdaDataModel *model, gi nt row);	void (* row_inserted) (GdaDataModel *model, gi nt row);
	void (* row_updated) (GdaDataModel *model, gi nt row);	void (* row_updated) (GdaDataModel *model, gi nt row);
	void (* row_removed) (GdaDataModel *model, gi nt row);	void (* row_removed) (GdaDataModel *model, gi nt row);

		void (* changed) (GdaDataModel *model);
	void (* reset) (GdaDataModel *model);	void (* reset) (GdaDataModel *model);

	gpointer sig_reserved1;
	gpointer sig_reserved2;
	gpointer sig_reserved3;
	gpointer sig_reserved4;
	};	};

	GType gda_data_model_get_type (void) G_GNUC_CON ST;	GType gda_data_model_get_type (void) G_GNUC_CON ST;

	gboolean gda_data_model_is_updatable (GdaDataModel *mo del);	gboolean gda_data_model_is_updatable (GdaDataModel *mo del);
	GdaDataModelAccessFlags gda_data_model_get_access_flags (GdaDataModel *model);	GdaDataModelAccessFlags gda_data_model_get_access_flags (GdaDataModel *model);

	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);


	skipping to change at line 154	skipping to change at line 147
	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, gint nb_cols,	const gint *cols, gint nb_cols,

	const gint rows, gint nb_rows, GdaParameterList options);	const gint rows, gint nb_rows, GdaSet 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,	const gint *rows, gint nb_rows,

	GdaParameterList options, GError *error);	GdaSet options, GError *error);

	gboolean gda_data_model_import_from_model (GdaDataModel to , GdaDataModel from, gboolean overwrite,	gboolean gda_data_model_import_from_model (GdaDataModel to , GdaDataModel from, gboolean overwrite,
	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);	GdaSet 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);	GdaSet options, GError *error);

	/* debug functions */	/* debug functions */
	void gda_data_model_dump (GdaDataModel mo del, FILE to_stream);	void gda_data_model_dump (GdaDataModel mo del, FILE to_stream);
	gchar gda_data_model_dump_as_string (GdaDataModel mo del);	gchar gda_data_model_dump_as_string (GdaDataModel mo del);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-data-proxy.h	gda-data-proxy.h
	/* gda-data-proxy.h	/* gda-data-proxy.h
	*	*

	* Copyright (C) 2005 - 2007 Vivien Malerba	* Copyright (C) 2005 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.

	skipping to change at line 25	skipping to change at line 25
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_DATA_PROXY_H_	#ifndef __GDA_DATA_PROXY_H_
	#define __GDA_DATA_PROXY_H_	#define __GDA_DATA_PROXY_H_

	#include "gda-decl.h"	#include "gda-decl.h"

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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_DATA_PROXY (gda_data_proxy_get_type())	#define GDA_TYPE_DATA_PROXY (gda_data_proxy_get_type())
	#define GDA_DATA_PROXY(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_d ata_proxy_get_type(), GdaDataProxy)	#define GDA_DATA_PROXY(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_d ata_proxy_get_type(), GdaDataProxy)
	#define GDA_DATA_PROXY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_da ta_proxy_get_type (), GdaDataProxyClass)	#define GDA_DATA_PROXY_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_da ta_proxy_get_type (), GdaDataProxyClass)
	#define GDA_IS_DATA_PROXY(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_d ata_proxy_get_type ())	#define GDA_IS_DATA_PROXY(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_d ata_proxy_get_type ())


	skipping to change at line 51	skipping to change at line 51
	GDA_DATA_PROXY_COMMIT_ERROR,	GDA_DATA_PROXY_COMMIT_ERROR,
	GDA_DATA_PROXY_COMMIT_CANCELLED,	GDA_DATA_PROXY_COMMIT_CANCELLED,
	GDA_DATA_PROXY_READ_ONLY_VALUE,	GDA_DATA_PROXY_READ_ONLY_VALUE,
	GDA_DATA_PROXY_READ_ONLY_ROW,	GDA_DATA_PROXY_READ_ONLY_ROW,
	GDA_DATA_PROXY_FILTER_ERROR	GDA_DATA_PROXY_FILTER_ERROR
	} GdaDataProxyError;	} GdaDataProxyError;

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaDataProxy	struct _GdaDataProxy
	{	{

	GdaObject object;	GObject object;
	GdaDataProxyPrivate *priv;	GdaDataProxyPrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaDataProxyClass	struct _GdaDataProxyClass
	{	{

	GdaObjectClass parent_class;	GObjectClass parent_class;

	void (* row_delete_changed) (GdaDataProxy *proxy, gint row, gboolean to_be_deleted);	void (* row_delete_changed) (GdaDataProxy *proxy, gint row, gboolean to_be_deleted);

	void (* sample_size_changed) (GdaDataProxy *proxy, gint sample_size);	void (* sample_size_changed) (GdaDataProxy *proxy, gint sample_size);
	void (* sample_changed) (GdaDataProxy *proxy, gint sample_start, gint sample_end);	void (* sample_changed) (GdaDataProxy *proxy, gint sample_start, gint sample_end);

	gboolean (* pre_changes_applied) (GdaDataProxy *proxy, gint row, gint proxied_row);	gboolean (* pre_changes_applied) (GdaDataProxy *proxy, gint row, gint proxied_row);
	void (* post_changes_applied) (GdaDataProxy *proxy, gint row, gint proxied_row);	void (* post_changes_applied) (GdaDataProxy *proxy, gint row, gint proxied_row);
	};	};


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

	gda-decl.h	gda-decl.h

	skipping to change at line 25	skipping to change at line 25
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GLOBAL_DECL_H_	#ifndef __GLOBAL_DECL_H_
	#define __GLOBAL_DECL_H_	#define __GLOBAL_DECL_H_

	#include <glib.h>	#include <glib.h>

		#include <libgda/gda-debug-macros.h>


	typedef struct _GdaObject GdaObject;	typedef struct _GdaConfig GdaConfig;
	typedef struct _GdaObjectClass GdaObjectClass;	typedef struct _GdaConfigClass GdaConfigClass;
	typedef struct _GdaObjectPrivate GdaObjectPrivate;

	typedef struct _GdaConnection GdaConnection;	typedef struct _GdaConnection GdaConnection;
	typedef struct _GdaConnectionClass GdaConnectionClass;	typedef struct _GdaConnectionClass GdaConnectionClass;
	typedef struct _GdaConnectionPrivate GdaConnectionPrivate;	typedef struct _GdaConnectionPrivate GdaConnectionPrivate;

	typedef struct _GdaConnectionEvent GdaConnectionEvent;	typedef struct _GdaConnectionEvent GdaConnectionEvent;
	typedef struct _GdaConnectionEventClass GdaConnectionEventClass;	typedef struct _GdaConnectionEventClass GdaConnectionEventClass;
	typedef struct _GdaConnectionEventPrivate GdaConnectionEventPrivate;	typedef struct _GdaConnectionEventPrivate GdaConnectionEventPrivate;

	typedef struct _GdaDataHandler GdaDataHandler;	typedef struct _GdaDataHandler GdaDataHandler;

	skipping to change at line 50	skipping to change at line 50

	typedef struct _GdaServerProvider GdaServerProvider;	typedef struct _GdaServerProvider GdaServerProvider;
	typedef struct _GdaServerProviderClass GdaServerProviderClass;	typedef struct _GdaServerProviderClass GdaServerProviderClass;
	typedef struct _GdaServerProviderPrivate GdaServerProviderPrivate;	typedef struct _GdaServerProviderPrivate GdaServerProviderPrivate;
	typedef struct _GdaServerProviderInfo GdaServerProviderInfo;	typedef struct _GdaServerProviderInfo GdaServerProviderInfo;

	typedef struct _GdaServerOperation GdaServerOperation;	typedef struct _GdaServerOperation GdaServerOperation;
	typedef struct _GdaServerOperationClass GdaServerOperationClass;	typedef struct _GdaServerOperationClass GdaServerOperationClass;
	typedef struct _GdaServerOperationPrivate GdaServerOperationPrivate;	typedef struct _GdaServerOperationPrivate GdaServerOperationPrivate;


	typedef struct _GdaClient GdaClient;
	typedef struct _GdaClientClass GdaClientClass;
	typedef struct _GdaClientPrivate GdaClientPrivate;

	typedef struct _GdaEntity GdaEntity;
	typedef struct _GdaEntityIface GdaEntityIface;

	typedef struct _GdaEntityField GdaEntityField;
	typedef struct _GdaEntityFieldIface GdaEntityFieldIface;

	typedef struct _GdaDataModelClass GdaDataModelClass;	typedef struct _GdaDataModelClass GdaDataModelClass;
	typedef struct _GdaDataModel GdaDataModel;	typedef struct _GdaDataModel GdaDataModel;

	typedef struct _GdaDataProxy GdaDataProxy;	typedef struct _GdaDataProxy GdaDataProxy;
	typedef struct _GdaDataProxyClass GdaDataProxyClass;	typedef struct _GdaDataProxyClass GdaDataProxyClass;
	typedef struct _GdaDataProxyPrivate GdaDataProxyPrivate;	typedef struct _GdaDataProxyPrivate GdaDataProxyPrivate;

	typedef struct _GdaColumn GdaColumn;	typedef struct _GdaColumn GdaColumn;
	typedef struct _GdaColumnClass GdaColumnClass;	typedef struct _GdaColumnClass GdaColumnClass;
	typedef struct _GdaColumnPrivate GdaColumnPrivate;	typedef struct _GdaColumnPrivate GdaColumnPrivate;

	typedef struct _GdaDataModelIter GdaDataModelIter;	typedef struct _GdaDataModelIter GdaDataModelIter;
	typedef struct _GdaDataModelIterClass GdaDataModelIterClass;	typedef struct _GdaDataModelIterClass GdaDataModelIterClass;
	typedef struct _GdaDataModelIterPrivate GdaDataModelIterPrivate;	typedef struct _GdaDataModelIterPrivate GdaDataModelIterPrivate;


	typedef struct _GdaDict GdaDict;	typedef struct _GdaHolder GdaHolder;
	typedef struct _GdaDictClass GdaDictClass;	typedef struct _GdaHolderClass GdaHolderClass;
	typedef struct _GdaDictPrivate GdaDictPrivate;	typedef struct _GdaHolderPrivate GdaHolderPrivate;
	extern GdaDict *default_dict;
	#define ASSERT_DICT(x) ((x) ? (x) : default_dict)

	typedef struct _GdaDictType GdaDictType;
	typedef struct _GdaDictTypeClass GdaDictTypeClass;
	typedef struct _GdaDictTypePrivate GdaDictTypePrivate;

	#define GDA_FUNC_AGG_TEST_PARAMS_DO_TEST 0
	typedef struct _GdaDictFunction GdaDictFunction;
	typedef struct _GdaDictFunctionClass GdaDictFunctionClass;
	typedef struct _GdaDictFunctionPrivate GdaDictFunctionPrivate;

	typedef struct _GdaDictAggregate GdaDictAggregate;
	typedef struct _GdaDictAggregateClass GdaDictAggregateClass;
	typedef struct _GdaDictAggregatePrivate GdaDictAggregatePrivate;

	typedef struct _GdaDictDatabase GdaDictDatabase;
	typedef struct _GdaDictDatabaseClass GdaDictDatabaseClass;
	typedef struct _GdaDictDatabasePrivate GdaDictDatabasePrivate;

	typedef struct _GdaDictTable GdaDictTable;
	typedef struct _GdaDictTableClass GdaDictTableClass;
	typedef struct _GdaDictTablePrivate GdaDictTablePrivate;

	typedef struct _GdaDictField GdaDictField;
	typedef struct _GdaDictFieldClass GdaDictFieldClass;
	typedef struct _GdaDictFieldPrivate GdaDictFieldPrivate;

	typedef struct _GdaDictConstraint GdaDictConstraint;
	typedef struct _GdaDictConstraintClass GdaDictConstraintClass;
	typedef struct _GdaDictConstraintPrivate GdaDictConstraintPrivate;

	typedef struct _GdaParameter GdaParameter;
	typedef struct _GdaParameterClass GdaParameterClass;
	typedef struct _GdaParameterPrivate GdaParameterPrivate;

	typedef struct _GdaParameterList GdaParameterList;
	typedef struct _GdaParameterListClass GdaParameterListClass;
	typedef struct _GdaParameterListNode GdaParameterListNode;
	typedef struct _GdaParameterListGroup GdaParameterListGroup;
	typedef struct _GdaParameterListSource GdaParameterListSource;
	typedef struct _GdaParameterListPrivate GdaParameterListPrivate;

	typedef struct _GdaXmlStorage GdaXmlStorage;
	typedef struct _GdaXmlStorageIface GdaXmlStorageIface;

	typedef struct _GdaRenderer GdaRenderer;
	typedef struct _GdaRendererIface GdaRendererIface;

	typedef struct _GdaReferer GdaReferer;
	typedef struct _GdaRefererIface GdaRefererIface;

	typedef struct _GdaObjectRef GdaObjectRef;
	typedef struct _GdaObjectRefClass GdaObjectRefClass;
	typedef struct _GdaObjectRefPrivate GdaObjectRefPrivate;

	typedef struct _GdaQuery GdaQuery;
	typedef struct _GdaQueryClass GdaQueryClass;
	typedef struct _GdaQueryPrivate GdaQueryPrivate;

	typedef struct _GdaQueryTarget GdaQueryTarget;
	typedef struct _GdaQueryTargetClass GdaQueryTargetClass;
	typedef struct _GdaQueryTargetPrivate GdaQueryTargetPrivate;

	typedef struct _GdaQueryJoin GdaQueryJoin;
	typedef struct _GdaQueryJoinClass GdaQueryJoinClass;
	typedef struct _GdaQueryJoinPrivate GdaQueryJoinPrivate;

	typedef struct _GdaQueryCondition GdaQueryCondition;
	typedef struct _GdaQueryConditionClass GdaQueryConditionClass;
	typedef struct _GdaQueryConditionPrivate GdaQueryConditionPrivate;

	typedef struct _GdaQueryField GdaQueryField;
	typedef struct _GdaQueryFieldClass GdaQueryFieldClass;
	typedef struct _GdaQueryFieldPrivate GdaQueryFieldPrivate;


	typedef struct _GdaQueryFieldAll GdaQueryFieldAll;	typedef struct _GdaSet GdaSet;
	typedef struct _GdaQueryFieldAllClass GdaQueryFieldAllClass;	typedef struct _GdaSetClass GdaSetClass;
	typedef struct _GdaQueryFieldAllPrivate GdaQueryFieldAllPrivate;	typedef struct _GdaSetNode GdaSetNode;
		typedef struct _GdaSetGroup GdaSetGroup;
		typedef struct _GdaSetSource GdaSetSource;
		typedef struct _GdaSetPrivate GdaSetPrivate;


	typedef struct _GdaQueryFieldField GdaQueryFieldField;	typedef struct _GdaBlobOp GdaBlobOp;
	typedef struct _GdaQueryFieldFieldClass GdaQueryFieldFieldClass;	typedef struct _GdaBlobOpClass GdaBlobOpClass;
	typedef struct _GdaQueryFieldFieldPrivate GdaQueryFieldFieldPrivate;


	typedef struct _GdaQueryFieldValue GdaQueryFieldValue;	/*
	typedef struct _GdaQueryFieldValueClass GdaQueryFieldValueClass;	* Statements & parser
	typedef struct _GdaQueryFieldValuePrivate GdaQueryFieldValuePrivate;	*/


	typedef struct _GdaQueryFieldFunc GdaQueryFieldFunc;	typedef struct _GdaBatch GdaBatch;
	typedef struct _GdaQueryFieldFuncClass GdaQueryFieldFuncClass;	typedef struct _GdaBatchClass GdaBatchClass;
	typedef struct _GdaQueryFieldFuncPrivate GdaQueryFieldFuncPrivate;	typedef struct _GdaBatchPrivate GdaBatchPrivate;


	typedef struct _GdaQueryFieldAgg GdaQueryFieldAgg;	typedef struct _GdaStatement GdaStatement;
	typedef struct _GdaQueryFieldAggClass GdaQueryFieldAggClass;	typedef struct _GdaStatementClass GdaStatementClass;
	typedef struct _GdaQueryFieldAggPrivate GdaQueryFieldAggPrivate;	typedef struct _GdaStatementPrivate GdaStatementPrivate;


	typedef struct _GdaBlobOp GdaBlobOp;	typedef struct _GdaSqlParser GdaSqlParser;
	typedef struct _GdaBlobOpClass GdaBlobOpClass;	typedef struct _GdaSqlParserClass GdaSqlParserClass;
		typedef struct _GdaSqlParserPrivate GdaSqlParserPrivate;

	/*	/*

	* Graphing part	* Meta data
	*/	*/

	typedef struct _GdaGraph GdaGraph;	typedef struct _GdaMetaStore GdaMetaStore;
	typedef struct _GdaGraphClass GdaGraphClass;	typedef struct _GdaMetaStoreClass GdaMetaStoreClass;
	typedef struct _GdaGraphPrivate GdaGraphPrivate;	typedef struct _GdaMetaStorePrivate GdaMetaStorePrivate;
		typedef struct _GdaMetaStoreClassPrivate GdaMetaStoreClassPrivate;
	typedef struct _GdaGraphQuery GdaGraphQuery;
	typedef struct _GdaGraphQueryClass GdaGraphQueryClass;
	typedef struct _GdaGraphQueryPrivate GdaGraphQueryPrivate;


	typedef struct _GdaGraphItem GdaGraphItem;	typedef struct _GdaMetaStruct GdaMetaStruct;
	typedef struct _GdaGraphItemClass GdaGraphItemClass;	typedef struct _GdaMetaStructClass GdaMetaStructClass;
	typedef struct _GdaGraphItemPrivate GdaGraphItemPrivate;	typedef struct _GdaMetaStructPrivate GdaMetaStructPrivate;

	/*	/*
	* Win32 adaptations	* Win32 adaptations
	*/	*/
	#ifdef G_OS_WIN32	#ifdef G_OS_WIN32
	#define strtok_r(s,d,p) strtok(s,d)	#define strtok_r(s,d,p) strtok(s,d)
	#endif	#endif


	/*
	* Various macros
	*/
	#ifdef GDA_DEBUG
	#define D_COL_NOR "\033[0m"
	#define D_COL_H0 "\033[;34;7m"
	#define D_COL_H1 "\033[;36;7m"
	#define D_COL_H2 "\033[;36;4m"
	#define D_COL_OK "\033[;32m"
	#define D_COL_ERR "\033[;31;1m"
	#define AAA(X) (g_print (D_COL_H1 "DEBUG MARK %d\n" D_COL_NOR, X))
	#define DEBUG_HEADER (g_print (D_COL_H0 "====================== %s %s():%d
	======================\n" D_COL_NOR, __FILE__, __FUNCTION__, __LINE__))
	#define DEBUG_HEADER_STR(str) (g_print (D_COL_H0 "====================== %s
	%s %s():%d ======================\n" D_COL_NOR, (str), __FILE__, __FUNCTIO
	N__, __LINE__))
	#endif

	#ifndef TO_IMPLEMENT
	#ifdef GDA_DEBUG
	#define TO_IMPLEMENT g_print (D_COL_ERR "Implementation missing:" D_COL
	_NOR " %s() in %s line %d\n", __FUNCTION__, __FILE__,__LINE__)
	#else
	#define TO_IMPLEMENT g_print ("Implementation missing: %s() in %s line
	%d\n", __FUNCTION__, __FILE__,__LINE__)
	#endif
	#endif

	#endif	#endif

End of changes. 14 change blocks.
	147 lines changed or deleted	34 lines changed or added

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

	#ifndef __LIBGDA_ENUM_TYPES_H__	#ifndef __LIBGDA_ENUM_TYPES_H__
	#define __LIBGDA_ENUM_TYPES_H__	#define __LIBGDA_ENUM_TYPES_H__

	#include <glib-object.h>	#include <glib-object.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/* enumerations from "gda-client.h" */
	GType gda_client_event_get_type (void);
	#define GDA_TYPE_CLIENT_EVENT (gda_client_event_get_type())
	GType gda_client_error_get_type (void);
	#define GDA_TYPE_CLIENT_ERROR (gda_client_error_get_type())
	/* enumerations from "gda-column-index.h" */	/* enumerations from "gda-column-index.h" */
	GType gda_sorting_get_type (void);	GType gda_sorting_get_type (void);
	#define GDA_TYPE_SORTING (gda_sorting_get_type())	#define GDA_TYPE_SORTING (gda_sorting_get_type())

	/* enumerations from "gda-command.h" */	/* enumerations from "gda-config.h" */
	GType gda_command_options_get_type (void);	GType gda_config_error_get_type (void);
	#define GDA_TYPE_COMMAND_OPTIONS (gda_command_options_get_type())	#define GDA_TYPE_CONFIG_ERROR (gda_config_error_get_type())
	GType gda_command_type_get_type (void);
	#define GDA_TYPE_COMMAND_TYPE (gda_command_type_get_type())
	/* enumerations from "gda-connection-event.h" */	/* enumerations from "gda-connection-event.h" */
	GType gda_connection_event_type_get_type (void);	GType gda_connection_event_type_get_type (void);
	#define GDA_TYPE_CONNECTION_EVENT_TYPE (gda_connection_event_type_get_type( ))	#define GDA_TYPE_CONNECTION_EVENT_TYPE (gda_connection_event_type_get_type( ))
	GType gda_connection_event_code_get_type (void);	GType gda_connection_event_code_get_type (void);
	#define GDA_TYPE_CONNECTION_EVENT_CODE (gda_connection_event_code_get_type( ))	#define GDA_TYPE_CONNECTION_EVENT_CODE (gda_connection_event_code_get_type( ))
	/* enumerations from "gda-connection.h" */	/* enumerations from "gda-connection.h" */
	GType gda_connection_error_get_type (void);	GType gda_connection_error_get_type (void);
	#define GDA_TYPE_CONNECTION_ERROR (gda_connection_error_get_type())	#define GDA_TYPE_CONNECTION_ERROR (gda_connection_error_get_type())
	GType gda_connection_options_get_type (void);	GType gda_connection_options_get_type (void);
	#define GDA_TYPE_CONNECTION_OPTIONS (gda_connection_options_get_type())	#define GDA_TYPE_CONNECTION_OPTIONS (gda_connection_options_get_type())
	GType gda_connection_feature_get_type (void);	GType gda_connection_feature_get_type (void);
	#define GDA_TYPE_CONNECTION_FEATURE (gda_connection_feature_get_type())	#define GDA_TYPE_CONNECTION_FEATURE (gda_connection_feature_get_type())
	GType gda_connection_schema_get_type (void);	GType gda_connection_schema_get_type (void);
	#define GDA_TYPE_CONNECTION_SCHEMA (gda_connection_schema_get_type())	#define GDA_TYPE_CONNECTION_SCHEMA (gda_connection_schema_get_type())

		GType gda_connection_meta_type_get_type (void);
		#define GDA_TYPE_CONNECTION_META_TYPE (gda_connection_meta_type_get_type())
	/* enumerations from "gda-data-model.h" */	/* enumerations from "gda-data-model.h" */
	GType gda_data_model_access_flags_get_type (void);	GType gda_data_model_access_flags_get_type (void);
	#define GDA_TYPE_DATA_MODEL_ACCESS_FLAGS (gda_data_model_access_flags_get_t ype())	#define GDA_TYPE_DATA_MODEL_ACCESS_FLAGS (gda_data_model_access_flags_get_t ype())
	GType gda_data_model_hint_get_type (void);	GType gda_data_model_hint_get_type (void);
	#define GDA_TYPE_DATA_MODEL_HINT (gda_data_model_hint_get_type())	#define GDA_TYPE_DATA_MODEL_HINT (gda_data_model_hint_get_type())
	GType gda_data_model_io_format_get_type (void);	GType gda_data_model_io_format_get_type (void);
	#define GDA_TYPE_DATA_MODEL_IO_FORMAT (gda_data_model_io_format_get_type())	#define GDA_TYPE_DATA_MODEL_IO_FORMAT (gda_data_model_io_format_get_type())
	/* enumerations from "gda-data-model-iter.h" */	/* enumerations from "gda-data-model-iter.h" */
	GType gda_data_model_iter_error_get_type (void);	GType gda_data_model_iter_error_get_type (void);
	#define GDA_TYPE_DATA_MODEL_ITER_ERROR (gda_data_model_iter_error_get_type( ))	#define GDA_TYPE_DATA_MODEL_ITER_ERROR (gda_data_model_iter_error_get_type( ))
	/* enumerations from "gda-data-model-query.h" */	/* enumerations from "gda-data-model-query.h" */
	GType gda_data_model_query_error_get_type (void);	GType gda_data_model_query_error_get_type (void);
	#define GDA_TYPE_DATA_MODEL_QUERY_ERROR (gda_data_model_query_error_get_typ e())	#define GDA_TYPE_DATA_MODEL_QUERY_ERROR (gda_data_model_query_error_get_typ e())
	GType gda_data_model_query_options_get_type (void);	GType gda_data_model_query_options_get_type (void);
	#define GDA_TYPE_DATA_MODEL_QUERY_OPTIONS (gda_data_model_query_options_get _type())	#define GDA_TYPE_DATA_MODEL_QUERY_OPTIONS (gda_data_model_query_options_get _type())
	/* enumerations from "gda-data-proxy.h" */	/* enumerations from "gda-data-proxy.h" */
	GType gda_data_proxy_error_get_type (void);	GType gda_data_proxy_error_get_type (void);
	#define GDA_TYPE_DATA_PROXY_ERROR (gda_data_proxy_error_get_type())	#define GDA_TYPE_DATA_PROXY_ERROR (gda_data_proxy_error_get_type())

	/* enumerations from "gda-dict-aggregate.h" */	/* enumerations from "gda-easy.h" */
	GType gda_dict_aggregate_error_get_type (void);	GType gda_general_error_get_type (void);
	#define GDA_TYPE_DICT_AGGREGATE_ERROR (gda_dict_aggregate_error_get_type())	#define GDA_TYPE_GENERAL_ERROR (gda_general_error_get_type())
	/* enumerations from "gda-dict-constraint.h" */
	GType gda_dict_constraint_error_get_type (void);
	#define GDA_TYPE_DICT_CONSTRAINT_ERROR (gda_dict_constraint_error_get_type(
	))
	GType gda_dict_constraint_type_get_type (void);
	#define GDA_TYPE_DICT_CONSTRAINT_TYPE (gda_dict_constraint_type_get_type())
	GType gda_dict_constraint_fk_action_get_type (void);
	#define GDA_TYPE_DICT_CONSTRAINT_FK_ACTION (gda_dict_constraint_fk_action_g
	et_type())
	/* enumerations from "gda-dict-database.h" */
	GType gda_dict_database_error_get_type (void);
	#define GDA_TYPE_DICT_DATABASE_ERROR (gda_dict_database_error_get_type())
	/* enumerations from "gda-dict-field.h" */
	GType gda_dict_field_error_get_type (void);
	#define GDA_TYPE_DICT_FIELD_ERROR (gda_dict_field_error_get_type())
	GType gda_dict_field_attribute_get_type (void);
	#define GDA_TYPE_DICT_FIELD_ATTRIBUTE (gda_dict_field_attribute_get_type())
	/* enumerations from "gda-dict-function.h" */
	GType gda_dict_function_error_get_type (void);
	#define GDA_TYPE_DICT_FUNCTION_ERROR (gda_dict_function_error_get_type())
	/* enumerations from "gda-dict.h" */
	GType gda_dict_error_get_type (void);
	#define GDA_TYPE_DICT_ERROR (gda_dict_error_get_type())
	/* enumerations from "gda-dict-table.h" */
	GType gda_dict_table_error_get_type (void);
	#define GDA_TYPE_DICT_TABLE_ERROR (gda_dict_table_error_get_type())
	/* enumerations from "gda-dict-type.h" */
	GType gda_dict_type_error_get_type (void);
	#define GDA_TYPE_DICT_TYPE_ERROR (gda_dict_type_error_get_type())
	/* enumerations from "gda-enums.h" */	/* enumerations from "gda-enums.h" */
	GType gda_transaction_isolation_get_type (void);	GType gda_transaction_isolation_get_type (void);
	#define GDA_TYPE_TRANSACTION_ISOLATION (gda_transaction_isolation_get_type( ))	#define GDA_TYPE_TRANSACTION_ISOLATION (gda_transaction_isolation_get_type( ))
	GType gda_value_attribute_get_type (void);	GType gda_value_attribute_get_type (void);
	#define GDA_TYPE_VALUE_ATTRIBUTE (gda_value_attribute_get_type())	#define GDA_TYPE_VALUE_ATTRIBUTE (gda_value_attribute_get_type())
	GType gda_graph_type_get_type (void);	GType gda_graph_type_get_type (void);
	#define GDA_TYPE_GRAPH_TYPE (gda_graph_type_get_type())	#define GDA_TYPE_GRAPH_TYPE (gda_graph_type_get_type())
	GType gda_query_field_state_get_type (void);	GType gda_query_field_state_get_type (void);
	#define GDA_TYPE_QUERY_FIELD_STATE (gda_query_field_state_get_type())	#define GDA_TYPE_QUERY_FIELD_STATE (gda_query_field_state_get_type())

	/* enumerations from "gda-object-ref.h" */	/* enumerations from "gda-holder.h" */
	GType gda_object_ref_type_get_type (void);	GType gda_holder_error_get_type (void);
	#define GDA_TYPE_OBJECT_REF_TYPE (gda_object_ref_type_get_type())	#define GDA_TYPE_HOLDER_ERROR (gda_holder_error_get_type())
	GType gda_object_ref_error_get_type (void);	/* enumerations from "gda-meta-store.h" */
	#define GDA_TYPE_OBJECT_REF_ERROR (gda_object_ref_error_get_type())	GType gda_meta_store_error_get_type (void);
	/* enumerations from "gda-parameter.h" */	#define GDA_TYPE_META_STORE_ERROR (gda_meta_store_error_get_type())
	GType gda_parameter_error_get_type (void);	GType gda_meta_store_change_type_get_type (void);
	#define GDA_TYPE_PARAMETER_ERROR (gda_parameter_error_get_type())	#define GDA_TYPE_META_STORE_CHANGE_TYPE (gda_meta_store_change_type_get_typ
	/* enumerations from "gda-parameter-list.h" */	e())
	GType gda_parameter_list_error_get_type (void);	/* enumerations from "gda-meta-struct.h" */
	#define GDA_TYPE_PARAMETER_LIST_ERROR (gda_parameter_list_error_get_type())	GType gda_meta_struct_error_get_type (void);
	GType gda_parameter_list_param_hint_get_type (void);	#define GDA_TYPE_META_STRUCT_ERROR (gda_meta_struct_error_get_type())
	#define GDA_TYPE_PARAMETER_LIST_PARAM_HINT (gda_parameter_list_param_hint_g	GType gda_meta_db_object_type_get_type (void);
	et_type())	#define GDA_TYPE_META_DB_OBJECT_TYPE (gda_meta_db_object_type_get_type())
	/* enumerations from "gda-query-condition.h" */	GType gda_meta_struct_feature_get_type (void);
	GType gda_query_condition_type_get_type (void);	#define GDA_TYPE_META_STRUCT_FEATURE (gda_meta_struct_feature_get_type())
	#define GDA_TYPE_QUERY_CONDITION_TYPE (gda_query_condition_type_get_type())	GType gda_meta_sort_type_get_type (void);
	GType gda_query_condition_operator_get_type (void);	#define GDA_TYPE_META_SORT_TYPE (gda_meta_sort_type_get_type())
	#define GDA_TYPE_QUERY_CONDITION_OPERATOR (gda_query_condition_operator_get	GType gda_meta_graph_info_get_type (void);
	_type())	#define GDA_TYPE_META_GRAPH_INFO (gda_meta_graph_info_get_type())
	GType gda_query_condition_error_get_type (void);	/* enumerations from "gda-set.h" */
	#define GDA_TYPE_QUERY_CONDITION_ERROR (gda_query_condition_error_get_type(	GType gda_set_error_get_type (void);
	))	#define GDA_TYPE_SET_ERROR (gda_set_error_get_type())
	/* enumerations from "gda-query-field-agg.h" */	GType gda_set_hint_get_type (void);
	GType gda_query_field_agg_error_get_type (void);	#define GDA_TYPE_SET_HINT (gda_set_hint_get_type())
	#define GDA_TYPE_QUERY_FIELD_AGG_ERROR (gda_query_field_agg_error_get_type(
	))
	/* enumerations from "gda-query-field-all.h" */
	GType gda_query_field_all_error_get_type (void);
	#define GDA_TYPE_QUERY_FIELD_ALL_ERROR (gda_query_field_all_error_get_type(
	))
	/* enumerations from "gda-query-field-field.h" */
	GType gda_query_field_field_error_get_type (void);
	#define GDA_TYPE_QUERY_FIELD_FIELD_ERROR (gda_query_field_field_error_get_t
	ype())
	/* enumerations from "gda-query-field-func.h" */
	GType gda_query_field_func_error_get_type (void);
	#define GDA_TYPE_QUERY_FIELD_FUNC_ERROR (gda_query_field_func_error_get_typ
	e())
	/* enumerations from "gda-query-field.h" */
	GType gda_query_field_error_get_type (void);
	#define GDA_TYPE_QUERY_FIELD_ERROR (gda_query_field_error_get_type())
	/* enumerations from "gda-query-field-value.h" */
	GType gda_query_field_value_error_get_type (void);
	#define GDA_TYPE_QUERY_FIELD_VALUE_ERROR (gda_query_field_value_error_get_t
	ype())
	/* enumerations from "gda-query.h" */
	GType gda_query_type_get_type (void);
	#define GDA_TYPE_QUERY_TYPE (gda_query_type_get_type())
	GType gda_query_error_get_type (void);
	#define GDA_TYPE_QUERY_ERROR (gda_query_error_get_type())
	/* enumerations from "gda-query-join.h" */
	GType gda_query_join_type_get_type (void);
	#define GDA_TYPE_QUERY_JOIN_TYPE (gda_query_join_type_get_type())
	GType gda_query_join_error_get_type (void);
	#define GDA_TYPE_QUERY_JOIN_ERROR (gda_query_join_error_get_type())
	/* enumerations from "gda-query-target.h" */
	GType gda_query_target_error_get_type (void);
	#define GDA_TYPE_QUERY_TARGET_ERROR (gda_query_target_error_get_type())
	/* enumerations from "gda-renderer.h" */
	GType gda_renderer_options_get_type (void);
	#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())

		/* enumerations from "gda-server-provider.h" */
		GType gda_server_provider_error_get_type (void);
		#define GDA_TYPE_SERVER_PROVIDER_ERROR (gda_server_provider_error_get_type(
		))
		/* enumerations from "gda-statement.h" */
		GType gda_statement_error_get_type (void);
		#define GDA_TYPE_STATEMENT_ERROR (gda_statement_error_get_type())
		GType gda_statement_model_usage_get_type (void);
		#define GDA_TYPE_STATEMENT_MODEL_USAGE (gda_statement_model_usage_get_type(
		))
		GType gda_statement_sql_flag_get_type (void);
		#define GDA_TYPE_STATEMENT_SQL_FLAG (gda_statement_sql_flag_get_type())
	/* enumerations from "gda-transaction-status.h" */	/* enumerations from "gda-transaction-status.h" */
	GType gda_transaction_status_event_type_get_type (void);	GType gda_transaction_status_event_type_get_type (void);
	#define GDA_TYPE_TRANSACTION_STATUS_EVENT_TYPE (gda_transaction_status_even t_type_get_type())	#define GDA_TYPE_TRANSACTION_STATUS_EVENT_TYPE (gda_transaction_status_even t_type_get_type())
	GType gda_transaction_status_state_get_type (void);	GType gda_transaction_status_state_get_type (void);
	#define GDA_TYPE_TRANSACTION_STATUS_STATE (gda_transaction_status_state_get _type())	#define GDA_TYPE_TRANSACTION_STATUS_STATE (gda_transaction_status_state_get _type())

	/* enumerations from "libgda.h" */
	GType gda_general_error_get_type (void);
	#define GDA_TYPE_GENERAL_ERROR (gda_general_error_get_type())
	G_END_DECLS	G_END_DECLS

	#endif /* __LIBGDA_ENUM_TYPES_H__ */	#endif /* __LIBGDA_ENUM_TYPES_H__ */

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

	gda-handler-bin.h	gda-handler-bin.h
	/* gda-handler-bin.h	/* gda-handler-bin.h
	*	*

	* Copyright (C) 2005 - 2007 Vivien Malerba	* Copyright (C) 2005 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_HANDLER_BIN__	#ifndef __GDA_HANDLER_BIN__
	#define __GDA_HANDLER_BIN__	#define __GDA_HANDLER_BIN__


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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_HANDLER_BIN (gda_handler_bin_get_type())	#define GDA_TYPE_HANDLER_BIN (gda_handler_bin_get_type())
	#define GDA_HANDLER_BIN(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_ handler_bin_get_type(), GdaHandlerBin)	#define GDA_HANDLER_BIN(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_ handler_bin_get_type(), GdaHandlerBin)
	#define GDA_HANDLER_BIN_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_h andler_bin_get_type (), GdaHandlerBinClass)	#define GDA_HANDLER_BIN_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_h andler_bin_get_type (), GdaHandlerBinClass)
	#define GDA_IS_HANDLER_BIN(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_ handler_bin_get_type ())	#define GDA_IS_HANDLER_BIN(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_ handler_bin_get_type ())

	typedef struct _GdaHandlerBin GdaHandlerBin;	typedef struct _GdaHandlerBin GdaHandlerBin;
	typedef struct _GdaHandlerBinClass GdaHandlerBinClass;	typedef struct _GdaHandlerBinClass GdaHandlerBinClass;
	typedef struct _GdaHandlerBinPriv GdaHandlerBinPriv;	typedef struct _GdaHandlerBinPriv GdaHandlerBinPriv;

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaHandlerBin	struct _GdaHandlerBin
	{	{

	GdaObject object;	GObject object;

	GdaHandlerBinPriv *priv;	GdaHandlerBinPriv *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaHandlerBinClass	struct _GdaHandlerBinClass
	{	{

	GdaObjectClass parent_class;	GObjectClass parent_class;
	};	};

	GType gda_handler_bin_get_type (void) G_GNUC_CONST;	GType gda_handler_bin_get_type (void) G_GNUC_CONST;
	GdaDataHandler *gda_handler_bin_new (void);	GdaDataHandler *gda_handler_bin_new (void);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-handler-type.h	gda-handler-type.h
	/* gda-handler-type.h	/* gda-handler-type.h
	*	*

	* Copyright (C) 2005 Vivien Malerba	* Copyright (C) 2005 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_HANDLER_TYPE__	#ifndef __GDA_HANDLER_TYPE__
	#define __GDA_HANDLER_TYPE__	#define __GDA_HANDLER_TYPE__


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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_HANDLER_TYPE (gda_handler_type_get_type())	#define GDA_TYPE_HANDLER_TYPE (gda_handler_type_get_type())
	#define GDA_HANDLER_TYPE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda _handler_type_get_type(), GdaHandlerType)	#define GDA_HANDLER_TYPE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda _handler_type_get_type(), GdaHandlerType)
	#define GDA_HANDLER_TYPE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_ handler_type_get_type (), GdaHandlerTypeClass)	#define GDA_HANDLER_TYPE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_ handler_type_get_type (), GdaHandlerTypeClass)
	#define GDA_IS_HANDLER_TYPE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda _handler_type_get_type ())	#define GDA_IS_HANDLER_TYPE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda _handler_type_get_type ())

	typedef struct _GdaHandlerType GdaHandlerType;	typedef struct _GdaHandlerType GdaHandlerType;
	typedef struct _GdaHandlerTypeClass GdaHandlerTypeClass;	typedef struct _GdaHandlerTypeClass GdaHandlerTypeClass;
	typedef struct _GdaHandlerTypePriv GdaHandlerTypePriv;	typedef struct _GdaHandlerTypePriv GdaHandlerTypePriv;

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaHandlerType	struct _GdaHandlerType
	{	{

	GdaObject object;	GObject object;

	GdaHandlerTypePriv *priv;	GdaHandlerTypePriv *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaHandlerTypeClass	struct _GdaHandlerTypeClass
	{	{

	GdaObjectClass parent_class;	GObjectClass parent_class;
	};	};

	GType gda_handler_type_get_type (void) G_GNUC_CONST;	GType gda_handler_type_get_type (void) G_GNUC_CONST;
	GdaDataHandler *gda_handler_type_new (void);	GdaDataHandler *gda_handler_type_new (void);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-marshal.h	gda-marshal.h

	skipping to change at line 50	skipping to change at line 50
	gpointer marshal_data);	gpointer marshal_data);

	/* VOID:OBJECT,UINT,UINT (gda-marshal.list:31) */	/* VOID:OBJECT,UINT,UINT (gda-marshal.list:31) */
	extern void gda_marshal_VOID__OBJECT_UINT_UINT (GClosure *closure,	extern void gda_marshal_VOID__OBJECT_UINT_UINT (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_value s,	guint n_param_value s,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hi nt,	gpointer invocation_hi nt,
	gpointer marshal_data) ;	gpointer marshal_data) ;


	/* VOID:STRING,UINT,UINT (gda-marshal.list:32) */	/* VOID:OBJECT,BOOLEAN (gda-marshal.list:32) */
		extern void gda_marshal_VOID__OBJECT_BOOLEAN (GClosure *closure,
		GValue *return_value,
		guint n_param_values,
		const GValue *param_values,
		gpointer invocation_hint
		,
		gpointer marshal_data);

		/* VOID:STRING,UINT,UINT (gda-marshal.list:33) */
	extern void gda_marshal_VOID__STRING_UINT_UINT (GClosure *closure,	extern void gda_marshal_VOID__STRING_UINT_UINT (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_value s,	guint n_param_value s,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hi nt,	gpointer invocation_hi nt,
	gpointer marshal_data) ;	gpointer marshal_data) ;


	/* VOID:ENUM,OBJECT (gda-marshal.list:33) */	/* VOID:ENUM,OBJECT (gda-marshal.list:34) */
	extern void gda_marshal_VOID__ENUM_OBJECT (GClosure *closure,	extern void gda_marshal_VOID__ENUM_OBJECT (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_values,	guint n_param_values,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hint,	gpointer invocation_hint,
	gpointer marshal_data);	gpointer marshal_data);


	/* VOID:UINT,POINTER (gda-marshal.list:34) */	/* VOID:UINT,POINTER (gda-marshal.list:35) */
	#define gda_marshal_VOID__UINT_POINTER g_cclosure_marshal_VOID__UINT_POINTE R	#define gda_marshal_VOID__UINT_POINTER g_cclosure_marshal_VOID__UINT_POINTE R


	/* VOID:INT,INT (gda-marshal.list:35) */	/* VOID:INT,INT (gda-marshal.list:36) */
	extern void gda_marshal_VOID__INT_INT (GClosure *closure,	extern void gda_marshal_VOID__INT_INT (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_values,	guint n_param_values,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hint,	gpointer invocation_hint,
	gpointer marshal_data);	gpointer marshal_data);


	/* VOID:INT,BOXED,BOXED (gda-marshal.list:36) */	/* VOID:INT,BOXED,BOXED (gda-marshal.list:37) */
	extern void gda_marshal_VOID__INT_BOXED_BOXED (GClosure *closure,	extern void gda_marshal_VOID__INT_BOXED_BOXED (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_values ,	guint n_param_values ,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hin t,	gpointer invocation_hin t,
	gpointer marshal_data);	gpointer marshal_data);


	/* VOID:INT,BOOLEAN (gda-marshal.list:37) */	/* VOID:INT,BOOLEAN (gda-marshal.list:38) */
	extern void gda_marshal_VOID__INT_BOOLEAN (GClosure *closure,	extern void gda_marshal_VOID__INT_BOOLEAN (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_values,	guint n_param_values,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hint,	gpointer invocation_hint,
	gpointer marshal_data);	gpointer marshal_data);


	/* VOID:STRING,INT (gda-marshal.list:38) */	/* VOID:STRING,INT (gda-marshal.list:39) */
	extern void gda_marshal_VOID__STRING_INT (GClosure *closure,	extern void gda_marshal_VOID__STRING_INT (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_values,	guint n_param_values,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hint,	gpointer invocation_hint,
	gpointer marshal_data);	gpointer marshal_data);


	/* BOOLEAN:INT (gda-marshal.list:39) */	/* VOID:ENUM,POINTER (gda-marshal.list:40) */
		extern void gda_marshal_VOID__ENUM_POINTER (GClosure *closure,
		GValue *return_value,
		guint n_param_values,
		const GValue *param_values,
		gpointer invocation_hint,
		gpointer marshal_data);

		/* BOOLEAN:INT (gda-marshal.list:41) */
	extern void gda_marshal_BOOLEAN__INT (GClosure *closure,	extern void gda_marshal_BOOLEAN__INT (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_values,	guint n_param_values,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hint,	gpointer invocation_hint,
	gpointer marshal_data);	gpointer marshal_data);


	/* BOOLEAN:INT,INT (gda-marshal.list:40) */	/* BOOLEAN:INT,INT (gda-marshal.list:42) */
	extern void gda_marshal_BOOLEAN__INT_INT (GClosure *closure,	extern void gda_marshal_BOOLEAN__INT_INT (GClosure *closure,
	GValue *return_value,	GValue *return_value,
	guint n_param_values,	guint n_param_values,
	const GValue *param_values,	const GValue *param_values,
	gpointer invocation_hint,	gpointer invocation_hint,
	gpointer marshal_data);	gpointer marshal_data);


		/* POINTER:POINTER (gda-marshal.list:43) */
		extern void gda_marshal_POINTER__POINTER (GClosure *closure,
		GValue *return_value,
		guint n_param_values,
		const GValue *param_values,
		gpointer invocation_hint,
		gpointer marshal_data);

	G_END_DECLS	G_END_DECLS

	#endif /* __gda_marshal_MARSHAL_H__ */	#endif /* __gda_marshal_MARSHAL_H__ */

End of changes. 10 change blocks.
	9 lines changed or deleted	34 lines changed or added

	gda-report-engine.h	gda-report-engine.h
	/* GDA	/* GDA

	* Copyright (C) 2007 The GNOME Foundation.	* Copyright (C) 2007 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library is distributed in the hope that it will be useful,

	skipping to change at line 29	skipping to change at line 29
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_REPORT_ENGINE_H__	#ifndef __GDA_REPORT_ENGINE_H__
	#define __GDA_REPORT_ENGINE_H__	#define __GDA_REPORT_ENGINE_H__

	#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-query.h>	#include <libgda/gda-statement.h>

	#define GDA_TYPE_REPORT_ENGINE (gda_report_engine_get_type())	#define GDA_TYPE_REPORT_ENGINE (gda_report_engine_get_type())
	#define GDA_REPORT_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_REPORT_ENGINE, GdaReportEngine))	#define GDA_REPORT_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_REPORT_ENGINE, GdaReportEngine))
	#define GDA_REPORT_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_REPORT_ENGINE, GdaReportEngineClass))	#define GDA_REPORT_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, GDA_TYPE_REPORT_ENGINE, GdaReportEngineClass))
	#define GDA_IS_REPORT_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_REPORT_ENGINE))	#define GDA_IS_REPORT_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_REPORT_ENGINE))
	#define GDA_IS_REPORT_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass) , GDA_TYPE_REPORT_ENGINE))	#define GDA_IS_REPORT_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass) , GDA_TYPE_REPORT_ENGINE))

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _GdaReportEngine GdaReportEngine;	typedef struct _GdaReportEngine GdaReportEngine;

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 56	skipping to change at line 56
	GDA_SERVER_OPERATION_CREATE_TABLE,	GDA_SERVER_OPERATION_CREATE_TABLE,
	GDA_SERVER_OPERATION_DROP_TABLE,	GDA_SERVER_OPERATION_DROP_TABLE,
	GDA_SERVER_OPERATION_RENAME_TABLE,	GDA_SERVER_OPERATION_RENAME_TABLE,

	GDA_SERVER_OPERATION_ADD_COLUMN,	GDA_SERVER_OPERATION_ADD_COLUMN,
	GDA_SERVER_OPERATION_DROP_COLUMN,	GDA_SERVER_OPERATION_DROP_COLUMN,

	GDA_SERVER_OPERATION_CREATE_INDEX,	GDA_SERVER_OPERATION_CREATE_INDEX,
	GDA_SERVER_OPERATION_DROP_INDEX,	GDA_SERVER_OPERATION_DROP_INDEX,


		GDA_SERVER_OPERATION_CREATE_VIEW,
		GDA_SERVER_OPERATION_DROP_VIEW,

	GDA_SERVER_OPERATION_NB	GDA_SERVER_OPERATION_NB
	} GdaServerOperationType;	} GdaServerOperationType;

	typedef enum {	typedef enum {
	GDA_SERVER_OPERATION_NODE_PARAMLIST,	GDA_SERVER_OPERATION_NODE_PARAMLIST,
	GDA_SERVER_OPERATION_NODE_DATA_MODEL,	GDA_SERVER_OPERATION_NODE_DATA_MODEL,
	GDA_SERVER_OPERATION_NODE_PARAM,	GDA_SERVER_OPERATION_NODE_PARAM,
	GDA_SERVER_OPERATION_NODE_SEQUENCE,	GDA_SERVER_OPERATION_NODE_SEQUENCE,
	GDA_SERVER_OPERATION_NODE_SEQUENCE_ITEM,	GDA_SERVER_OPERATION_NODE_SEQUENCE_ITEM,


	skipping to change at line 80	skipping to change at line 83
	typedef enum {	typedef enum {
	GDA_SERVER_OPERATION_STATUS_OPTIONAL,	GDA_SERVER_OPERATION_STATUS_OPTIONAL,
	GDA_SERVER_OPERATION_STATUS_REQUIRED,	GDA_SERVER_OPERATION_STATUS_REQUIRED,
	GDA_SERVER_OPERATION_STATUS_UNKNOWN	GDA_SERVER_OPERATION_STATUS_UNKNOWN
	} GdaServerOperationNodeStatus;	} GdaServerOperationNodeStatus;

	typedef struct _GdaServerOperationNode {	typedef struct _GdaServerOperationNode {
	GdaServerOperationNodeType type;	GdaServerOperationNodeType type;
	GdaServerOperationNodeStatus status;	GdaServerOperationNodeStatus status;


	GdaParameterList *plist;	GdaSet *plist;
	GdaDataModel *model;	GdaDataModel *model;
	GdaColumn *column;	GdaColumn *column;

	GdaParameter *param;	GdaHolder *param;
	gpointer priv;	gpointer priv;
	} GdaServerOperationNode;	} GdaServerOperationNode;

	struct _GdaServerOperation {	struct _GdaServerOperation {
	GObject object;	GObject object;
	GdaServerOperationPrivate *priv;	GdaServerOperationPrivate *priv;
	};	};

	struct _GdaServerOperationClass {	struct _GdaServerOperationClass {
	GObjectClass parent_class;	GObjectClass parent_class;

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

	gda-server-provider-extra.h	gda-server-provider-extra.h
	/* gda-server-provider-extra.h	/* gda-server-provider-extra.h
	*	*

	* Copyright (C) 2005 - 2007 Vivien Malerba	* Copyright (C) 2005 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.

	skipping to change at line 31	skipping to change at line 31
	#ifndef __GDA_SERVER_PROVIDER_EXTRA__	#ifndef __GDA_SERVER_PROVIDER_EXTRA__
	#define __GDA_SERVER_PROVIDER_EXTRA__	#define __GDA_SERVER_PROVIDER_EXTRA__

	#include <libgda/gda-decl.h>	#include <libgda/gda-decl.h>
	#include <libgda/gda-value.h>	#include <libgda/gda-value.h>
	#include <libgda/gda-connection.h>	#include <libgda/gda-connection.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/*	/*

		* GdaSqlParser associated to each provider
		*/
		GdaSqlParser gda_server_provider_internal_get_parser (GdaServerProvider p
		rov);

		/*
	* Help to implement providers, so the schemas return the same	* Help to implement providers, so the schemas return the same
	* number of columns and column titles across the providers.	* number of columns and column titles across the providers.
	*/	*/
	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);

	/*	/*

		* Default perform operation
		*/
		gboolean gda_server_provider_perform_operation_default (GdaServerProvider *
		provider, GdaConnection *cnc,
		GdaServerOperation *
		op, GError **error);

		/* default data handler method */
		GdaDataHandler *gda_server_provider_get_data_handler_default (GdaServerProv
		ider provider, GdaConnection cnc,
		GType type, co
		nst gchar *dbms_type);

		/*
	* 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 g_type;	GType g_type;
	gchar *dbms_type;	gchar *dbms_type;
	} GdaServerProviderHandlerInfo;	} GdaServerProviderHandlerInfo;


	guint gda_server_provider_handler_info_hash_func (GdaServerProvi
	derHandlerInfo *key);
	gboolean gda_server_provider_handler_info_equal_func (GdaServerProvi
	derHandlerInfo *a,
	GdaServerProvid
	erHandlerInfo *b);
	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 g_type, c onst 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 g_type, c onst gchar *dbms_type);	GType g_type, c onst gchar *dbms_type);

	/*	/*
	* misc	* misc
	*/	*/

	gboolean gda_server_provider_blob_list_for_update (GdaConnection	gboolean gda_server_provider_blob_list_for_update (GdaConnection
	cnc, GdaQuery query,	cnc, GdaStatement query,
	GdaQuery **out_	GdaStatement **
	select, GError **error);	out_select, GError **error);
	gboolean gda_server_provider_blob_list_for_delete (GdaConnection	gboolean gda_server_provider_blob_list_for_delete (GdaConnection
	cnc, GdaQuery query,	cnc, GdaStatement query,
	GdaQuery **out_	GdaStatement **
	select, GError **error);	out_stmt, GError **error);
	gboolean gda_server_provider_split_update_query (GdaConnection	gboolean gda_server_provider_split_update_query (GdaConnection
	cnc, GdaQuery query,	cnc, GdaStatement query,
	GdaQuery **out_	GdaStatement **
	query, GError **error);	out_stmt, GError **error);
	gboolean gda_server_provider_select_query_has_blobs (GdaConnection	gboolean gda_server_provider_select_query_has_blobs (GdaConnection
	cnc, GdaQuery query, GError **error);	cnc, GdaStatement stmt, GError **error);

	gchar gda_server_provider_find_file (GdaServerProvi der prov, const gchar inst_dir, const gchar filename);	gchar gda_server_provider_find_file (GdaServerProvi der prov, const gchar inst_dir, const gchar filename);
	gchar gda_server_provider_load_file_contents (const gchar i nst_dir, const gchar data_dir, const gchar filename);	gchar gda_server_provider_load_file_contents (const gchar i nst_dir, const gchar data_dir, const gchar filename);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-server-provider.h	gda-server-provider.h
	/* GDA library	/* GDA library

	* Copyright (C) 1998 - 2007 The GNOME Foundation.	* Copyright (C) 1998 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Rodrigo Moya <rodrigo@gnome-db.org>	* Rodrigo Moya <rodrigo@gnome-db.org>
	* Bas Driessen <bas.driessen@xobas.com>	* Bas Driessen <bas.driessen@xobas.com>
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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.

	skipping to change at line 28	skipping to change at line 28
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_SERVER_PROVIDER_H__	#ifndef __GDA_SERVER_PROVIDER_H__
	#define __GDA_SERVER_PROVIDER_H__	#define __GDA_SERVER_PROVIDER_H__


	#include <libgda/gda-command.h>
	#include <libgda/gda-server-operation.h>	#include <libgda/gda-server-operation.h>
	#include <libgda/gda-connection.h>	#include <libgda/gda-connection.h>
	#include <libgda/gda-data-model.h>	#include <libgda/gda-data-model.h>
	#include <libgda/gda-data-model-index.h>	#include <libgda/gda-data-model-index.h>
	#include <libgda/gda-quark-list.h>	#include <libgda/gda-quark-list.h>

	#include <libgda/gda-client.h>	#include <libgda/gda-statement.h>
		#include <libgda/gda-meta-store.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_SERVER_PROVIDER (gda_server_provider_get_type() )	#define GDA_TYPE_SERVER_PROVIDER (gda_server_provider_get_type() )
	#define GDA_SERVER_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST (ob j, GDA_TYPE_SERVER_PROVIDER, GdaServerProvider))	#define GDA_SERVER_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST (ob j, GDA_TYPE_SERVER_PROVIDER, GdaServerProvider))
	#define GDA_SERVER_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass , GDA_TYPE_SERVER_PROVIDER, GdaServerProviderClass))	#define GDA_SERVER_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass , GDA_TYPE_SERVER_PROVIDER, GdaServerProviderClass))
	#define GDA_IS_SERVER_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj , GDA_TYPE_SERVER_PROVIDER))	#define GDA_IS_SERVER_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE(obj , GDA_TYPE_SERVER_PROVIDER))
	#define GDA_IS_SERVER_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass ), GDA_TYPE_SERVER_PROVIDER))	#define GDA_IS_SERVER_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass ), GDA_TYPE_SERVER_PROVIDER))


	/*	/* error reporting */
	* struct to hold any information specific to the provider used	extern GQuark gda_server_provider_error_quark (void);
	*/	#define GDA_SERVER_PROVIDER_ERROR gda_server_provider_error_quark ()
	struct _GdaServerProviderInfo {
	gchar provider_name; / equal to the return of gda_connect
	ion_get_provider() */


	/*	typedef enum
	* TRUE if all comparisons of names can be done on the lower case v	{
	ersions of the objects names	GDA_SERVER_PROVIDER_METHOD_NON_IMPLEMENTED_ERROR,
	*/	GDA_SERVER_PROVIDER_PREPARE_STMT_ERROR,
	gboolean is_case_insensitive;	GDA_SERVER_PROVIDER_EMPTY_STMT_ERROR,
		GDA_SERVER_PROVIDER_MISSING_PARAM_ERROR,
		GDA_SERVER_PROVIDER_STATEMENT_EXEC_ERROR,
		GDA_SERVER_PROVIDER_OPERATION_ERROR,
		GDA_SERVER_PROVIDER_INTERNAL_ERROR,
		GDA_SERVER_PROVIDER_BUSY_ERROR,
		GDA_SERVER_PROVIDER_NON_SUPPORTED_ERROR
		} GdaServerProviderError;


	/*	struct _GdaServerProvider {
	* TRUE to suppose that there are implicit casts available for data	GObject object;
	types which have	GdaServerProviderPrivate *priv;
	* the same gda type	};
	*/
	gboolean implicit_data_types_casts;


	/*	typedef struct {
	* TRUE if writing "... FROM mytable AS alias..." is ok, and FALSE	/* _information_schema_catalog_name */
	if we need to write this as	gboolean (_info) (GdaServerProvider , GdaConnection *,
	* "... FROM mytable alias..."	GdaMetaStore , GdaMetaContext , GError **);
	*/
	gboolean alias_needs_as_keyword;


	/* TRUE is tables can be aliased in SELECT queries*/	/* _builtin_data_types */
	gboolean supports_alias;	gboolean (_btypes) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);


	/* TRUE if it is possible to write "SELECT table.field ..." or if it	/* _udt */
	is only possible	gboolean (_udt) (GdaServerProvider , GdaConnection *,
	* to write "SELECT field..."	GdaMetaStore , GdaMetaContext , GError **);
	*/	gboolean (udt) (GdaServerProvider , GdaConnection *,
	gboolean supports_prefixed_fields;	GdaMetaStore , GdaMetaContext , GError **,
		const GValue *udt_catalog, const GValu
		e *udt_schema);


	/* TRUE if non lower case identifiers must be surrounded by double q	/* _udt_columns */
	uotes to distinguish them	gboolean (_udt_cols) (GdaServerProvider , GdaConnection *,
	* with their lower case equivalent, that is TRUE if by default the	GdaMetaStore , GdaMetaContext , GError **);
	non lower case identifiers	gboolean (udt_cols) (GdaServerProvider , GdaConnection *,
	* are converted into lower case.	GdaMetaStore , GdaMetaContext , GError **,
	*/	const GValue *udt_catalog, const GValu
	gboolean quote_non_lc_identifiers;	e udt_schema, const GValue udt_name);


	/* reserved for extensions */	/* _enums */
	gboolean reserved[20];	gboolean (_enums) (GdaServerProvider , GdaConnection *,
	};	GdaMetaStore , GdaMetaContext , GError **);
		gboolean (enums) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *udt_catalog, const GValu
		e udt_schema, const GValue udt_name);


	struct _GdaServerProvider {	/* _domains */
	GObject object;	gboolean (_domains) (GdaServerProvider , GdaConnection *,
	GdaServerProviderPrivate *priv;	GdaMetaStore , GdaMetaContext , GError **);
	};	gboolean (domains) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *domain_catalog, const GV
		alue *domain_schema);


	struct _GdaServerProviderClass {	/* _domain_constraints */
	GObjectClass parent_class;	gboolean (_constraints_dom) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (constraints_dom) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *domain_catalog, const GV
		alue domain_schema, const GValue domain_name);


	/* signals */	/* _element_types */
	void (* last_connection_gone) (GdaServerProvider *	gboolean (_el_types) (GdaServerProvider , GdaConnection *,
	provider);	GdaMetaStore , GdaMetaContext , GError **);
	gpointer sig_reserved1;
	gpointer sig_reserved2;
	gpointer sig_reserved3;
	gpointer sig_reserved4;


	/* virtual methods */	/* _collations */
		gboolean (_collations) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (collations) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *collation_catalog, cons
		t GValue *collation_schema,
		const GValue *collation_name_n);


	/* provider information */	/* _character_sets */
	const gchar ( get_version) (GdaServerProvider *provider)	gboolean (_character_sets) (GdaServerProvider , GdaConnection *,
	;	GdaMetaStore , GdaMetaContext , GError **);
	const gchar ( get_server_version) (GdaServerProvider *pr	gboolean (character_sets) (GdaServerProvider , GdaConnection *,
	ovider,	GdaMetaStore , GdaMetaContext , GError **,
	GdaConnection *cnc);	const GValue *chset_catalog, const GVa
	GdaServerProviderInfo ( get_info) (GdaServerProvider *provider,	lue chset_schema, const GValue chset_name_n);
	GdaConnection *cnc);
	gboolean (* supports_feature) (GdaServerProvider *prov
	ider,
	GdaConnection *cnc,
	GdaConnectionFeature fe
	ature);


	GdaDataModel ( get_schema) (GdaServerProvider *provider,	/* _schemata */
	GdaConnection *cnc,	gboolean (_schemata) (GdaServerProvider , GdaConnection *,
	GdaConnectionSchema schema,	GdaMetaStore , GdaMetaContext , GError **);
	GdaParameterList *params);	gboolean (schemata) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *catalog_name, const GVal
		ue *schema_name_n);

		/* _tables or _views */
		gboolean (_tables_views) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (tables_views) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *table_catalog, const GVa
		lue table_schema, const GValue table_name_n);

		/* _columns */
		gboolean (_columns) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (columns) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *table_catalog, const GVa
		lue table_schema, const GValue table_name);

		/* _view_column_usage */
		gboolean (_view_cols) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (view_cols) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *view_catalog, const GVal
		ue view_schema, const GValue view_name);

		/* _table_constraints */
		gboolean (_constraints_tab) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (constraints_tab) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *table_catalog, const GVa
		lue table_schema, const GValue table_name,
		const GValue *constraint_name_n);

		/* _referential_constraints */
		gboolean (_constraints_ref) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (constraints_ref) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *table_catalog, const GVa
		lue table_schema, const GValue table_name,
		const GValue *constraint_name);

		/* _key_column_usage */
		gboolean (_key_columns) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (key_columns) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *table_catalog, const GVa
		lue table_schema, const GValue table_name,
		const GValue *constraint_name);

		/* _check_column_usage */
		gboolean (_check_columns) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (check_columns) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *table_catalog, const GVa
		lue table_schema, const GValue table_name,
		const GValue *constraint_name);

		/* _triggers */
		gboolean (_triggers) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (triggers) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *table_catalog, const GVa
		lue table_schema, const GValue table_name);

		/* _routines */
		gboolean (_routines) (GdaServerProvider , GdaConnection *, G
		daMetaStore , GdaMetaContext , GError **);
		gboolean (routines) (GdaServerProvider , GdaConnection *, G
		daMetaStore , GdaMetaContext , GError **,
		const GValue *routine_catalog, const GV
		alue *routine_schema,
		const GValue *routine_name_n);

		/* _routine_columns */
		gboolean (_routine_col) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (routine_col) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *rout_catalog, const GVal
		ue rout_schema, const GValue rout_name);


		/* _parameters */
		gboolean (_routine_par) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **);
		gboolean (routine_par) (GdaServerProvider , GdaConnection *,
		GdaMetaStore , GdaMetaContext , GError **,
		const GValue *rout_catalog, const GVal
		ue rout_schema, const GValue rout_name);

		} GdaServerProviderMeta;

		typedef void (GdaServerProviderAsyncCallback) (GdaServerProvider provider
		, GdaConnection *cnc, guint task_id,
		gboolean result_status, gpoi
		nter data);

		struct _GdaServerProviderClass {
		GObjectClass parent_class;

		/* provider information */
		const gchar ( get_name) (GdaServerProvider
		*provider);
		const gchar ( get_version) (GdaServerProvider
		*provider);
		const gchar ( get_server_version) (GdaServerProvider
		provider, GdaConnection cnc);
		gboolean (* supports_feature) (GdaServerProvider
		provider, GdaConnection cnc,
		GdaConnectionFeatu
		re feature);
	/* types and values manipulation */	/* types and values manipulation */

	GdaDataHandler ( get_data_handler) (GdaServerProvider *prov	GdaDataHandler ( get_data_handler) (GdaServerProvider
	ider,	provider, GdaConnection cnc,
	GdaConnection *cnc,	GType g_type, cons
	GType g_type,	t gchar *dbms_type);
	const gchar *dbms_type)	const gchar (get_def_dbms_type) (GdaServerProvider
	;	provider, GdaConnection cnc, GType g_type);
	GValue ( string_to_value) (GdaServerProvider *provi	gchar (escape_string) (GdaServerProvider
	der,	provider, GdaConnection cnc, const gchar *str);
	GdaConnection *cnc,	gchar (unescape_string) (GdaServerProvider
	const gchar *string,	provider, GdaConnection cnc, const gchar *str);
	GType prefered_type,
	gchar **dbms_type);
	const gchar (get_def_dbms_type) (GdaServerProvider *prov
	ider,
	GdaConnection *cnc,
	GType g_type);
	gchar (escape_string) (GdaServerProvider *prov
	ider,
	GdaConnection *cnc, con
	st gchar *str);
	gchar (unescape_string) (GdaServerProvider *prov
	ider,
	GdaConnection *cnc, con
	st gchar *str);

	/* connections management */	/* connections management */

	gboolean (* open_connection) (GdaServerProvider *provi	gboolean (* open_connection) (GdaServerProvider
	der,	provider, GdaConnection cnc,
	GdaConnection *cnc,	GdaQuarkList *para
	GdaQuarkList *params,	ms, GdaQuarkList *auth,
	const gchar *username,	guint *task_id, Gd
	const gchar *password);	aServerProviderAsyncCallback async_cb,
	gboolean (* close_connection) (GdaServerProvider *prov	gpointer cb_data);
	ider,	gboolean (* close_connection) (GdaServerProvider
	GdaConnection *cnc);	provider, GdaConnection cnc);


	const gchar ( get_database) (GdaServerProvider *provider	const gchar ( get_database) (GdaServerProvider
	,	provider, GdaConnection cnc);
	GdaConnection *cnc);
	gboolean (* change_database) (GdaServerProvider *provi
	der,
	GdaConnection *cnc,
	const gchar *name);
	/* operations */
	gboolean (* supports_operation) (GdaServerProvider *pr
	ovider, GdaConnection *cnc,
	GdaServerOperationTyp
	e type, GdaParameterList *options);
	GdaServerOperation ( create_operation) (GdaServerProvider *pr
	ovider, GdaConnection *cnc,
	GdaServerOperationTyp
	e type,
	GdaParameterList *opt
	ions, GError **error);
	gchar ( render_operation) (GdaServerProvider *pr
	ovider, GdaConnection *cnc,
	GdaServerOperation *o
	p, GError **error);
	gboolean (* perform_operation) (GdaServerProvider *pr
	ovider, GdaConnection *cnc,
	GdaServerOperation *o
	p, GError **error);


	/* commands */	/* operations */
	GList ( execute_command) (GdaServerProvider *prov	gboolean (* supports_operation) (GdaServerProvider
	ider,	provider, GdaConnection cnc,
	GdaConnection *cnc,	GdaServerOperation
	GdaCommand *cmd,	Type type, GdaSet *options);
	GdaParameterList *param	GdaServerOperation ( create_operation) (GdaServerProvider
	s);	provider, GdaConnection cnc,
	GdaObject ( execute_query) (GdaServerProvider *provid	GdaServerOperation
	er,	Type type, GdaSet options, GError *error);
	GdaConnection *cnc,	gchar ( render_operation) (GdaServerProvider
	GdaQuery *query,	provider, GdaConnection cnc,
	GdaParameterList *params)	GdaServerOperation
	;	op, GError *error);
	char ( get_last_insert_id) (GdaServerProvider *p	gboolean (* perform_operation) (GdaServerProvider
	rovider,	provider, GdaConnection cnc,
	GdaConnection *cnc,	GdaServerOperation
	GdaDataModel *recset	*op,
	);	guint *task_id, Gd
		aServerProviderAsyncCallback async_cb,
		gpointer cb_data,
		GError **error);

	/* transactions */	/* transactions */

	gboolean (* begin_transaction) (GdaServerProvider *pr	gboolean (* begin_transaction) (GdaServerProvider
	ovider,	provider, GdaConnection cnc,
	GdaConnection *cnc,	const gchar *name,
	const gchar *name, Gd	GdaTransactionIsolation level, GError **error);
	aTransactionIsolation level,	gboolean (* commit_transaction) (GdaServerProvider
	GError **error);	provider, GdaConnection cnc,
	gboolean (* commit_transaction) (GdaServerProvider *p	const gchar *name,
	rovider,	GError **error);
	GdaConnection *cnc,	gboolean (* rollback_transaction) (GdaServerProvider
	const gchar *name, G	provider, GdaConnection cnc,
	Error **error);	const gchar *name,
	gboolean (* rollback_transaction) (GdaServerProvider	GError **error);
	*provider,	gboolean (* add_savepoint) (GdaServerProvider
	GdaConnection *cnc	provider, GdaConnection cnc,
	,	const gchar *name,
		GError **error);
		gboolean (* rollback_savepoint) (GdaServerProvider
		provider, GdaConnection cnc,
		const gchar *name,
		GError **error);
		gboolean (* delete_savepoint) (GdaServerProvider
		provider, GdaConnection cnc,
	const gchar name, GError *error);	const gchar name, GError *error);

	gboolean (* add_savepoint) (GdaServerProvider *p
	rovider,
	GdaConnection *cnc,
	const gchar *name, G
	Error **error);
	gboolean (* rollback_savepoint) (GdaServerProvider *p
	rovider,
	GdaConnection *cnc,
	const gchar *name, G
	Error **error);
	gboolean (* delete_savepoint) (GdaServerProvider *p
	rovider,
	GdaConnection *cnc,
	const gchar *name, G
	Error **error);


	/* future extensions */	/* GdaStatement */
	gpointer reserved1; /* is_reserved_word() ? */	GdaSqlParser ( create_parser) (GdaServerProvider
	gpointer reserved2; /* ping_or_reconnect() ? */	provider, GdaConnection cnc);
	gpointer reserved3; /* execute () ? */	gchar ( statement_to_sql) (GdaServerProvider
	gpointer reserved4;	provider, GdaConnection cnc,
	/* extended from 3.0 */	GdaStatement *stmt
		, GdaSet *params, GdaStatementSqlFlag flags,
		GSList **params_us
		ed, GError **error);
		gboolean (* statement_prepare) (GdaServerProvider
		provider, GdaConnection cnc,
		GdaStatement *stmt
		, GError **error);
		GObject ( statement_execute) (GdaServerProvider
		provider, GdaConnection cnc,
		GdaStatement *stmt
		, GdaSet *params,
		GdaStatementModelU
		sage model_usage,
		GType *col_types,
		GdaSet **last_inserted_row,
		guint *task_id, Gd
		aServerProviderAsyncCallback async_cb,
		gpointer cb_data,
		GError **error);


	GdaConnection ( create_connection) (GdaServerProvider *p	/* Misc */
	rovider);	gboolean (* is_busy) (GdaServerProvider
		provider, GdaConnection cnc, GError **error);
		gboolean (* cancel) (GdaServerProvider
		provider, GdaConnection cnc,
		guint task_id, GEr
		ror **error);
		GdaConnection ( create_connection) (GdaServerProvider
		*provider);
		GdaServerProviderMeta meta_funcs;

		/* Padding for future expansion */
		void (*_gda_reserved1) (void);
		void (*_gda_reserved2) (void);
		void (*_gda_reserved3) (void);
		void (*_gda_reserved4) (void);
		void (*_gda_reserved5) (void);
		void (*_gda_reserved6) (void);
	};	};

	GType gda_server_provider_get_type (void) G_GNUC_CONST;	GType gda_server_provider_get_type (void) G_GNUC_CONST;

	/* provider information */	/* provider information */

		const gchar gda_server_provider_get_name (GdaServerPro vider provider);
	const gchar gda_server_provider_get_version (GdaServerPro vider provider);	const gchar gda_server_provider_get_version (GdaServerPro vider provider);

	const gchar *gda_server_provider_get_server_version (GdaServerPro	const gchar *gda_server_provider_get_server_version (GdaServerPro
	vider *provider,	vider provider, GdaConnection cnc);
	GdaConnection	gboolean gda_server_provider_supports_feature (GdaServerPro
	*cnc);	vider provider, GdaConnection cnc,
	GdaServerProviderInfo *gda_server_provider_get_info (GdaServerPro
	vider *provider,
	GdaConnection
	*cnc);
	gboolean gda_server_provider_supports_feature (GdaServerPro
	vider *provider,
	GdaConnection
	*cnc,
	GdaConnection Feature feature);	GdaConnection Feature feature);

	GdaDataModel *gda_server_provider_get_schema (GdaServerPro
	vider *provider,
	GdaConnection
	*cnc,
	GdaConnection
	Schema schema,
	GdaParameterL
	ist params, GError *error);

	/* types and values manipulation */	/* types and values manipulation */
	GdaDataHandler gda_server_provider_get_data_handler_gtype(GdaServer Provider provider,	GdaDataHandler gda_server_provider_get_data_handler_gtype(GdaServer Provider provider,
	GdaConnect ion *cnc,	GdaConnect ion *cnc,
	GType for_ type);	GType for_ type);
	GdaDataHandler gda_server_provider_get_data_handler_dbms (GdaServer Provider provider,	GdaDataHandler gda_server_provider_get_data_handler_dbms (GdaServer Provider provider,
	GdaConnect ion *cnc,	GdaConnect ion *cnc,
	const gcha r *for_type);	const gcha r *for_type);
	GValue gda_server_provider_string_to_value (GdaServer Provider provider,	GValue gda_server_provider_string_to_value (GdaServer Provider provider,
	GdaConnect ion *cnc,	GdaConnect ion *cnc,

	skipping to change at line 243	skipping to change at line 295
	GdaConnect ion *cnc,	GdaConnect ion *cnc,
	GValue *fr om);	GValue *fr om);
	const gchar gda_server_provider_get_default_dbms_type (GdaServer Provider provider,	const gchar gda_server_provider_get_default_dbms_type (GdaServer Provider provider,
	GdaConnect ion *cnc,	GdaConnect ion *cnc,
	GType type );	GType type );
	gchar gda_server_provider_escape_string (GdaServer Provider provider,	gchar gda_server_provider_escape_string (GdaServer Provider provider,
	GdaConnect ion cnc, const gchar str);	GdaConnect ion cnc, const gchar str);
	gchar gda_server_provider_unescape_string (GdaServer Provider provider,	gchar gda_server_provider_unescape_string (GdaServer Provider provider,
	GdaConnect ion cnc, const gchar str);	GdaConnect ion cnc, const gchar str);


	/* connections management */
	GdaConnection gda_server_provider_create_connection (GdaClient cl
	ient, GdaServerProvider *provider,
	const gchar *d
	sn,
	const gchar *u
	sername,
	const gchar *p
	assword,
	GdaConnectionO
	ptions options);
	GdaConnection *gda_server_provider_create_connection_from_string (G
	daClient client, GdaServerProvider provider,
	co
	nst gchar *cnc_string,
	co
	nst gchar *username,
	co
	nst gchar *password,
	Gd
	aConnectionOptions options);
	gboolean gda_server_provider_open_connection (GdaServerProvi
	der *provider,
	GdaConnection *
	cnc,
	GdaQuarkList *p
	arams,
	const gchar *us
	ername,
	const gchar *pa
	ssword);

	gboolean gda_server_provider_close_connection (GdaServerProvi
	der *provider,
	GdaConnection *
	cnc);

	const gchar *gda_server_provider_get_database (GdaServerProvi
	der *provider,
	GdaConnection *
	cnc);
	gboolean gda_server_provider_change_database (GdaServerProvi
	der *provider,
	GdaConnection *
	cnc,
	const gchar *na
	me);

	/* actions with parameters */	/* actions with parameters */
	gboolean gda_server_provider_supports_operation (GdaServerPro vider provider, GdaConnection cnc,	gboolean gda_server_provider_supports_operation (GdaServerPro vider provider, GdaConnection cnc,

	GdaServerOper ationType type, GdaParameterList *options);	GdaServerOper ationType type, GdaSet *options);
	GdaServerOperation gda_server_provider_create_operation (GdaServerPro vider provider, GdaConnection *cnc,	GdaServerOperation gda_server_provider_create_operation (GdaServerPro vider provider, GdaConnection *cnc,
	GdaServerOper ationType type,	GdaServerOper ationType type,

	GdaParameterL ist options, GError *error);	GdaSet optio ns, GError *error);
	gchar gda_server_provider_render_operation (GdaServerPro vider provider, GdaConnection *cnc,	gchar gda_server_provider_render_operation (GdaServerPro vider provider, GdaConnection *cnc,
	GdaServerOper ation op, GError *error);	GdaServerOper ation op, GError *error);
	gboolean gda_server_provider_perform_operation (GdaServerPro vider provider, GdaConnection cnc,	gboolean gda_server_provider_perform_operation (GdaServerPro vider provider, GdaConnection cnc,
	GdaServerOper ation op, GError *error);	GdaServerOper ation op, GError *error);


	/* commands */	/* GdaStatement */
	GList gda_server_provider_execute_command (GdaServerProvider pr	GdaSqlParser *gda_server_provider_create_parser (GdaServerPro
	ovider,	vider provider, GdaConnection cnc);
	GdaConnection *cnc,
	GdaCommand *cmd,
	GdaParameterList *para
	ms);
	GdaObject gda_server_provider_execute_query (GdaServerProvider prov
	ider,
	GdaConnection *cnc,
	GdaQuery *query,
	GdaParameterList *params
	);
	gchar gda_server_provider_get_last_insert_id (GdaServerProvider pr
	ovider,
	GdaConnection *cnc,
	GdaDataModel *recset);

	/* transactions */
	gboolean gda_server_provider_begin_transaction (GdaServerProvider *
	provider,
	GdaConnection *cnc,
	const gchar *name, G
	daTransactionIsolation level,
	GError **error);
	gboolean gda_server_provider_commit_transaction (GdaServerProvider *
	provider,
	GdaConnection *cnc,
	const gchar *name, G
	Error **error);
	gboolean gda_server_provider_rollback_transaction (GdaServerProvider *
	provider,
	GdaConnection *cnc,
	const gchar *name, G
	Error **error);
	gboolean gda_server_provider_add_savepoint (GdaServerProvider *
	provider, GdaConnection *cnc,
	const gchar *name, G
	Error **error);
	gboolean gda_server_provider_rollback_savepoint (GdaServerProvider *
	provider, GdaConnection *cnc,
	const gchar *name, G
	Error **error);
	gboolean gda_server_provider_delete_savepoint (GdaServerProvider *
	provider, GdaConnection *cnc,
	const gchar *name, G
	Error **error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 33 change blocks.
	306 lines changed or deleted	320 lines changed or added

	gda-sqlite-provider.h	gda-sqlite-provider.h
	/* GDA SQLite provider	/* GDA SQLite provider

	* Copyright (C) 1998 - 2007 The GNOME Foundation.	* Copyright (C) 1998 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Rodrigo Moya <rodrigo@gnome-db.org>	* Rodrigo Moya <rodrigo@gnome-db.org>
	* Carlos Perell	* Carlos Perell
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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.

	skipping to change at line 50	skipping to change at line 50
	GdaServerProvider provider;	GdaServerProvider provider;
	};	};

	struct _GdaSqliteProviderClass {	struct _GdaSqliteProviderClass {
	GdaServerProviderClass parent_class;	GdaServerProviderClass parent_class;
	};	};

	G_BEGIN_DECLS	G_BEGIN_DECLS

	GType gda_sqlite_provider_get_type (void) G_GNUC_CONST;	GType gda_sqlite_provider_get_type (void) G_GNUC_CONST;

	GdaServerProvider *gda_sqlite_provider_new (void);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-util.h	gda-util.h
	/* GDA common library	/* GDA common library

	* Copyright (C) 1998 - 2007 The GNOME Foundation.	* Copyright (C) 1998 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Rodrigo Moya <rodrigo@gnome-db.org>	* Rodrigo Moya <rodrigo@gnome-db.org>
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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.
	*	*

	skipping to change at line 29	skipping to change at line 29
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_UTIL_H__	#ifndef __GDA_UTIL_H__
	#define __GDA_UTIL_H__	#define __GDA_UTIL_H__

	#include <glib/ghash.h>	#include <glib/ghash.h>
	#include <glib/glist.h>	#include <glib/glist.h>

	#include "gda-parameter.h"	#include "gda-holder.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_g_type_to_string (GType type);	const gchar *gda_g_type_to_string (GType type);
	GType gda_g_type_from_string (const gchar *str);	GType gda_g_type_from_string (const gchar *str);

	skipping to change at line 56	skipping to change at line 56
	gchar gda_default_escape_string (const gchar string);	gchar gda_default_escape_string (const gchar string);
	gchar gda_default_unescape_string (const gchar string);	gchar gda_default_unescape_string (const gchar string);

	/*	/*
	* 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
	* which is a list of comma separated keywords
	*/
	gchar *gda_utility_table_field_attrs_stringify (GdaValueAttribute attribute
	s);
	guint gda_utility_table_field_attrs_parse (const gchar *str);

	/*
	* XML Id encoding and decoding	* XML Id encoding and decoding
	*/	*/
	gchar gda_utility_build_encoded_id (const gchar prefix, const gchar *id);	gchar gda_utility_build_encoded_id (const gchar prefix, const gchar *id);
	gchar gda_utility_build_decoded_id (const gchar prefix, const gchar *id);	gchar gda_utility_build_decoded_id (const gchar prefix, const gchar *id);

	/*	/*
	* Param & model utilities	* Param & model utilities
	*/	*/
	gboolean gda_utility_check_data_model (GdaDataModel *model, gint nbcols, .. .);	gboolean gda_utility_check_data_model (GdaDataModel *model, gint nbcols, .. .);
	void gda_utility_data_model_dump_data_to_xml (GdaDataModel *model, xmlN odePtr parent,	void gda_utility_data_model_dump_data_to_xml (GdaDataModel *model, xmlN odePtr parent,
	const gint cols, gint nb_cols , const gint rows, gint nb_rows,	const gint cols, gint nb_cols , const gint rows, gint nb_rows,
	gboolean use_col_ids);	gboolean use_col_ids);

	void gda_utility_parameter_load_attributes (GdaParameter *param, xmlNod	void gda_utility_holder_load_attributes (GdaHolder *holder, xmlNodePtr
	ePtr node, GSList *sources);	node, GSList *sources);
	GdaDictType gda_utility_find_or_create_data_type (GdaDict dict, GdaServer
	Provider prov, GdaConnection cnc,
	const gchar *dbms_type, const
	gchar g_type, gboolean created);

	/* translate any text to an alphanumerical text */	/* translate any text to an alphanumerical text */
	gchar gda_text_to_alphanum (const gchar text);	gchar gda_text_to_alphanum (const gchar text);
	gchar gda_alphanum_to_text (gchar text);	gchar gda_alphanum_to_text (gchar text);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-virtual-connection.h	gda-virtual-connection.h
	/* GDA virtual connection	/* GDA virtual connection

	* Copyright (C) 2007 The GNOME Foundation.	* Copyright (C) 2007 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Vivien Malerba <malerba@gnome-db.org>	* Vivien Malerba <malerba@gnome-db.org>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library is distributed in the hope that it will be useful,

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_VIRTUAL_CONNECTION_H__	#ifndef __GDA_VIRTUAL_CONNECTION_H__
	#define __GDA_VIRTUAL_CONNECTION_H__	#define __GDA_VIRTUAL_CONNECTION_H__

	#include <libgda/gda-connection.h>	#include <libgda/gda-connection.h>

		#include <virtual/gda-virtual-provider.h>

	#define GDA_TYPE_VIRTUAL_CONNECTION (gda_virtual_connection_get_ type())	#define GDA_TYPE_VIRTUAL_CONNECTION (gda_virtual_connection_get_ type())
	#define GDA_VIRTUAL_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_VIRTUAL_CONNECTION, GdaVirtualConnection))	#define GDA_VIRTUAL_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GDA_TYPE_VIRTUAL_CONNECTION, GdaVirtualConnection))
	#define GDA_VIRTUAL_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (kl ass, GDA_TYPE_VIRTUAL_CONNECTION, GdaVirtualConnectionClass))	#define GDA_VIRTUAL_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (kl ass, GDA_TYPE_VIRTUAL_CONNECTION, GdaVirtualConnectionClass))
	#define GDA_IS_VIRTUAL_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_VIRTUAL_CONNECTION))	#define GDA_IS_VIRTUAL_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GDA_TYPE_VIRTUAL_CONNECTION))
	#define GDA_IS_VIRTUAL_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((k lass), GDA_TYPE_VIRTUAL_CONNECTION))	#define GDA_IS_VIRTUAL_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((k lass), GDA_TYPE_VIRTUAL_CONNECTION))

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _GdaVirtualConnection GdaVirtualConnection;	typedef struct _GdaVirtualConnection GdaVirtualConnection;

	skipping to change at line 49	skipping to change at line 50

	struct _GdaVirtualConnection {	struct _GdaVirtualConnection {
	GdaConnection connection;	GdaConnection connection;
	GdaVirtualConnectionPrivate *priv;	GdaVirtualConnectionPrivate *priv;
	};	};

	struct _GdaVirtualConnectionClass {	struct _GdaVirtualConnectionClass {
	GdaConnectionClass parent_class;	GdaConnectionClass parent_class;
	};	};


	GType gda_virtual_connection_get_type (void) G_GNUC_CONST	GType gda_virtual_connection_get_type (void) G_G
	;	NUC_CONST;
		GdaConnection *gda_virtual_connection_open (GdaVirtua
		lProvider virtual_provider, GError *error);
		void gda_virtual_connection_internal_set_provider_data (GdaVirtua
		lConnection *vcnc,
		gpointer d
		ata, GDestroyNotify destroy_func);
		gpointer gda_virtual_connection_internal_get_provider_data (GdaVirtua
		lConnection *cnc);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	libgda-xslt.h	libgda-xslt.h
	/* GDA common library	/* GDA common library

	* Copyright (C) 2007 The GNOME Foundation.	* Copyright (C) 2007 - 2008 The GNOME Foundation.
	*	*
	* AUTHORS:	* AUTHORS:
	* Pawe³ Cesar Sanjuan Szklarz <paweld2@gmail.com>	* Pawe³ Cesar Sanjuan Szklarz <paweld2@gmail.com>
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library is distributed in the hope that it will be useful,

	skipping to change at line 34	skipping to change at line 34
	#define _LIBGDA_XSLT_H	#define _LIBGDA_XSLT_H

	#include <glib.h>	#include <glib.h>
	#include <libgda/libgda.h>	#include <libgda/libgda.h>
	#include <libxslt/transform.h>	#include <libxslt/transform.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS
	#define GDA_XSLT_EXTENSION_URI "http://www.gnome-db.org/ns/gda-sql-ext"	#define GDA_XSLT_EXTENSION_URI "http://www.gnome-db.org/ns/gda-sql-ext"
	struct _GdaXsltExCont	struct _GdaXsltExCont
	{	{

	int init;	int init;
	GdaConnection *cnc;	GdaConnection *cnc;

	GdaDict *gda_dict;	GHashTable *query_hash;
	GHashTable *query_hash;	GError *error;
	GError *error;
	};	};
	typedef struct _GdaXsltExCont GdaXsltExCont;	typedef struct _GdaXsltExCont GdaXsltExCont;

	void gda_xslt_register (void);	void gda_xslt_register (void);
	void gda_xslt_set_execution_context (xsltTransformContextPtr tcxt ,	void gda_xslt_set_execution_context (xsltTransformContextPtr tcxt ,
	GdaXsltExCont * exec);	GdaXsltExCont * exec);
	GdaXsltExCont gda_xslt_create_context_simple (GdaConnection cnc,	GdaXsltExCont gda_xslt_create_context_simple (GdaConnection cnc,
	GError ** error);	GError ** error);
	int gda_xslt_finalize_context (GdaXsltExCont * ctx);	int gda_xslt_finalize_context (GdaXsltExCont * ctx);


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

	libgda.h	libgda.h

	skipping to change at line 29	skipping to change at line 29
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __LIBGDA_H__	#ifndef __LIBGDA_H__
	#define __LIBGDA_H__	#define __LIBGDA_H__


	#include <libgda/gda-client.h>	#include <libgda/gda-easy.h>
	#include <libgda/gda-column-index.h>	#include <libgda/gda-column-index.h>
	#include <libgda/gda-column.h>	#include <libgda/gda-column.h>

	#include <libgda/gda-command.h>
	#include <libgda/gda-config.h>	#include <libgda/gda-config.h>
	#include <libgda/gda-connection-event.h>	#include <libgda/gda-connection-event.h>
	#include <libgda/gda-connection.h>	#include <libgda/gda-connection.h>
	#include <libgda/gda-connection-private.h>	#include <libgda/gda-connection-private.h>
	#include <libgda/gda-data-model-array.h>	#include <libgda/gda-data-model-array.h>
	#include <libgda/gda-data-model-bdb.h>	#include <libgda/gda-data-model-bdb.h>

	#include <libgda/gda-data-model-hash.h>
	#include <libgda/gda-data-model-index.h>	#include <libgda/gda-data-model-index.h>
	#include <libgda/gda-data-model-query.h>	#include <libgda/gda-data-model-query.h>
	#include <libgda/gda-data-model.h>	#include <libgda/gda-data-model.h>
	#include <libgda/gda-data-model-iter.h>	#include <libgda/gda-data-model-iter.h>
	#include <libgda/gda-data-model-import.h>	#include <libgda/gda-data-model-import.h>
	#include <libgda/gda-data-model-dir.h>	#include <libgda/gda-data-model-dir.h>
	#include <libgda/gda-data-access-wrapper.h>	#include <libgda/gda-data-access-wrapper.h>
	#include <libgda/gda-data-proxy.h>	#include <libgda/gda-data-proxy.h>
	#include <libgda/gda-log.h>	#include <libgda/gda-log.h>

	#include <libgda/gda-parameter.h>
	#include <libgda/gda-quark-list.h>	#include <libgda/gda-quark-list.h>
	#include <libgda/gda-row.h>	#include <libgda/gda-row.h>

	#include <libgda/gda-data-model-filter-sql.h>
	#include <libgda/gda-server-operation.h>	#include <libgda/gda-server-operation.h>
	#include <libgda/gda-server-provider.h>	#include <libgda/gda-server-provider.h>
	#include <libgda/gda-threader.h>	#include <libgda/gda-threader.h>
	#include <libgda/gda-transaction-status.h>	#include <libgda/gda-transaction-status.h>
	#include <libgda/gda-transaction-status-private.h>	#include <libgda/gda-transaction-status-private.h>
	#include <libgda/gda-util.h>	#include <libgda/gda-util.h>
	#include <libgda/gda-value.h>	#include <libgda/gda-value.h>
	#include <libgda/gda-decl.h>	#include <libgda/gda-decl.h>

	#include <libgda/gda-object.h>
	#include <libgda/gda-dict.h>
	#include <libgda/gda-enums.h>	#include <libgda/gda-enums.h>

	#include <libgda/gda-graphviz.h>
	#include <libgda/graph/gda-graph-query.h>
	#include <libgda/graph/gda-graph.h>
	#include <libgda/graph/gda-graph-item.h>
	#include <libgda/gda-data-handler.h>	#include <libgda/gda-data-handler.h>
	#include <libgda/handlers/gda-handler-bin.h>	#include <libgda/handlers/gda-handler-bin.h>
	#include <libgda/handlers/gda-handler-boolean.h>	#include <libgda/handlers/gda-handler-boolean.h>
	#include <libgda/handlers/gda-handler-numerical.h>	#include <libgda/handlers/gda-handler-numerical.h>
	#include <libgda/handlers/gda-handler-string.h>	#include <libgda/handlers/gda-handler-string.h>
	#include <libgda/handlers/gda-handler-time.h>	#include <libgda/handlers/gda-handler-time.h>
	#include <libgda/handlers/gda-handler-type.h>	#include <libgda/handlers/gda-handler-type.h>

	#include <libgda/gda-entity-field.h>	#include <libgda/gda-meta-store.h>
	#include <libgda/gda-dict-database.h>	#include <libgda/gda-meta-struct.h>
	#include <libgda/gda-dict-table.h>
	#include <libgda/gda-renderer.h>
	#include <libgda/gda-dict-field.h>
	#include <libgda/gda-object-ref.h>
	#include <libgda/gda-parameter-list.h>
	#include <libgda/gda-xml-storage.h>
	#include <libgda/gda-referer.h>
	#include <libgda/gda-dict-type.h>
	#include <libgda/gda-entity.h>
	#include <libgda/gda-dict-function.h>
	#include <libgda/gda-dict-aggregate.h>
	#include <libgda/gda-dict-constraint.h>
	#include <libgda/gda-query.h>
	#include <libgda/gda-query-object.h>
	#include <libgda/gda-query-target.h>
	#include <libgda/gda-query-join.h>
	#include <libgda/gda-query-condition.h>
	#include <libgda/gda-query-field-agg.h>
	#include <libgda/gda-query-field-all.h>
	#include <libgda/gda-query-field-field.h>
	#include <libgda/gda-query-field-func.h>
	#include <libgda/gda-query-field-value.h>
	#include <libgda/gda-query-field.h>
	#include <libgda/gda-query-parsing.h>
	#include <libgda/gda-query-private.h>


	G_BEGIN_DECLS	#include <libgda/gda-statement.h>
		#include <libgda/gda-batch.h>
		#include <libgda/gda-holder.h>
		#include <libgda/gda-set.h>


	extern GQuark gda_general_error_quark (void);	#include <libgda/gda-meta-store.h>
	#define GDA_GENERAL_ERROR gda_general_error_quark ()


	typedef enum {	G_BEGIN_DECLS
	GDA_GENERAL_OBJECT_NAME_ERROR,
	GDA_GENERAL_INCORRECT_VALUE_ERROR,
	GDA_GENERAL_OPERATION_ERROR
	} GdaGeneralError;

	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);

	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. 13 change blocks.
	97 lines changed or deleted	9 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-data-model-iter.h	gda-data-model-iter.h
	/* gda-data-model-iter.h	/* gda-data-model-iter.h
	*	*

	* Copyright (C) 2005 ( 2006 Vivien Malerba	* Copyright (C) 2005 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.

	skipping to change at line 25	skipping to change at line 25
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_DATA_MODEL_ITER_H_	#ifndef __GDA_DATA_MODEL_ITER_H_
	#define __GDA_DATA_MODEL_ITER_H_	#define __GDA_DATA_MODEL_ITER_H_

	#include "gda-decl.h"	#include "gda-decl.h"

	#include "gda-parameter-list.h"	#include "gda-set.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_DATA_MODEL_ITER (gda_data_model_iter_get_type())	#define GDA_TYPE_DATA_MODEL_ITER (gda_data_model_iter_get_type())
	#define GDA_DATA_MODEL_ITER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_data_model_iter_get_type(), GdaDataModelIter)	#define GDA_DATA_MODEL_ITER(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_data_model_iter_get_type(), GdaDataModelIter)
	#define GDA_DATA_MODEL_ITER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, g da_data_model_iter_get_type (), GdaDataModelIterClass)	#define GDA_DATA_MODEL_ITER_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, g da_data_model_iter_get_type (), GdaDataModelIterClass)
	#define GDA_IS_DATA_MODEL_ITER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_data_model_iter_get_type ())	#define GDA_IS_DATA_MODEL_ITER(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_data_model_iter_get_type ())

	/* error reporting */	/* error reporting */
	extern GQuark gda_data_model_iter_error_quark (void);	extern GQuark gda_data_model_iter_error_quark (void);
	#define GDA_DATA_MODEL_ITER_ERROR gda_data_model_iter_error_quark ()	#define GDA_DATA_MODEL_ITER_ERROR gda_data_model_iter_error_quark ()

	typedef enum	typedef enum
	{	{
	GDA_DATA_MODEL_ITER_WHAT_ERROR	GDA_DATA_MODEL_ITER_WHAT_ERROR
	} GdaDataModelIterError;	} GdaDataModelIterError;

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaDataModelIter	struct _GdaDataModelIter
	{	{

	GdaParameterList object;	GdaSet object;
	GdaDataModelIterPrivate *priv;	GdaDataModelIterPrivate *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaDataModelIterClass	struct _GdaDataModelIterClass
	{	{

	GdaParameterListClass parent_class;	GdaSetClass parent_class;

	gboolean (* row_to_change) (GdaDataModelIter *iter , gint row);	gboolean (* row_to_change) (GdaDataModelIter *iter , gint row);
	void (* row_changed) (GdaDataModelIter *iter , gint row);	void (* row_changed) (GdaDataModelIter *iter , gint row);
	void (* end_of_data) (GdaDataModelIter *iter );	void (* end_of_data) (GdaDataModelIter *iter );
	};	};

	GType gda_data_model_iter_get_type (void) G_GNUC_CO NST;	GType gda_data_model_iter_get_type (void) G_GNUC_CO NST;

	GdaDataModelIter gda_data_model_iter_new (GdaDataModel m odel);

	const GValue gda_data_model_iter_get_value_at (GdaDataModelIte r iter, gint col);	const GValue gda_data_model_iter_get_value_at (GdaDataModelIte r iter, gint col);
	const GValue gda_data_model_iter_get_value_for_field (GdaDataModelIte r iter, const gchar *field_name);	const GValue gda_data_model_iter_get_value_for_field (GdaDataModelIte r iter, const gchar *field_name);

	gboolean gda_data_model_iter_set_at_row (GdaDataModelIte r *iter, gint row);	gboolean gda_data_model_iter_set_at_row (GdaDataModelIte r *iter, gint row);
	gboolean gda_data_model_iter_move_next (GdaDataModelIte r *iter);	gboolean gda_data_model_iter_move_next (GdaDataModelIte r *iter);
	gboolean gda_data_model_iter_move_prev (GdaDataModelIte r *iter);	gboolean gda_data_model_iter_move_prev (GdaDataModelIte r *iter);
	gint gda_data_model_iter_get_row (GdaDataModelIte r *iter);	gint gda_data_model_iter_get_row (GdaDataModelIte r *iter);

	gboolean gda_data_model_iter_can_be_moved (GdaDataModelIte r *iter);	gboolean gda_data_model_iter_can_be_moved (GdaDataModelIte r *iter);
	void gda_data_model_iter_invalidate_contents (GdaDataModelIte r *iter);	void gda_data_model_iter_invalidate_contents (GdaDataModelIte r *iter);
	gboolean gda_data_model_iter_is_valid (GdaDataModelIte r *iter);	gboolean gda_data_model_iter_is_valid (GdaDataModelIte r *iter);


	gint gda_data_model_iter_get_column_for_param (GdaDataModelIte	GdaHolder *gda_data_model_iter_get_holder_for_field (GdaDataModelIte
	r iter, GdaParameter param);	r *iter, gint col);
	GdaParameter *gda_data_model_iter_get_param_for_column (GdaDataModelIte
	r *iter, gint col);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-handler-boolean.h	gda-handler-boolean.h
	/* gda-handler-boolean.h	/* gda-handler-boolean.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_HANDLER_BOOLEAN__	#ifndef __GDA_HANDLER_BOOLEAN__
	#define __GDA_HANDLER_BOOLEAN__	#define __GDA_HANDLER_BOOLEAN__


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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_HANDLER_BOOLEAN (gda_handler_boolean_get_type())	#define GDA_TYPE_HANDLER_BOOLEAN (gda_handler_boolean_get_type())
	#define GDA_HANDLER_BOOLEAN(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_handler_boolean_get_type(), GdaHandlerBoolean)	#define GDA_HANDLER_BOOLEAN(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda_handler_boolean_get_type(), GdaHandlerBoolean)
	#define GDA_HANDLER_BOOLEAN_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, g da_handler_boolean_get_type (), GdaHandlerBooleanClass)	#define GDA_HANDLER_BOOLEAN_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, g da_handler_boolean_get_type (), GdaHandlerBooleanClass)
	#define GDA_IS_HANDLER_BOOLEAN(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_handler_boolean_get_type ())	#define GDA_IS_HANDLER_BOOLEAN(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda_handler_boolean_get_type ())

	typedef struct _GdaHandlerBoolean GdaHandlerBoolean;	typedef struct _GdaHandlerBoolean GdaHandlerBoolean;
	typedef struct _GdaHandlerBooleanClass GdaHandlerBooleanClass;	typedef struct _GdaHandlerBooleanClass GdaHandlerBooleanClass;
	typedef struct _GdaHandlerBooleanPriv GdaHandlerBooleanPriv;	typedef struct _GdaHandlerBooleanPriv GdaHandlerBooleanPriv;

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaHandlerBoolean	struct _GdaHandlerBoolean
	{	{

	GdaObject object;	GObject object;

	GdaHandlerBooleanPriv *priv;	GdaHandlerBooleanPriv *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaHandlerBooleanClass	struct _GdaHandlerBooleanClass
	{	{

	GdaObjectClass parent_class;	GObjectClass parent_class;
	};	};

	GType gda_handler_boolean_get_type (void) G_GNUC_CONST;	GType gda_handler_boolean_get_type (void) G_GNUC_CONST;
	GdaDataHandler *gda_handler_boolean_new (void);	GdaDataHandler *gda_handler_boolean_new (void);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-handler-numerical.h	gda-handler-numerical.h
	/* gda-handler-numerical.h	/* gda-handler-numerical.h
	*	*

	* Copyright (C) 2003 - 2005 Vivien Malerba	* Copyright (C) 2003 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_HANDLER_NUMERICAL__	#ifndef __GDA_HANDLER_NUMERICAL__
	#define __GDA_HANDLER_NUMERICAL__	#define __GDA_HANDLER_NUMERICAL__


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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_HANDLER_NUMERICAL (gda_handler_numerical_get_type ())	#define GDA_TYPE_HANDLER_NUMERICAL (gda_handler_numerical_get_type ())
	#define GDA_HANDLER_NUMERICAL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj , gda_handler_numerical_get_type(), GdaHandlerNumerical)	#define GDA_HANDLER_NUMERICAL(obj) G_TYPE_CHECK_INSTANCE_CAST (obj , gda_handler_numerical_get_type(), GdaHandlerNumerical)
	#define GDA_HANDLER_NUMERICAL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_handler_numerical_get_type (), GdaHandlerNumericalClass)	#define GDA_HANDLER_NUMERICAL_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_handler_numerical_get_type (), GdaHandlerNumericalClass)
	#define GDA_IS_HANDLER_NUMERICAL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj , gda_handler_numerical_get_type ())	#define GDA_IS_HANDLER_NUMERICAL(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj , gda_handler_numerical_get_type ())

	typedef struct _GdaHandlerNumerical GdaHandlerNumerical;	typedef struct _GdaHandlerNumerical GdaHandlerNumerical;
	typedef struct _GdaHandlerNumericalClass GdaHandlerNumericalClass;	typedef struct _GdaHandlerNumericalClass GdaHandlerNumericalClass;
	typedef struct _GdaHandlerNumericalPriv GdaHandlerNumericalPriv;	typedef struct _GdaHandlerNumericalPriv GdaHandlerNumericalPriv;

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaHandlerNumerical	struct _GdaHandlerNumerical
	{	{

	GdaObject object;	GObject object;

	GdaHandlerNumericalPriv *priv;	GdaHandlerNumericalPriv *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaHandlerNumericalClass	struct _GdaHandlerNumericalClass
	{	{

	GdaObjectClass parent_class;	GObjectClass parent_class;
	};	};

	GType gda_handler_numerical_get_type (void) G_GNUC_CONST;	GType gda_handler_numerical_get_type (void) G_GNUC_CONST;
	GdaDataHandler *gda_handler_numerical_new (void);	GdaDataHandler *gda_handler_numerical_new (void);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-handler-string.h	gda-handler-string.h
	/* gda-handler-string.h	/* gda-handler-string.h
	*	*

	* Copyright (C) 2003 - 2007 Vivien Malerba	* Copyright (C) 2003 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_HANDLER_STRING__	#ifndef __GDA_HANDLER_STRING__
	#define __GDA_HANDLER_STRING__	#define __GDA_HANDLER_STRING__


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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_HANDLER_STRING (gda_handler_string_get_type())	#define GDA_TYPE_HANDLER_STRING (gda_handler_string_get_type())
	#define GDA_HANDLER_STRING(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, g da_handler_string_get_type(), GdaHandlerString)	#define GDA_HANDLER_STRING(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, g da_handler_string_get_type(), GdaHandlerString)
	#define GDA_HANDLER_STRING_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gd a_handler_string_get_type (), GdaHandlerStringClass)	#define GDA_HANDLER_STRING_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gd a_handler_string_get_type (), GdaHandlerStringClass)
	#define GDA_IS_HANDLER_STRING(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, g da_handler_string_get_type ())	#define GDA_IS_HANDLER_STRING(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, g da_handler_string_get_type ())

	typedef struct _GdaHandlerString GdaHandlerString;	typedef struct _GdaHandlerString GdaHandlerString;
	typedef struct _GdaHandlerStringClass GdaHandlerStringClass;	typedef struct _GdaHandlerStringClass GdaHandlerStringClass;
	typedef struct _GdaHandlerStringPriv GdaHandlerStringPriv;	typedef struct _GdaHandlerStringPriv GdaHandlerStringPriv;

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaHandlerString	struct _GdaHandlerString
	{	{

	GdaObject object;	GObject object;

	GdaHandlerStringPriv *priv;	GdaHandlerStringPriv *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaHandlerStringClass	struct _GdaHandlerStringClass
	{	{

	GdaObjectClass parent_class;	GObjectClass parent_class;
	};	};

	GType gda_handler_string_get_type (void) G_GNUC_CONST;	GType gda_handler_string_get_type (void) G_GNUC_CONST;
	GdaDataHandler *gda_handler_string_new (void);	GdaDataHandler *gda_handler_string_new (void);
	GdaDataHandler gda_handler_string_new_with_provider (GdaServerProvider pr ov, GdaConnection *cnc);	GdaDataHandler gda_handler_string_new_with_provider (GdaServerProvider pr ov, GdaConnection *cnc);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	gda-handler-time.h	gda-handler-time.h
	/* gda-handler-time.h	/* gda-handler-time.h
	*	*

	* Copyright (C) 2003 - 2007 Vivien Malerba	* Copyright (C) 2003 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_HANDLER_TIME__	#ifndef __GDA_HANDLER_TIME__
	#define __GDA_HANDLER_TIME__	#define __GDA_HANDLER_TIME__


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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define GDA_TYPE_HANDLER_TIME (gda_handler_time_get_type())	#define GDA_TYPE_HANDLER_TIME (gda_handler_time_get_type())
	#define GDA_HANDLER_TIME(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda _handler_time_get_type(), GdaHandlerTime)	#define GDA_HANDLER_TIME(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gda _handler_time_get_type(), GdaHandlerTime)
	#define GDA_HANDLER_TIME_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_ handler_time_get_type (), GdaHandlerTimeClass)	#define GDA_HANDLER_TIME_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gda_ handler_time_get_type (), GdaHandlerTimeClass)
	#define GDA_IS_HANDLER_TIME(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda _handler_time_get_type ())	#define GDA_IS_HANDLER_TIME(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gda _handler_time_get_type ())

	typedef struct _GdaHandlerTime GdaHandlerTime;	typedef struct _GdaHandlerTime GdaHandlerTime;
	typedef struct _GdaHandlerTimeClass GdaHandlerTimeClass;	typedef struct _GdaHandlerTimeClass GdaHandlerTimeClass;
	typedef struct _GdaHandlerTimePriv GdaHandlerTimePriv;	typedef struct _GdaHandlerTimePriv GdaHandlerTimePriv;

	/* struct for the object's data */	/* struct for the object's data */
	struct _GdaHandlerTime	struct _GdaHandlerTime
	{	{

	GdaObject object;	GObject object;

	GdaHandlerTimePriv *priv;	GdaHandlerTimePriv *priv;
	};	};

	/* struct for the object's class */	/* struct for the object's class */
	struct _GdaHandlerTimeClass	struct _GdaHandlerTimeClass
	{	{

	GdaObjectClass parent_class;	GObjectClass parent_class;
	};	};

	GType gda_handler_time_get_type (void) G_GNUC_CONST;	GType gda_handler_time_get_type (void) G_GNUC_CONST;
	GdaDataHandler *gda_handler_time_new (void);	GdaDataHandler *gda_handler_time_new (void);
	GdaDataHandler *gda_handler_time_new_no_locale (void);	GdaDataHandler *gda_handler_time_new_no_locale (void);
	void gda_handler_time_set_sql_spec (GdaHandlerTime *dh, GDateDM Y first, GDateDMY sec,	void gda_handler_time_set_sql_spec (GdaHandlerTime *dh, GDateDM Y first, GDateDMY sec,
	GDateDMY third, gchar separa tor, gboolean twodigits_years);	GDateDMY third, gchar separa tor, gboolean twodigits_years);

	gchar gda_handler_time_get_no_locale_str_from_value (GdaHandlerTi me dh, const GValue *value);	gchar gda_handler_time_get_no_locale_str_from_value (GdaHandlerTi me dh, const GValue *value);


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

	gda-server-provider-private.h	gda-server-provider-private.h
	/* gda-server-provider-private.h	/* gda-server-provider-private.h
	*	*

	* Copyright (C) 2005 - 2007 Vivien Malerba	* Copyright (C) 2005 - 2008 Vivien Malerba
	*	*
	* This Library is free software; you can redistribute it and/or	* This Library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public License as	* modify it under the terms of the GNU Library 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 Library is distributed in the hope that it will be useful,	* This Library 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 GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.
	*	*
	* You should have received a copy of the GNU Library General Public	* You should have received a copy of the GNU Library General Public
	* License along with this Library; see the file COPYING.LIB. If not,	* License along with this Library; see the file COPYING.LIB. If not,
	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,	* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330 ,
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GDA_SERVER_PROVIDER_PRIVATE__	#ifndef __GDA_SERVER_PROVIDER_PRIVATE__
	#define __GDA_SERVER_PROVIDER_PRIVATE__	#define __GDA_SERVER_PROVIDER_PRIVATE__


		#include <libgda/gda-meta-store.h>

	struct _GdaServerProviderPrivate {	struct _GdaServerProviderPrivate {

	GHashTable data_handlers; / key = a GdaServerProviderHandlerInfo p	GHashTable data_handlers; / key = a GdaServerProviderHandlerInf
	ointer, value = a GdaDataHandler */	o pointer, value = a GdaDataHandler */
		GdaSqlParser *parser;
	};	};

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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