SOURCES: libgda-xbase.patch - use fix backported from 3.0.1

qboosh qboosh at pld-linux.org
Fri Jun 1 00:18:48 CEST 2007


Author: qboosh                       Date: Thu May 31 22:18:48 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use fix backported from 3.0.1

---- Files affected:
SOURCES:
   libgda-xbase.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/libgda-xbase.patch
diff -u SOURCES/libgda-xbase.patch:1.3 SOURCES/libgda-xbase.patch:1.4
--- SOURCES/libgda-xbase.patch:1.3	Tue Feb 21 21:50:22 2006
+++ SOURCES/libgda-xbase.patch	Fri Jun  1 00:18:43 2007
@@ -1,23 +1,20 @@
---- libgda-1.9.100/providers/xbase/gda-xbase-database.cpp.orig	2004-10-11 10:22:48.000000000 +0200
-+++ libgda-1.9.100/providers/xbase/gda-xbase-database.cpp	2006-02-21 21:30:05.121330250 +0100
-@@ -104,3 +104,9 @@
- 
- 	return TRUE;
- }
-+
-+extern "C" gchar *
-+gda_xbase_database_get_name (GdaXbaseDatabase *xdb)
-+{
-+	return xdb->filename;
-+}
---- libgda-1.9.100/providers/xbase/gda-xbase-database.h.orig	2002-11-26 00:27:23.000000000 +0100
-+++ libgda-1.9.100/providers/xbase/gda-xbase-database.h	2006-02-21 21:29:59.548982000 +0100
-@@ -34,6 +34,8 @@
- 
- gboolean          gda_xbase_database_delete_all_records (GdaXbaseDatabase *xdb);
- 
-+gchar *           gda_xbase_database_get_name (GdaXbaseDatabase *xdb);
-+
- G_END_DECLS
- 
- #endif
+--- libgda-1.2.4/providers/xbase/gda-xbase-provider.c.orig	2007-01-09 13:50:55.000000000 +0100
++++ libgda-1.2.4/providers/xbase/gda-xbase-provider.c	2007-05-31 23:29:39.627378605 +0200
+@@ -197,7 +197,7 @@
+ 		pdata->using_directory = FALSE;
+ 		xdb = gda_xbase_database_open (cnc, p_filename);
+ 		if (xdb) {
+-			g_hash_table_insert (pdata->databases, gda_xbase_database_get_name (xdb), xdb);
++			g_hash_table_insert (pdata->databases, p_filename, xdb);
+ 		} else {
+ 			gda_xbase_provider_close_connection (provider, cnc);
+ 			return FALSE;
+@@ -218,7 +218,7 @@
+ 			gchar *s = g_build_path (p_directory, p_filename);
+ 			xdb = gda_xbase_database_open (cnc, p_filename);
+ 			if (xdb) {
+-				g_hash_table_insert (pdata->databases, gda_xbase_database_get_name (xdb), xdb);
++				g_hash_table_insert (pdata->databases, p_filename, xdb);
+ 			} else {
+ 				gda_connection_add_error_string (cnc, _("Could not open file %s"), s);
+ 			}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libgda-xbase.patch?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list