[Gnucash-changes] r12955 - gnucash/trunk - bug fix: prevent bad time values from being passed to entity - already in QOF CVS

[Neil Williams]

Author: codehelp
Date: 2006-01-23 09:30:37 -0500 (Mon, 23 Jan 2006)
New Revision: 12955
Trac: http://svn.gnucash.org/trac/changeset/12955

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/lib/libqof/backend/file/qsf-backend.c
Log:
bug fix: prevent bad time values from being passed to entity - already in QOF CVS

Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-01-23 14:24:56 UTC (rev 12954)
+++ gnucash/trunk/ChangeLog	2006-01-23 14:30:37 UTC (rev 12955)
@@ -1,3 +1,13 @@
+2006-01-23  Neil Williams <linux at codehelp.co.uk>
+
+    * lib/libqof/backend/file/qsf-backend.c : Prevent 
+    bad time values from being passed to entity.
+    * lib/libqof/qof/qof_book_merge.c : Fix merge 
+    handling of	QOF_TYPE_CHAR to use gchar instead of 
+    casting	from a gchar*
+    * lib/libqof/qof/qof_book_merge.h : Use gchar 
+    consistently instead of mixing with char.
+
 2006-01-22  David Hampton  <hampton at employees.org>
 
 	* src/gnome/dialog-chart-export.c:

Modified: gnucash/trunk/lib/libqof/backend/file/qsf-backend.c
===================================================================
--- gnucash/trunk/lib/libqof/backend/file/qsf-backend.c	2006-01-23 14:24:56 UTC (rev 12954)
+++ gnucash/trunk/lib/libqof/backend/file/qsf-backend.c	2006-01-23 14:30:37 UTC (rev 12955)
@@ -1055,8 +1055,11 @@
 		timechk = strptime((char*)xmlNodeGetContent(node), QSF_XSD_TIME, &qsf_time);
 		g_return_if_fail(timechk != NULL);
 		qsf_time_t = mktime(&qsf_time);
-		timespecFromTime_t(&cm_date, qsf_time_t);
-		if(date_setter != NULL) { date_setter(qsf_ent, cm_date); }
+		if(qsf_time_t != -3600)
+		{
+			timespecFromTime_t(&cm_date, qsf_time_t);
+			if(date_setter != NULL) { date_setter(qsf_ent, cm_date); }
+		}
 	}
 	if((safe_strcmp(qof_type, QOF_TYPE_NUMERIC) == 0)  ||
 	(safe_strcmp(qof_type, QOF_TYPE_DEBCRED) == 0)) {