Update gnotime to 2.2.1.

Changes:
* further use of GtkDialog
* added filter for HTML diary
* escape & in project name
* add option to reparent intervals to tasks above or below
* sync qof with latest qof sources
* accepted main.c <sys/wait.h> patch

5 files changed, 12 insertions, 274 deletions

diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 3d75ba28526..52026f66aa9 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/10/23 13:54:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/11/27 10:48:03 jdolecek Exp $
 
-DISTNAME=	gnotime-2.2.0
-PKGREVISION=	1
+DISTNAME=	gnotime-2.2.1
+PKGREVISION=	# empty
 CATEGORIES=	time gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gttr/}
 
diff --git a/time/gnotime/PLIST b/time/gnotime/PLIST
index 8a5f62a04ca..b86850a0637 100644
--- a/time/gnotime/PLIST
+++ b/time/gnotime/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/10/23 13:54:46 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/11/27 10:48:03 jdolecek Exp $
 bin/gnotime
 include/gnotime/gnc-date.h
 include/gnotime/gnc-engine-util.h
@@ -16,6 +16,8 @@ include/gnotime/qofgobj.h
 include/gnotime/qofid.h
 include/gnotime/qofinstance.h
 include/gnotime/qofobject.h
+include/gnotime/qofquery-deserial.h
+include/gnotime/qofquery-serialize.h
 include/gnotime/qofquery.h
 include/gnotime/qofquerycore.h
 include/gnotime/qofsession.h
@@ -45,6 +47,7 @@ share/gnotime/ghtml/C/gtt-style.css
 share/gnotime/ghtml/C/gtt.scm
 share/gnotime/ghtml/C/invoice.ghtml
 share/gnotime/ghtml/C/journal.ghtml
+share/gnotime/ghtml/C/journal-rss.ghtml
 share/gnotime/ghtml/C/noproject.ghtml
 share/gnotime/ghtml/C/primer.ghtml
 share/gnotime/ghtml/C/query.ghtml
diff --git a/time/gnotime/distinfo b/time/gnotime/distinfo
index dcc956cf133..3846b262d4a 100644
--- a/time/gnotime/distinfo
+++ b/time/gnotime/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2004/11/24 22:35:25 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2004/11/27 10:48:03 jdolecek Exp $
 
-SHA1 (gnotime-2.2.0.tar.gz) = 895a516a52b0cc7745183c0c8c909896dbda60ab
-Size (gnotime-2.2.0.tar.gz) = 1197945 bytes
-SHA1 (patch-aa) = a1332ebd600c4611533f5337dbc729af92f2d8d3
+SHA1 (gnotime-2.2.1.tar.gz) = 87f9f28aaad66597e0ba27d88f506602ac93963d
+Size (gnotime-2.2.1.tar.gz) = 1218556 bytes
+SHA1 (patch-aa) = 3f6e2ef0de4ee4617b6b1bc60e97e34ee7398568
 SHA1 (patch-ab) = 8ce9db0b1059ac45aab9681116ac86c331818847
 SHA1 (patch-ac) = d9523a1561cf7a57056a3670b1ebac4e28629fed
 SHA1 (patch-ad) = 060bddad8f1807823b6e2f65bec1bf12d4940fd9
@@ -14,5 +14,4 @@ SHA1 (patch-ai) = 440941dfaa4454f7d5dee90c43e79c950704d3ad
 SHA1 (patch-aj) = 0494c00b312ac73ee4107ef8d761f2d1047559bb
 SHA1 (patch-ak) = c198f95978471a946e0008d4d80f5630716ac991
 SHA1 (patch-al) = 36e08dfe8ee0a38a27db99f1edcb05669a57f29c
-SHA1 (patch-am) = d23fb795a5f2c6774e11cd7ac22f478b8f7266a8
 SHA1 (patch-an) = 120164b440724278e4bb4d4bc97404b3e4e76481
diff --git a/time/gnotime/patches/patch-aa b/time/gnotime/patches/patch-aa
index 2acb538d0c8..6f03bb97b13 100644
--- a/time/gnotime/patches/patch-aa
+++ b/time/gnotime/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/11/24 22:35:25 kristerw Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/27 10:48:03 jdolecek Exp $
 
 --- src/main.c.orig	Mon Apr 26 00:46:20 2004
 +++ src/main.c	Wed Nov 24 22:31:20 2004
-@@ -33,7 +33,7 @@
- #include <unistd.h>
- #include <utime.h>
- #if defined(HAVE_DECL_WNOHANG) && defined(HAVE_WAITPID)
--#include <wait.h>
-+#include <sys/wait.h>
- #endif
- 
- #include <qof.h>
 @@ -299,6 +299,7 @@
  	char * xml_filepath;
  	gboolean read_is_ok;
