rpms/libgnomedb/devel libgnomedb-1.9.100-unknown-datatype-fix.patch, 1.1, 1.2

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Fri Mar 24 13:26:35 UTC 2006


Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5540

Modified Files:
	libgnomedb-1.9.100-unknown-datatype-fix.patch 
Log Message:
* Fri Mar 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-6
- Add patch2 fixing bz 186517


libgnomedb-1.9.100-unknown-datatype-fix.patch:

Index: libgnomedb-1.9.100-unknown-datatype-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb-1.9.100-unknown-datatype-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgnomedb-1.9.100-unknown-datatype-fix.patch	24 Mar 2006 10:22:02 -0000	1.1
+++ libgnomedb-1.9.100-unknown-datatype-fix.patch	24 Mar 2006 13:26:34 -0000	1.2
@@ -1,6 +1,6 @@
 diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c
 --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c	2005-08-07 15:07:13.000000000 +0200
-+++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c	2006-03-24 10:22:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c	2006-03-24 11:20:29.000000000 +0100
 @@ -1056,6 +1056,12 @@
  	GSList *params;
  	GnomeDbParameter *similar = NULL;
@@ -14,10 +14,10 @@
  
  	if (g_slist_find (dataset->parameters, param))
  		return;
-Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c~
+Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c.unknown
 diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c
 --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c	2005-09-08 12:36:57.000000000 +0200
-+++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c	2006-03-24 10:16:17.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c	2006-03-24 11:21:38.000000000 +0100
 @@ -99,6 +99,7 @@
  		{GDA_VALUE_TYPE_TINYUINT,        ""},
  		{GDA_VALUE_TYPE_TYPE,            ""},
@@ -50,7 +50,13 @@
  	};
  
  	info = g_new0 (GnomeDbServerInfo, 1);
-@@ -386,7 +390,7 @@
+@@ -381,12 +385,12 @@
+ 	info->implicit_data_types_casts = TRUE;
+ 	info->alias_needs_as_keyword = TRUE;
+ 	
+-	info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN - 1;
++	info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN;
+ 	info->value_test_data_types = g_new0 (gchar *, GDA_VALUE_TYPE_UNKNOWN);
  	info->value_test_gda_types = g_new0 (GdaValueType, GDA_VALUE_TYPE_UNKNOWN);
  
  	gda_type = GDA_VALUE_TYPE_NULL;
@@ -59,10 +65,11 @@
  		info->value_test_data_types [gda_type - 1] = gda_type_to_string (gda_type);
  		info->value_test_gda_types [gda_type - 1] = gda_type;
  	}
+Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c.unknown
 Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c~
 diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c
 --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c	2005-08-07 15:07:14.000000000 +0200
-+++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c	2006-03-24 10:25:21.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c	2006-03-24 11:20:29.000000000 +0100
 @@ -285,7 +285,13 @@
  			}
  		}
@@ -87,4 +94,174 @@
  		
  		return retval;
  	}
-Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c~
+Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c.unknown
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c	2006-03-24 11:52:45.000000000 +0100
+@@ -173,7 +173,6 @@
+ 	GnomeDbEntryTime *mgtim;
+ 
+ 	g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL);
+ 	g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL);
+ 
+ 	obj = g_object_new (GNOME_DB_TYPE_ENTRY_TIME, "handler", dh, NULL);
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c	2006-03-24 11:52:36.000000000 +0100
+@@ -109,7 +109,6 @@
+ 	GnomeDbEntryNone *mgnone;
+ 
+ 	g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL);
+ 	g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL);
+ 
+ 	obj = g_object_new (GNOME_DB_TYPE_ENTRY_NONE, "handler", dh, NULL);
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c	2006-03-24 11:53:03.000000000 +0100
+@@ -355,7 +355,6 @@
+ 	gboolean found = FALSE;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_BOOLEAN (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_BOOLEAN (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c	2006-03-24 11:54:05.000000000 +0100
+@@ -846,7 +846,6 @@
+ 	gboolean found = FALSE;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TIME (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_TIME (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c	2006-03-24 11:54:01.000000000 +0100
+@@ -337,7 +337,6 @@
+ 	gboolean found = FALSE;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_STRING (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_STRING (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c	2006-03-24 11:53:43.000000000 +0100
+@@ -276,7 +276,6 @@
+ 	GnomeDbHandlerNone *hdl;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NONE (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_NONE (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c	2006-03-24 11:53:52.000000000 +0100
+@@ -402,7 +402,6 @@
+ 	gboolean found = FALSE;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NUMERICAL (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_NUMERICAL (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c	2006-03-24 11:52:31.000000000 +0100
+@@ -112,7 +112,6 @@
+ 	GnomeDbEntryBoolean *mgbool;
+ 
+ 	g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL);
+ 	g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL);
+ 
+ 	obj = g_object_new (GNOME_DB_TYPE_ENTRY_BOOLEAN, "handler", dh, NULL);
+--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c.aap	2006-03-24 11:28:13.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c	2006-03-24 11:52:43.000000000 +0100
+@@ -166,7 +166,6 @@
+ 	GnomeDbEntryString *mgstr;
+ 
+ 	g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL);
+ 	g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL);
+ 
+ 	obj = g_object_new (GNOME_DB_TYPE_ENTRY_STRING, "handler", dh, NULL);
+--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c.aap	2006-03-24 12:18:01.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c	2006-03-24 12:18:54.000000000 +0100
+@@ -324,7 +324,6 @@
+ 	gboolean found = FALSE;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TEXT (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_TEXT (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c.aap	2006-03-24 12:18:01.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c	2006-03-24 12:18:24.000000000 +0100
+@@ -111,7 +111,6 @@
+ 	GnomeDbEntryText *mgtxt;
+ 
+ 	g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL);
+ 	g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL);
+ 
+ 	obj = g_object_new (GNOME_DB_TYPE_ENTRY_TEXT, "handler", dh, NULL);
+--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c.aap	2006-03-24 12:18:01.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c	2006-03-24 12:18:48.000000000 +0100
+@@ -322,7 +322,6 @@
+ 	gboolean found = FALSE;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_PASSMD5 (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_PASSMD5 (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c.aap	2006-03-24 12:18:01.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c	2006-03-24 12:18:45.000000000 +0100
+@@ -341,7 +341,6 @@
+ 	gboolean found = FALSE;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_FILESEL (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_FILESEL (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c.aap	2006-03-24 12:18:01.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c	2006-03-24 12:18:14.000000000 +0100
+@@ -122,7 +122,6 @@
+ 	GnomeDbEntryCidr *mgcidr;
+ 
+ 	g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL);
+ 	g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL);
+ 
+ 	obj = g_object_new (GNOME_DB_TYPE_ENTRY_CIDR, "handler", dh, NULL);
+--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c.aap	2006-03-24 12:18:01.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c	2006-03-24 12:18:36.000000000 +0100
+@@ -330,7 +330,6 @@
+ 	gboolean found = FALSE;
+ 
+ 	g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_CIDR (iface), FALSE);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE);
+ 	hdl = GNOME_DB_HANDLER_CIDR (iface);
+ 	g_return_val_if_fail (hdl->priv, 0);
+ 
+--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c.aap	2006-03-24 12:18:01.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c	2006-03-24 12:18:21.000000000 +0100
+@@ -111,7 +111,6 @@
+ 	GnomeDbEntryPassmd5 *mgtxt;
+ 
+ 	g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL);
+ 	g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL);
+ 
+ 	obj = g_object_new (GNOME_DB_ENTRY_PASSMD5_TYPE, "handler", dh, NULL);
+--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c.aap	2006-03-24 12:18:01.000000000 +0100
++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c	2006-03-24 12:18:18.000000000 +0100
+@@ -109,7 +109,6 @@
+ 	GnomeDbEntryFilesel *filesel;
+ 
+ 	g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL);
+-	g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL);
+ 	g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL);
+ 
+ 	obj = g_object_new (GNOME_DB_TYPE_ENTRY_FILESEL, "handler", dh, NULL);




More information about the fedora-extras-commits mailing list