GNOME.org
 

libgnomedb r1744 - in trunk: . control-center extra extra/demos glade3 libgnomedb providers/evolution testing

Author: vivien
Date: Tue Sep 16 19:01:16 2008
New Revision: 1744
URL: http://svn.gnome.org/viewvc/libgnomedb?rev=1744&view=rev

Log:
2008-09-16  Vivien Malerba <malerba gnome-db org>

	* configure.in: applied patch from Cygwin Ports maintainer for bug #541992
	* Adaptations to Libgda's API changes


Modified:
   trunk/ChangeLog
   trunk/control-center/dsn-properties-dialog.c
   trunk/control-center/main.c
   trunk/extra/Makefile.am
   trunk/extra/demos/Makefile.am
   trunk/extra/gnome-db-browser.c
   trunk/glade3/gnomedb.xml.in
   trunk/libgnomedb/gnome-db-combo.c
   trunk/libgnomedb/gnome-db-dsn-assistant.c
   trunk/libgnomedb/gnome-db-dsn-assistant.h
   trunk/libgnomedb/gnome-db-dsn-editor.c
   trunk/libgnomedb/gnome-db-dsn-editor.h
   trunk/libgnomedb/gnome-db-login.c
   trunk/libgnomedb/gnome-db-provider-selector.c
   trunk/providers/evolution/libmain.c
   trunk/testing/test-dyn-widgets.c
   trunk/testing/test-provider-schemas.c

Modified: trunk/control-center/dsn-properties-dialog.c
==============================================================================
--- trunk/control-center/dsn-properties-dialog.c	(original)
+++ trunk/control-center/dsn-properties-dialog.c	Tue Sep 16 19:01:16 2008
@@ -38,7 +38,7 @@
 };
 
 static gboolean
-data_source_info_equal (const GdaDataSourceInfo *info1, const GdaDataSourceInfo *info2)
+data_source_info_equal (const GdaDsnInfo *info1, const GdaDsnInfo *info2)
 {
 	#define str_is_equal(x,y) (((x) && (y) && !strcmp ((x),(y))) || (!(x) && (!y)))
 	 if (!info1 && !info2)
@@ -63,7 +63,7 @@
 dsn_changed_cb (GnomeDbDsnEditor *config, gpointer user_data)
 {
 	gboolean changed;
-	const GdaDataSourceInfo *dsn_info , *old_dsn_info;
+	const GdaDsnInfo *dsn_info , *old_dsn_info;
 
 	dsn_info = gnome_db_dsn_editor_get_dsn (config);
 	old_dsn_info = g_object_get_data (G_OBJECT (user_data), "old_dsn_info");
@@ -97,7 +97,7 @@
 }
 
 static void 
-data_source_info_free (GdaDataSourceInfo *info)
+data_source_info_free (GdaDsnInfo *info)
 {
 	g_free (info->provider); 
 	g_free (info->cnc_string); 
@@ -109,13 +109,13 @@
 void
 dsn_properties_dialog (GtkWindow *parent, const gchar *dsn)
 {
-	GdaDataSourceInfo *dsn_info, *priv_dsn_info;
+	GdaDsnInfo *dsn_info, *priv_dsn_info;
 	GtkWidget *dialog, *props, *label, *hbox;
 	GdkPixbuf *icon;
 	gchar *str;
 	gint result;
 
-	dsn_info = gda_config_get_dsn (dsn);
+	dsn_info = gda_config_get_dsn_info (dsn);
 	if (!dsn_info)
 		return;
 
@@ -129,7 +129,7 @@
 					      NULL);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), REVERT_BUTTON, FALSE);
-	priv_dsn_info = g_new0 (GdaDataSourceInfo, 1);
+	priv_dsn_info = g_new0 (GdaDsnInfo, 1);
 	priv_dsn_info->name = g_strdup (dsn_info->name);
 	if (dsn_info->provider)
 		priv_dsn_info->provider = g_strdup (dsn_info->provider);