diff --git a/time/gnotime/patches/patch-am b/time/gnotime/patches/patch-am
deleted file mode 100644
index 30c15c8f80e..00000000000
--- a/time/gnotime/patches/patch-am
+++ /dev/null
@@ -1,255 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- lib/qof/qofsql.c.orig	Wed Nov 24 18:11:27 2004
-+++ lib/qof/qofsql.c	Wed Nov 24 18:25:14 2004
-@@ -155,8 +155,9 @@
- 	if (('\'' == str[0]) ||
- 	    ('\"' == str[0]))
- 	{
-+		size_t len;
- 		str ++;
--		size_t len = strlen(str);
-+		len = strlen(str);
- 		str[len-1] = 0;
- 	}
- 	return str;
-@@ -168,6 +169,15 @@
- 	char tmpbuff[128];
- 	GSList *param_list;
- 	QofQueryPredData *pred_data = NULL;
-+	QofQueryCompare qop;
-+	char *table_name;
-+	char *param_name;
-+	sql_field_item * sparam;
-+	char * qparam_name;
-+	sql_field_item * svalue;
-+	char * qvalue_name;
-+	QofType param_type;
-+	QofQuery *qq;
- 	
- 	if (NULL == cond)
- 	{
-@@ -183,14 +193,14 @@
- 		PWARN("missing left paramter");
- 		return NULL;
- 	}
--	sql_field_item * sparam = cond->d.pair.left->item;
-+	sparam = cond->d.pair.left->item;
- 	if (SQL_name != sparam->type)
- 	{
- 		PWARN("we support only paramter names at this time (parsed %d)",
-           sparam->type);
- 		return NULL;
- 	}
--	char * qparam_name = sparam->d.name->data;
-+	qparam_name = sparam->d.name->data;
- 	if (NULL == qparam_name)
- 	{
- 		PWARN ("missing paramter name");
-@@ -205,13 +215,13 @@
- 		PWARN ("missing right paramter");
- 		return NULL;
- 	}
--	sql_field_item * svalue = cond->d.pair.right->item;
-+	svalue = cond->d.pair.right->item;
- 	if (SQL_name != svalue->type)
- 	{
- 		PWARN("we support only simple values (parsed as %d)", svalue->type);
- 		return NULL;
- 	}
--	char * qvalue_name = svalue->d.name->data;
-+	qvalue_name = svalue->d.name->data;
- 	if (NULL == qvalue_name)
- 	{
- 		PWARN("missing value");
-@@ -224,16 +234,18 @@
- 	 * If it is, look up the value. */
- 	if (0 == strncasecmp (qvalue_name, "kvp://", 6))
- 	{
-+		KvpValue *kv;
-+		KvpValueType kvt;
- 		if (NULL == query->kvp_join)
- 		{
- 			PWARN ("missing kvp frame");
- 			return NULL;
- 		}
--		KvpValue *kv = kvp_frame_get_value (query->kvp_join, qvalue_name+5);
-+		kv = kvp_frame_get_value (query->kvp_join, qvalue_name+5);
- 		/* If there's no value, its not an error; 
- 		 * we just don't do this predicate */
- 		if (!kv) return NULL;  
--		KvpValueType kvt = kvp_value_get_type (kv);
-+		kvt = kvp_value_get_type (kv);
- 
- 		tmpbuff[0] = 0x0;
- 		qvalue_name = tmpbuff;
-@@ -273,7 +285,6 @@
- 	param_list = qof_query_build_param_list (qparam_name, NULL);
- 
- 	/* Get the where-term comparison operator */
--	QofQueryCompare qop;
- 	switch (cond->op)
- 	{
- 		case SQL_eq:    qop = QOF_COMPARE_EQUAL; break;
-@@ -292,8 +303,6 @@
- 	/* OK, need to know the type of the thing being matched 
- 	 * in order to build the correct predicate.  Get the type 
- 	 * from the object parameters. */
--	char *table_name;
--	char *param_name;
- 	get_table_and_param (qparam_name, &table_name, &param_name);
- 	if (NULL == table_name)
- 	{
-@@ -306,7 +315,7 @@
- 		return NULL;
- 	}
- 			
--	QofType param_type = qof_class_get_parameter_type (table_name, param_name);
-+	param_type = qof_class_get_parameter_type (table_name, param_name);
- 	if (!param_type) return NULL;  /* Can't happen */
- 
- 	if (!strcmp (param_type, QOF_TYPE_STRING))
-@@ -343,19 +352,20 @@
- 	}
- 	else if (!strcmp (param_type, QOF_TYPE_DATE))
- 	{
-+		time_t exact;
-+		int rc;
-+		Timespec ts;
- 		// XXX FIXME: this doesn't handle time strings, only date strings
- 		// XXX should also see if we need to do a day-compare or time-compare.
- 		/* work around highly bogus locale setting */
- 		qof_date_format_set(QOF_DATE_FORMAT_US);
- 
--		time_t exact;
--		int rc = qof_scan_date_secs (qvalue_name, &exact);
-+		rc = qof_scan_date_secs (qvalue_name, &exact);
- 		if (0 == rc) 
- 		{
- 			PWARN ("unable to parse date: %s", qvalue_name);
- 			return NULL;
- 		}
--		Timespec ts;
- 		ts.tv_sec = exact;
- 		ts.tv_nsec = 0;
- 		pred_data = qof_query_date_predicate (qop, QOF_DATE_MATCH_DAY, ts);
-@@ -375,6 +385,7 @@
- 	}
- 	else if (!strcmp (param_type, QOF_TYPE_GUID))
- 	{
-+		GList *guid_list;
- 		GUID *guid = guid_malloc();
- 		gboolean rc = string_to_guid (qvalue_name, guid);
- 		if (0 == rc)
-@@ -386,7 +397,7 @@
- 		// XXX match any means eqal, what about not equal ?? 
- 		// XXX less, than greater than don't make sense,
- 		// should check for those bad conditions
--		GList *guid_list = g_list_append (NULL, guid);
-+		guid_list = g_list_append (NULL, guid);
- 		pred_data = qof_query_guid_predicate (QOF_GUID_MATCH_ANY, guid_list);
- 		// XXX FIXME the above is a memory leak! we leak both guid and glist.
- 	}
-@@ -404,7 +415,7 @@
- 		return NULL;
- 	}
- 
--	QofQuery *qq = qof_query_create();
-+	qq = qof_query_create();
- 	qof_query_add_term (qq, param_list, pred_data, QOF_QUERY_FIRST_TERM);
- 	return qq;
- }
-@@ -418,11 +429,12 @@
- 	{
- 		case SQL_pair:
- 		{
-+			QofQuery * qq;
-+			QofQueryOp qop;
- 			QofQuery *qleft = handle_where (query, swear->d.pair.left);
- 			QofQuery *qright = handle_where (query, swear->d.pair.right);
- 			if (NULL == qleft) return qright;
- 			if (NULL == qright) return qleft;
--			QofQueryOp qop;
- 			switch (swear->d.pair.op)
- 			{
- 				case SQL_and: qop = QOF_QUERY_AND; break;
-@@ -433,7 +445,7 @@
- 					qof_query_destroy (qright);
- 					return NULL;
- 			}
--			QofQuery * qq = qof_query_merge (qleft, qright, qop);
-+			qq = qof_query_merge (qleft, qright, qop);
- 			qof_query_destroy (qleft);
- 			qof_query_destroy (qright);
- 			return qq;
-@@ -460,12 +472,11 @@
- static void 
- handle_sort_order (QofSqlQuery *query, GList *sorder_list)
- {
--	if (!sorder_list) return;
--
- 	GSList *qsp[3];
- 	gboolean direction[3];
- 	int i;
- 
-+	if (!sorder_list) return;
- 	for (i=0; i<3; i++)
- 	{
- 		qsp[i] = NULL;
-@@ -473,14 +484,16 @@
- 
- 		if (sorder_list)
- 		{
-+			char * qparam_name;
-+			GList *n;
- 			sql_order_field *sorder = sorder_list->data;
- 
- 			/* Set the sort direction */
- 			if (SQL_asc == sorder->order_type) direction[i] = TRUE;
- 
- 			/* Find the paramter name */
--			char * qparam_name = NULL;
--			GList *n = sorder->name;
-+			qparam_name = NULL;
-+			n = sorder->name;
- 			if (n)
- 			{
- 				qparam_name = n->data;
-@@ -509,6 +522,10 @@
- qof_sql_query_run (QofSqlQuery *query, const char *str)
- {
- 	GList *node;
-+	GList *tables;
-+	sql_select_statement *sss;
-+	sql_where * swear;
-+	GList *results;
- 
- 	if (!query) return NULL;
- 	query->parse_result = sql_parse (str);
-@@ -531,14 +548,14 @@
- 	 * user wrote "SELECT * FROM tableA, tableB WHERE ..."
- 	 * then we don't have a single unique table-name.
- 	 */
--	GList *tables = sql_statement_get_tables (query->parse_result);
-+	tables = sql_statement_get_tables (query->parse_result);
- 	if (1 == g_list_length (tables))
- 	{
- 		query->single_global_tablename = tables->data;
- 	}
- 
--	sql_select_statement *sss = query->parse_result->statement;
--	sql_where * swear = sss->where;
-+	sss = query->parse_result->statement;
-+	swear = sss->where;
- 	if (swear)
- 	{
- 		/* Walk over the where terms, turn them into QOF predicates */
-@@ -562,7 +579,7 @@
- 	qof_query_set_book (query->qof_query, query->book);
- 
- 	// qof_query_print (query->qof_query);
--	GList *results = qof_query_run (query->qof_query);
-+	results = qof_query_run (query->qof_query);
- 
- 	return results;
- }