Modified: trunk/control-center/main.c
==============================================================================
--- trunk/control-center/main.c	(original)
+++ trunk/control-center/main.c	Tue Sep 16 19:01:16 2008
@@ -43,7 +43,7 @@
 static void
 assistant_finished_cb (GnomeDbDsnAssistant *assistant, gboolean error, gpointer user_data)
 {
-	const GdaDataSourceInfo *dsn_info;
+	const GdaDsnInfo *dsn_info;
 
 	if (!error) {
 		dsn_info = gnome_db_dsn_assistant_get_dsn (assistant);

Modified: trunk/extra/Makefile.am
==============================================================================
--- trunk/extra/Makefile.am	(original)
+++ trunk/extra/Makefile.am	Tue Sep 16 19:01:16 2008
@@ -17,13 +17,13 @@
         -DDATADIR=\""$(datadir)"\" \
         -DLIBDIR=\""$(libdir)"\"
 
-bin_PROGRAMS = gnome-db-browser
+bin_PROGRAMS = gnome-db-browser-4.0
 
-gnome_db_browser_SOURCES = \
+gnome_db_browser_4_0_SOURCES = \
 	gnome-db-browser.c
 
-gnome_db_browser_LDFLAGS = $(EXTRALDFLAGS)
-gnome_db_browser_LDADD = \
+gnome_db_browser_4_0_LDFLAGS = $(EXTRALDFLAGS)
+gnome_db_browser_4_0_LDADD = \
 	$(top_builddir)/libgnomedb/libgnomedb-4.0.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
 	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-4.0.la
 

Modified: trunk/extra/demos/Makefile.am
==============================================================================
--- trunk/extra/demos/Makefile.am	(original)
+++ trunk/extra/demos/Makefile.am	Tue Sep 16 19:01:16 2008
@@ -47,22 +47,22 @@
         -DDATADIR=\""$(datadir)"\" \
         -DLIBDIR=\""$(libdir)"\"
 
-bin_PROGRAMS = gnome-db-demo
+bin_PROGRAMS = gnome-db-demo-4.0
 
 BUILT_SOURCES = demos.h
 
 demos.h: $(demos) geninclude.pl
 	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
-gnome_db_demo_SOURCES = 		\
+gnome_db_demo_4_0_SOURCES = 		\
 	$(demos)		\
 	demo-common.h		\
 	main.c			\
 	demos.h
 
-gnome_db_demo_DEPENDENCIES = $(DEPS)
-gnome_db_demo_LDFLAGS =  $(EXTRALDFLAGS)
-gnome_db_demo_LDADD =  \
+gnome_db_demo_4_0_DEPENDENCIES = $(DEPS)
+gnome_db_demo_4_0_LDFLAGS =  $(EXTRALDFLAGS)
+gnome_db_demo_4_0_LDADD =  \
 	$(top_builddir)/libgnomedb/libgnomedb-4.0.la $(LIBGNOMEDB_LIBS) $(LIBGLADE_LIBS) \
 	$(top_builddir)/libgnomedb-extra/libgnomedb_extra-4.0.la \
         $(graphlib)

Modified: trunk/extra/gnome-db-browser.c
==============================================================================
--- trunk/extra/gnome-db-browser.c	(original)
+++ trunk/extra/gnome-db-browser.c	Tue Sep 16 19:01:16 2008
@@ -94,10 +94,10 @@
 		exit (1);
 	}
 
-	GdaDataSourceInfo *src;
+	GdaDsnInfo *src;
 	gchar *username, *pass, *real_dsn;
 	gboolean ask = FALSE;
-	src = gda_config_get_dsn (argv[1]);
+	src = gda_config_get_dsn_info (argv[1]);
 	if (!src) {
 		g_print (_("Datasource '%s' is not declared\n"), argv[1]);
 		exit (1);

Modified: trunk/glade3/gnomedb.xml.in
==============================================================================
--- trunk/glade3/gnomedb.xml.in	(original)
+++ trunk/glade3/gnomedb.xml.in	Tue Sep 16 19:01:16 2008
@@ -1,4 +1,4 @@
-<glade-catalog name="gnomedb" library="gladegnomedb" depends="gtk+" domain="glade-3" book="libgnomedb">
+<glade-catalog name="gnomedb" library="gladegnomedb" depends="gtk+" domain="glade-3" book="libgnomedb-4.0">
   <init-function>glade_gnome_db_init</init-function>
   <glade-widget-classes>
     <glade-widget-class name="GnomeDbBasicForm" generic-name="gnome-db-basic-form" title="Basic form (for data in a GdaSet)">

Modified: trunk/libgnomedb/gnome-db-combo.c
==============================================================================
--- trunk/libgnomedb/gnome-db-combo.c	(original)
+++ trunk/libgnomedb/gnome-db-combo.c	Tue Sep 16 19:01:16 2008
@@ -467,7 +467,7 @@
 	g_return_val_if_fail (values, FALSE);
 
 	proxy = gnome_db_data_store_get_proxy (combo->priv->store);
-	row = gda_data_proxy_find_row_from_values (proxy, (GSList *) values, cols_index);
+	row = gda_data_model_get_row_from_values (GDA_DATA_MODEL (proxy), (GSList *) values, cols_index);
 	gtk_combo_box_set_active (GTK_COMBO_BOX (combo), row);
 
 	return (row >= 0) ? TRUE : FALSE;

Modified: trunk/libgnomedb/gnome-db-dsn-assistant.c
==============================================================================
--- trunk/libgnomedb/gnome-db-dsn-assistant.c	(original)
+++ trunk/libgnomedb/gnome-db-dsn-assistant.c	Tue Sep 16 19:01:16 2008
@@ -49,7 +49,7 @@
 };
 
 struct _GnomeDbDsnAssistantPrivate {
-	GdaDataSourceInfo  *dsn_info;
+	GdaDsnInfo  *dsn_info;
 	GdaServerOperation *create_db_op;
 
 	GdkPixbuf *logo;
@@ -89,7 +89,7 @@
 static GObjectClass *parent_class = NULL;
 
 static void 
-data_source_info_free (GdaDataSourceInfo *info)
+data_source_info_free (GdaDsnInfo *info)
 {
 	g_free (info->provider); 
 	g_free (info->cnc_string); 
@@ -182,7 +182,7 @@
 
 	/* Data source declaration */
 	if (allok) {
-		assistant->priv->dsn_info = g_new0 (GdaDataSourceInfo, 1);
+		assistant->priv->dsn_info = g_new0 (GdaDsnInfo, 1);
 		assistant->priv->dsn_info->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (assistant->priv->general_name)));
 		assistant->priv->dsn_info->provider = g_strdup (
 					 gnome_db_provider_selector_get_provider (
@@ -299,7 +299,7 @@
 {
 	const gchar *name;
 	gboolean page_complete = TRUE;
-	GdaDataSourceInfo *dsn_info;
+	GdaDsnInfo *dsn_info;
 
 	/* check required fields have values */
 	name = gtk_entry_get_text (GTK_ENTRY (assistant->priv->general_name));
@@ -308,7 +308,7 @@
 		page_complete = FALSE;
 	}
 
-	dsn_info = gda_config_get_dsn (name);
+	dsn_info = gda_config_get_dsn_info (name);
 	if (dsn_info) {
 		gint i = 2;
 		gchar *str = NULL;
@@ -316,7 +316,7 @@
 		do {
 			g_free (str);
 			str = g_strdup_printf ("%s_%d", name, i);
-			dsn_info = gda_config_get_dsn (str);
+			dsn_info = gda_config_get_dsn_info (str);
 		} while (dsn_info);
 
 		gtk_entry_set_text (entry, str);
@@ -413,7 +413,7 @@
 
 	/* create private structure */
 	assistant->priv = g_new0 (GnomeDbDsnAssistantPrivate, 1);
-	assistant->priv->dsn_info = g_new0 (GdaDataSourceInfo, 1);
+	assistant->priv->dsn_info = g_new0 (GdaDsnInfo, 1);
 	assistant->priv->provider_detail = NULL;
 	assistant->priv->create_db_op = NULL;
 
@@ -723,9 +723,9 @@
  *
  * Returns:
  */
-const GdaDataSourceInfo *
+const GdaDsnInfo *
 gnome_db_dsn_assistant_get_dsn (GnomeDbDsnAssistant *assistant)
 {
 	g_return_val_if_fail (GNOME_DB_IS_DSN_ASSISTANT (assistant), NULL);
-	return (const GdaDataSourceInfo *) assistant->priv->dsn_info;
+	return (const GdaDsnInfo *) assistant->priv->dsn_info;
 }

Modified: trunk/libgnomedb/gnome-db-dsn-assistant.h
==============================================================================
--- trunk/libgnomedb/gnome-db-dsn-assistant.h	(original)
+++ trunk/libgnomedb/gnome-db-dsn-assistant.h	Tue Sep 16 19:01:16 2008
@@ -53,7 +53,7 @@
 GType                    gnome_db_dsn_assistant_get_type (void) G_GNUC_CONST;
 
 GtkWidget               *gnome_db_dsn_assistant_new      (void);
-const GdaDataSourceInfo *gnome_db_dsn_assistant_get_dsn  (GnomeDbDsnAssistant *assistant);
+const GdaDsnInfo *gnome_db_dsn_assistant_get_dsn  (GnomeDbDsnAssistant *assistant);
 
 G_END_DECLS
 

Modified: trunk/libgnomedb/gnome-db-dsn-editor.c
==============================================================================
--- trunk/libgnomedb/gnome-db-dsn-editor.c	(original)
+++ trunk/libgnomedb/gnome-db-dsn-editor.c	Tue Sep 16 19:01:16 2008
@@ -47,7 +47,7 @@
 	GtkWidget *dsn_auth_expander;
 	GtkWidget *dsn_auth;	
 
-	GdaDataSourceInfo *dsn_info;
+	GdaDsnInfo *dsn_info;
 };
 
 static void gnome_db_dsn_editor_class_init (GnomeDbDsnEditorClass *klass);
@@ -118,7 +118,7 @@
 
 	/* allocate private structure */
 	config->priv = g_new0 (GnomeDbDsnEditorPrivate, 1);
-	config->priv->dsn_info = g_new0 (GdaDataSourceInfo, 1);
+	config->priv->dsn_info = g_new0 (GdaDsnInfo, 1);
 
 	/* set up widgets */
 	table = gnome_db_new_table_widget (8, 3, FALSE);
@@ -273,10 +273,10 @@
  *
  * Returns: a pointer to the currently configured DSN (do not modify)
  */
-const GdaDataSourceInfo *
+const GdaDsnInfo *
 gnome_db_dsn_editor_get_dsn (GnomeDbDsnEditor *config)
 {
-	GdaDataSourceInfo *dsn_info;
+	GdaDsnInfo *dsn_info;
 
 	g_return_val_if_fail (GNOME_DB_IS_DSN_EDITOR (config), NULL);
 	dsn_info = config->priv->dsn_info;
@@ -299,13 +299,13 @@
 /**
  * gnome_db_dsn_editor_set_dsn
  * @editor: a #GnomeDbDsnEditor widget
- * @dsn_info: a #GdaDataSourceInfo pointer or %NULL
+ * @dsn_info: a #GdaDsnInfo pointer or %NULL
  *
  *
  * Requests that @editor update its contents with @dsn_info's contents
  */
 void
-gnome_db_dsn_editor_set_dsn (GnomeDbDsnEditor *editor, const GdaDataSourceInfo *dsn_info)
+gnome_db_dsn_editor_set_dsn (GnomeDbDsnEditor *editor, const GdaDsnInfo *dsn_info)
 {
 	g_return_if_fail (GNOME_DB_IS_DSN_EDITOR (editor));
 

Modified: trunk/libgnomedb/gnome-db-dsn-editor.h
==============================================================================
--- trunk/libgnomedb/gnome-db-dsn-editor.h	(original)
+++ trunk/libgnomedb/gnome-db-dsn-editor.h	Tue Sep 16 19:01:16 2008
@@ -54,9 +54,9 @@
 GType                    gnome_db_dsn_editor_get_type (void) G_GNUC_CONST;
 GtkWidget               *gnome_db_dsn_editor_new (void);
 
-const GdaDataSourceInfo *gnome_db_dsn_editor_get_dsn (GnomeDbDsnEditor *config);
+const GdaDsnInfo        *gnome_db_dsn_editor_get_dsn (GnomeDbDsnEditor *config);
 void                     gnome_db_dsn_editor_set_dsn (GnomeDbDsnEditor *config,
-						      const GdaDataSourceInfo *dsn_info);
+						      const GdaDsnInfo *dsn_info);
 
 G_END_DECLS
 

Modified: trunk/libgnomedb/gnome-db-login.c
==============================================================================
--- trunk/libgnomedb/gnome-db-login.c	(original)
+++ trunk/libgnomedb/gnome-db-login.c	Tue Sep 16 19:01:16 2008
@@ -332,11 +332,11 @@
 dsn_entry_changed_cb (GnomeDbDsnSelector *sel, GnomeDbLogin *login)
 {
 	gchar *dsn;
-	GdaDataSourceInfo *info = NULL;
+	GdaDsnInfo *info = NULL;
         
         dsn = gnome_db_dsn_selector_get_dsn (sel);
         
-	info = gda_config_get_dsn (dsn);
+	info = gda_config_get_dsn_info (dsn);
 
 	if (info)
 		TO_IMPLEMENT;
@@ -388,10 +388,10 @@
 void
 gnome_db_login_set_dsn (GnomeDbLogin *login, const gchar *dsn)
 {
-	GdaDataSourceInfo *src;
+	GdaDsnInfo *src;
 	g_return_if_fail (GNOME_DB_IS_LOGIN (login));
 
-	src = gda_config_get_dsn (dsn);
+	src = gda_config_get_dsn_info (dsn);
 	if (!src)
 		g_warning (_("Datasource '%s' is not declared"), dsn);
 	else {

Modified: trunk/libgnomedb/gnome-db-provider-selector.c
==============================================================================
--- trunk/libgnomedb/gnome-db-provider-selector.c	(original)
+++ trunk/libgnomedb/gnome-db-provider-selector.c	Tue Sep 16 19:01:16 2008
@@ -215,7 +215,7 @@
 
 	pname = gnome_db_provider_selector_get_provider (selector);
 	if (pname)
-		return gda_config_get_provider_object (pname, NULL);
+		return gda_config_get_provider (pname, NULL);
 	else
 		return NULL;
 }

Modified: trunk/providers/evolution/libmain.c
==============================================================================
--- trunk/providers/evolution/libmain.c	(original)
+++ trunk/providers/evolution/libmain.c	Tue Sep 16 19:01:16 2008
@@ -54,7 +54,7 @@
 g_module_check_init (GModule *module)
 {
 	GList *dsn_list, *l;
-	GdaDataSourceInfo *dsn_info = NULL;;
+	GdaDsnInfo *dsn_info = NULL;;
 
 	dsn_list = gda_config_get_data_source_list ();
 	for (l = dsn_list; l != NULL; l = l->next) {

Modified: trunk/testing/test-dyn-widgets.c
==============================================================================
--- trunk/testing/test-dyn-widgets.c	(original)
+++ trunk/testing/test-dyn-widgets.c	Tue Sep 16 19:01:16 2008
@@ -396,7 +396,7 @@
 static void
 open_connection (MainConfig *config, const gchar *str)
 {
-	GdaDataSourceInfo *info;
+	GdaDsnInfo *info;
 	GdaConnection *newcnc;
 	gchar *user, *pass, *real_cnc, *real_provider, *real_auth_string = NULL;
 
@@ -459,7 +459,7 @@
 		g_free (s1);
 	}
 	
-	info = gda_config_get_dsn (real_cnc);
+	info = gda_config_get_dsn_info (real_cnc);
 	if (info && !real_provider)
 		newcnc = gda_connection_open_from_dsn (str, real_auth_string, 0, NULL);
 	else 
@@ -603,7 +603,8 @@
                                                                                                                     
         props = gnome_db_login_dialog_new (_("Connection's configuration"), NULL);
         if (gnome_db_login_dialog_run (GNOME_DB_LOGIN_DIALOG (props))) {
-		gda_connection_set_dsn (config->cnc, gnome_db_login_dialog_get_dsn (GNOME_DB_LOGIN_DIALOG (props)));
+		//gda_connection_set_dsn (config->cnc, gnome_db_login_dialog_get_dsn (GNOME_DB_LOGIN_DIALOG (props)));
+		TO_IMPLEMENT;
 		g_object_set (G_OBJECT (config->cnc),
 			      "auth-string", gnome_db_login_dialog_get_dsn (GNOME_DB_LOGIN_DIALOG (props)), NULL);
 		gtk_widget_destroy (props);
@@ -1725,10 +1726,10 @@
 static void 
 dsn_editor_dsn_changed_cb (GnomeDbDsnSelector *dsel, GnomeDbDsnEditor *editor)
 {
-	GdaDataSourceInfo *info;
+	GdaDsnInfo *info;
 	const gchar *dsn;
 	dsn = gnome_db_dsn_selector_get_dsn (GNOME_DB_DSN_SELECTOR (dsel));
-	info = gda_config_get_dsn (dsn);
+	info = gda_config_get_dsn_info (dsn);
 	gnome_db_dsn_editor_set_dsn (GNOME_DB_DSN_EDITOR (editor), info);
 }
 

Modified: trunk/testing/test-provider-schemas.c
==============================================================================
--- trunk/testing/test-provider-schemas.c	(original)
+++ trunk/testing/test-provider-schemas.c	Tue Sep 16 19:01:16 2008
@@ -34,7 +34,7 @@
 static void test_views (GdaConnection *conn);
 static void test_table_fields (GdaConnection *conn);
 
-static void test_dsn (GdaDataSourceInfo *dsn);
+static void test_dsn (GdaDsnInfo *dsn);
 
 gint
 main (int argc, char **argv) {
@@ -61,7 +61,7 @@
 	gtk_init (&argc, &argv);
 
 	if (argc == 2) {
-		GdaDataSourceInfo *dsn;
+		GdaDsnInfo *dsn;
 		dsn = gda_config_find_data_source (argv[1]);
 		
 		if (!dsn) {
@@ -79,7 +79,7 @@
 		while (list) {
 			if (list != dsns)
 				g_print ("\n\n");
-			test_dsn ((GdaDataSourceInfo *) (list->data));
+			test_dsn ((GdaDsnInfo *) (list->data));
 			list = g_list_next (list);
 		}
 		gda_config_free_data_source_list (dsns);
@@ -89,7 +89,7 @@
 }
 
 static void
-test_dsn (GdaDataSourceInfo *dsn)
+test_dsn (GdaDsnInfo *dsn)
 {
 	static GdaClient *client = NULL;
 	GdaConnection *conn;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]