Fix build on 4.X.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2318 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 697 insertions, 0 deletions

diff --git a/deskutils/gnotime/files/patch-lib::qof::qofgobj.c b/deskutils/gnotime/files/patch-lib::qof::qofgobj.c
new file mode 100644
index 000000000..89b9f5c89
--- /dev/null
+++ b/deskutils/gnotime/files/patch-lib::qof::qofgobj.c
@@ -0,0 +1,140 @@
+--- lib/qof/qofgobj.c.orig	Mon May 24 19:55:16 2004
++++ lib/qof/qofgobj.c	Mon May 24 20:01:38 2004
+@@ -57,10 +57,11 @@
+ void 
+ qof_gobject_shutdown (void)
+ {
++  GSList *n;
++
+   if (!initialized) return;
+   initialized = FALSE;
+                                                                                 
+-  GSList *n;
+   for (n=paramList; n; n=n->next) g_free(n->data);
+   g_slist_free (paramList);
+ 
+@@ -83,11 +84,14 @@
+ void 
+ qof_gobject_register_instance (QofBook *book, QofType type, GObject *gob)
+ {
++  QofCollection *coll;
++  GSList * instance_list;
++
+   if (!book || !type) return;
+ 
+-  QofCollection *coll = qof_book_get_collection (book, type);
++  coll = qof_book_get_collection (book, type);
+ 
+-  GSList * instance_list = qof_collection_get_data (coll);
++  instance_list = qof_collection_get_data (coll);
+   instance_list = g_slist_prepend (instance_list, gob);
+   qof_collection_set_data (coll, instance_list);
+ }
+@@ -101,6 +105,8 @@
+ 
+   GParamSpec *gps = getter->param_userdata;
+ 
++  const char * str;
++
+   /* Note that the return type must actually be of type
+    * getter->param_type but we just follow the hard-coded 
+    * mapping below ... */
+@@ -110,37 +116,40 @@
+     g_value_init (&gval, G_TYPE_STRING);
+     g_object_get_property (gob, getter->param_name, &gval);
+ 
+-    const char * str = g_value_get_string (&gval);
++    str = g_value_get_string (&gval);
+     return (gpointer) str;
+   }
+   else
+   if (G_IS_PARAM_SPEC_INT(gps))
+   {
++    int ival;
+     GValue gval = {G_TYPE_INVALID};
+     g_value_init (&gval, G_TYPE_INT);
+     g_object_get_property (gob, getter->param_name, &gval);
+ 
+-    int ival = g_value_get_int (&gval);
++    ival = g_value_get_int (&gval);
+     return (gpointer) ival;
+   }
+   else
+   if (G_IS_PARAM_SPEC_UINT(gps))
+   {
++    int ival;
+     GValue gval = {G_TYPE_INVALID};
+     g_value_init (&gval, G_TYPE_UINT);
+     g_object_get_property (gob, getter->param_name, &gval);
+ 
+-    int ival = g_value_get_uint (&gval);
++    ival = g_value_get_uint (&gval);
+     return (gpointer) ival;
+   }
+   else
+   if (G_IS_PARAM_SPEC_BOOLEAN(gps))
+   {
++    int ival;
+     GValue gval = {G_TYPE_INVALID};
+     g_value_init (&gval, G_TYPE_BOOLEAN);
+     g_object_get_property (gob, getter->param_name, &gval);
+ 
+-    int ival = g_value_get_boolean (&gval);
++    ival = g_value_get_boolean (&gval);
+     return (gpointer) ival;
+   }
+ 
+@@ -161,21 +170,23 @@
+    * mapping below ... */
+   if (G_IS_PARAM_SPEC_FLOAT(gps))
+   {
++    double fval;
+     GValue gval = {G_TYPE_INVALID};
+     g_value_init (&gval, G_TYPE_FLOAT);
+     g_object_get_property (gob, getter->param_name, &gval);
+ 
+-    double fval = g_value_get_float (&gval);
++    fval = g_value_get_float (&gval);
+     return fval;
+   }
+   else
+   if (G_IS_PARAM_SPEC_DOUBLE(gps))
+   {
++    double fval;
+     GValue gval = {G_TYPE_INVALID};
+     g_value_init (&gval, G_TYPE_DOUBLE);
+     g_object_get_property (gob, getter->param_name, &gval);
+ 
+-    double fval = g_value_get_double (&gval);
++    fval = g_value_get_double (&gval);
+     return fval;
+   } 
+ 
+@@ -208,13 +219,16 @@
+   /* Get the GObject properties, convert to QOF properties */
+   GParamSpec **prop_list;
+   int n_props;
++  int i, j=0;
++  QofParam * qof_param_list;
++  QofObject *class_def;
++
+   prop_list = g_object_class_list_properties (obclass, &n_props);
+ 
+-  QofParam * qof_param_list = g_new0 (QofParam, n_props);
++  qof_param_list = g_new0 (QofParam, n_props);
+   paramList = g_slist_prepend (paramList, qof_param_list);
+ 
+   PINFO ("object %s has %d props", e_type, n_props);
+-  int i, j=0;
+   for (i=0; i<n_props; i++)
+   {
+     GParamSpec *gparam = prop_list[i];
+@@ -288,7 +302,7 @@
+ 
+   /* ------------------------------------------------------ */
+    /* Now do the class itself */
+-  QofObject *class_def = g_new0 (QofObject, 1);
++  class_def = g_new0 (QofObject, 1);
+   classList = g_slist_prepend (classList, class_def);
+ 
+   class_def->interface_version = QOF_OBJECT_VERSION;
diff --git a/deskutils/gnotime/files/patch-lib::qof::qofsql.c b/deskutils/gnotime/files/patch-lib::qof::qofsql.c
new file mode 100644
index 000000000..0682fa95a
--- /dev/null
+++ b/deskutils/gnotime/files/patch-lib::qof::qofsql.c
@@ -0,0 +1,263 @@
+--- lib/qof/qofsql.c.orig	Tue Apr 20 23:45:10 2004
++++ lib/qof/qofsql.c	Mon May 24 20:33:10 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;
++	char * qvalue_name;
++	sql_field_item * sparam;
++	sql_field_item * svalue;
++	char * qparam_name;
++	QofQueryCompare qop;
++	char *table_name;
++	char *param_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))
+@@ -328,7 +337,7 @@
+ 	}
+ 	else if (!strcmp (param_type, QOF_TYPE_INT64))
+ 	{
+-		gint64 ival = atoll (qvalue_name);
++		gint64 ival = atol (qvalue_name);
+ 		pred_data = qof_query_int64_predicate (qop, ival);
+ 	}
+ 	else if (!strcmp (param_type, QOF_TYPE_DOUBLE))
+@@ -346,16 +355,17 @@
+ 		// 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 */
++		time_t exact;
++		int rc;
++		Timespec ts;
+ 		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,8 +385,11 @@
+ 	}
+ 	else if (!strcmp (param_type, QOF_TYPE_GUID))
+ 	{
+-		GUID *guid = guid_malloc();
+-		gboolean rc = string_to_guid (qvalue_name, guid);
++		GUID *guid;
++		gboolean rc;
++		GList *guid_list;
++		guid = guid_malloc();
++		rc = string_to_guid (qvalue_name, guid);
+ 		if (0 == rc)
+ 		{
+ 			PWARN ("unable to parse guid: %s", qvalue_name);
+@@ -386,7 +399,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 +417,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 +431,12 @@
+ 	{
+ 		case SQL_pair:
+ 		{
++			QofQueryOp qop;
++			QofQuery * qq;
+ 			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 +447,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 +474,12 @@
+ 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;
+@@ -474,13 +488,13 @@
+ 		if (sorder_list)
+ 		{
+ 			sql_order_field *sorder = sorder_list->data;
++			char * qparam_name = NULL;
++			GList *n = sorder->name;
+ 
+ 			/* 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;
+ 			if (n)
+ 			{
+ 				qparam_name = n->data;
+@@ -509,6 +523,10 @@
+ qof_sql_query_run (QofSqlQuery *query, const char *str)
+ {
+ 	GList *node;
++	GList *tables;
++	GList *results;
++	sql_select_statement *sss;
++	sql_where * swear;
+ 
+ 	if (!query) return NULL;
+ 	query->parse_result = sql_parse (str);
+@@ -531,14 +549,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 +580,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;
+ }
diff --git a/deskutils/gnotime/files/patch-src::ghtml.c b/deskutils/gnotime/files/patch-src::ghtml.c
new file mode 100644
index 000000000..dd6403f2e
--- /dev/null
+++ b/deskutils/gnotime/files/patch-src::ghtml.c
@@ -0,0 +1,34 @@
+--- src/ghtml.c.orig	Mon May 24 20:14:28 2004
++++ src/ghtml.c	Mon May 24 20:15:57 2004
+@@ -163,8 +163,9 @@
+ 			type = SCM_CDR (node);
+ 			if (SCM_SYMBOLP(type) || SCM_STRINGP (type))
+ 			{
++				char *buff;
+ 				cur_type = GTT_NONE;
+-				char *buff = SCM_STRING_CHARS (type);
++				buff = SCM_STRING_CHARS (type);
+ 
+ 				if ((!strncmp (buff, "gtt-project-ptr",15)) ||
+ 				    (!strncmp (buff, "gtt-project-list",16)))
+@@ -1181,6 +1182,9 @@
+ static SCM 
+ my_catch_handler (void *data, SCM tag, SCM throw_args)
+ {
++	SCM fmt;
++	SCM s_str;
++
+ 	printf ("Error: GnoTime caught error during scheme parse\n");
+ 	if (SCM_SYMBOLP(tag))
+ 	{
+@@ -1189,8 +1193,8 @@
+ 	}
+ 	scm_backtrace(); 
+ 
+-	SCM fmt = scm_makfrom0str ("~S");
+-	SCM s_str = scm_simple_format (SCM_BOOL_F, fmt, SCM_LIST1(throw_args));
++	fmt = scm_makfrom0str ("~S");
++	s_str = scm_simple_format (SCM_BOOL_F, fmt, SCM_LIST1(throw_args));
+ 	printf ("\tthrow_args=%s\n", SCM_STRING_CHARS (s_str));
+ 
+ 	return SCM_EOL;
diff --git a/deskutils/gnotime/files/patch-src::journal.c b/deskutils/gnotime/files/patch-src::journal.c
new file mode 100644
index 000000000..857d5aa94
--- /dev/null
+++ b/deskutils/gnotime/files/patch-src::journal.c
@@ -0,0 +1,77 @@
+--- src/journal.c.orig	Mon May 24 20:17:43 2004
++++ src/journal.c	Mon May 24 20:20:53 2004
+@@ -414,6 +414,7 @@
+ static void
+ task_delete_memo_clicked_cb(GtkWidget * w, gpointer data) 
+ {
++	GList * ctl;
+ 	Wiggy *wig = (Wiggy *) data;
+ 
+ 	/* its physically impossible to cut just the memo,
+@@ -422,7 +423,7 @@
+ 
+ 	gtt_task_merge_up (wig->task);
+ 
+-	GList * ctl = g_list_prepend(cutted_task_list, wig->task);
++	ctl = g_list_prepend(cutted_task_list, wig->task);
+ 	gtt_task_remove (wig->task);
+ 	cutted_task_list = ctl;
+ }
+@@ -657,6 +658,8 @@
+ 	if (!wig->hover_help_window)
+ 	{
+ 		char * msg = _("Left-click to bring up menu");
++		GtkWidget *label;
++		int px=0, py=0, rx=0, ry=0;
+ 
+ 		wig->hover_help_window = gtk_window_new(GTK_WINDOW_POPUP);
+ 		gtk_window_set_decorated (GTK_WINDOW(wig->hover_help_window), FALSE);
+@@ -664,7 +667,7 @@
+ 		gtk_window_set_transient_for (GTK_WINDOW(wig->hover_help_window), 
+ 							 GTK_WINDOW(wig->top));
+ 
+-		GtkWidget *label = gtk_label_new (msg);
++		label = gtk_label_new (msg);
+ 		gtk_container_add(GTK_CONTAINER(wig->hover_help_window), label);
+ 		gtk_widget_show (label);
+ 
+@@ -672,7 +675,6 @@
+ 		gtk_window_set_focus (GTK_WINDOW(wig->top), GTK_WIDGET(wig->html));
+ 
+ 		/* Set up in initial default, so later move works. */
+-		int px=0, py=0, rx=0, ry=0;
+ 		gtk_widget_get_pointer (GTK_WIDGET(wig->top), &px, &py);
+ 		gtk_window_get_position (GTK_WINDOW(wig->top), &rx, &ry);
+ 		gtk_window_move (GTK_WINDOW(wig->hover_help_window), rx+px, ry+py);
+@@ -714,25 +716,28 @@
+ perform_form_query (KvpFrame *kvpf)
+ {
+ 	GList *results, *n;
++	char *user_debug;
++	char *query_string;
++	QofSqlQuery *q;
+ 
+ 	if (!kvpf) return NULL;
+ 
+ 	/* Allow the user to enable form debugging by adding the following html:
+ 	 * <input type="hidden" name="debug" value="1">
+ 	 */
+-	char *user_debug = kvp_frame_get_string (kvpf, "debug");
++	user_debug = kvp_frame_get_string (kvpf, "debug");
+ 	if (user_debug)
+ 	{
+ 		printf ("Debug: HTML Form Input=%s\n", kvp_frame_to_string (kvpf));
+ 	}
+ 
+-	QofSqlQuery *q = qof_sql_query_new();
++	q = qof_sql_query_new();
+ 
+ 	if (!book) book = qof_book_new();
+ 	qof_sql_query_set_book (q, book);
+ 	qof_sql_query_set_kvp (q, kvpf);
+ 
+-	char *query_string = kvp_frame_get_string (kvpf, "query");
++	query_string = kvp_frame_get_string (kvpf, "query");
+ 	if (!query_string) return NULL;
+ 	if (0 == query_string[0]) return NULL;
+ 
diff --git a/deskutils/gnotime/files/patch-src::main.c b/deskutils/gnotime/files/patch-src::main.c
new file mode 100644
index 000000000..8d101c9cc
--- /dev/null
+++ b/deskutils/gnotime/files/patch-src::main.c
@@ -0,0 +1,36 @@
+--- src/main.c.orig	Mon May 24 20:21:51 2004
++++ src/main.c	Mon May 24 20:23:18 2004
+@@ -689,11 +689,7 @@
+ int 
+ main(int argc, char *argv[])
+ {
+-#if defined (HAVE_DECL_WNOHANG) || defined (HAVE_DECL_SA_NOCLDWAIT)
+-	struct sigaction reapchildren;
+-	memset(&reapchildren, 0, sizeof reapchildren);
+-#endif /*  WNOHANG/SA_NOCLDWAIT */
+-
++	GnomeClient *client;
+ 	static char *geometry_string = NULL;
+ 	static const struct poptOption geo_options[] =
+ 	{
+@@ -704,6 +700,11 @@
+ 		{NULL, '\0', 0, NULL, 0}
+ 	};
+ 
++#if defined (HAVE_DECL_WNOHANG) || defined (HAVE_DECL_SA_NOCLDWAIT)
++	struct sigaction reapchildren;
++	memset(&reapchildren, 0, sizeof reapchildren);
++#endif /*  WNOHANG/SA_NOCLDWAIT */
++
+ 	gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
+ 		                   GNOME_PARAM_POPT_TABLE, geo_options, 
+ 		                   GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
+@@ -713,7 +714,7 @@
+ 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain(GETTEXT_PACKAGE);
+ 
+-	GnomeClient *client = gnome_master_client();
++	client = gnome_master_client();
+ 	g_signal_connect(G_OBJECT(client), "save_yourself",
+ 			   G_CALLBACK(save_state), (gpointer) argv[0]);
+ 	g_signal_connect(G_OBJECT(client), "die",
diff --git a/deskutils/gnotime/files/patch-src::menucmd.c b/deskutils/gnotime/files/patch-src::menucmd.c
new file mode 100644
index 000000000..0f8535099
--- /dev/null
+++ b/deskutils/gnotime/files/patch-src::menucmd.c
@@ -0,0 +1,36 @@
+--- src/menucmd.c.orig	Mon May 24 20:24:15 2004
++++ src/menucmd.c	Mon May 24 20:24:50 2004
+@@ -321,6 +321,7 @@
+ cut_project(GtkWidget *w, gpointer data)
+ {
+ 	GttProject *cut_prj;
++	GttProject *prj;
+ 
+ 	/* Do NOT cut unless the ctree window actually has focus.
+ 	 * Otherwise, it will lead to cutting mayhem. 
+@@ -342,7 +343,7 @@
+ 
+ 	/* Update various subsystems */
+ 	/* Set the notes are to whatever the new focus project is. */
+-	GttProject *prj = ctree_get_focus_project (global_ptw);
++	prj = ctree_get_focus_project (global_ptw);
+ 	notes_area_set_project (global_na, prj);
+ 						 
+ 	menu_set_states();      /* To enable paste menu item */
+@@ -402,6 +403,7 @@
+ copy_project(GtkWidget *w, gpointer data)
+ {
+ 	GttProject *prj;
++	GList *n;
+ 	prj = ctree_get_focus_project (global_ptw);
+ 
+ 	if (!prj) return;
+@@ -412,7 +414,7 @@
+ 	 * the list of earlier cut projects.  We do this in order
+ 	 * to allow the most recently copied project to be pasted
+ 	 * multiple times.  */
+-	GList *n = cutted_project_list;
++	n = cutted_project_list;
+ 	for (n=cutted_project_list; n; n=n->next)
+ 	{
+ 		GttProject *p = n->data;
diff --git a/deskutils/gnotime/files/patch-src::prefs.c b/deskutils/gnotime/files/patch-src::prefs.c
new file mode 100644
index 000000000..40db4b8d8
--- /dev/null
+++ b/deskutils/gnotime/files/patch-src::prefs.c
@@ -0,0 +1,95 @@
+--- src/prefs.c.orig	Mon May 24 20:25:52 2004
++++ src/prefs.c	Mon May 24 20:29:36 2004
+@@ -200,10 +200,12 @@
+ scan_time_string (const char *str)
+ {
+ 	int hours=0, minutes=0, seconds = 0;
++	int totalsecs;
+ 	char buff[24];
++	char *p;
+ 	strncpy (buff, str, 24);
+ 	buff[23]=0;
+-	char * p = strchr (buff, ':');
++	p = strchr (buff, ':');
+ 	if (p) *p = 0;
+ 	hours = atoi (buff);
+ 	if (p)
+@@ -221,7 +223,7 @@
+ 	minutes %= 60;
+ 	hours %= 24;
+ 
+-	int totalsecs = hours*3600 + minutes*60 + seconds;
++	totalsecs = hours*3600 + minutes*60 + seconds;
+ 	if (12*3600 < totalsecs) totalsecs -= 24*3600;
+ 	return totalsecs;
+ }
+@@ -373,14 +375,16 @@
+ 	if (5 == page)
+ 	{
+ 		int change = 0;
++		int off, day;
++		const char *buff;
+ 		config_idle_timeout = atoi(gtk_entry_get_text(GTK_ENTRY(odlg->idle_secs)));
+ 
+ 		/* Hunt for the hour-of night on which to start */
+-		const char * buff = gtk_entry_get_text (odlg->daystart_secs);
+-		int off = scan_time_string (buff);
++		buff = gtk_entry_get_text (odlg->daystart_secs);
++		off = scan_time_string (buff);
+ 		SET_VAL (config_daystart_offset,off);
+ 
+-		int day = get_optionmenu_item (odlg->weekstart_menu);
++		day = get_optionmenu_item (odlg->weekstart_menu);
+ 		SET_VAL (config_weekstart_offset, day);
+ 
+ 		if (change)
+@@ -421,6 +425,8 @@
+ options_dialog_set(PrefsDialog *odlg)
+ {
+ 	char s[30];
++	int hour, secs, day;
++	char buff[24];
+ 
+ 	SET_ACTIVE(secs);
+ 	SET_ACTIVE(statusbar);
+@@ -495,7 +501,6 @@
+ 	gtk_entry_set_text(GTK_ENTRY(odlg->idle_secs), s);
+ 
+ 	/* Set the correct menu item based on current values */
+-	int hour;
+ 	if (0<config_daystart_offset)
+ 	{
+ 		hour = (config_daystart_offset +1800)/3600;
+@@ -510,14 +515,13 @@
+ 	set_optionmenu_item (odlg->daystart_menu, hour);
+ 
+ 	/* Print the daystart offset as a string in 24 hour time */
+-	int secs = config_daystart_offset;
++	secs = config_daystart_offset;
+ 	if (0 > secs) secs += 24*3600;
+-	char buff[24];
+ 	qof_print_hours_elapsed_buff (buff, 24, secs, config_show_secs);   
+ 	gtk_entry_set_text (odlg->daystart_secs, buff);
+ 
+ 	/* Set the correct menu item based on current values */
+-	int day = config_weekstart_offset;
++	day = config_weekstart_offset;
+ 	set_optionmenu_item (odlg->weekstart_menu, day);
+ 
+ 	/* set to unmodified as it reflects the current state of the app */
+@@ -531,12 +535,13 @@
+ {
+ 	PrefsDialog *dlg = data;
+ 
++	int secs;
++	char buff[24];
+ 	int hour = get_optionmenu_item (dlg->daystart_menu);
+ 	hour += -3;  /* menu starts at 9PM */
+ 
+-	int secs = hour * 3600;
++	secs = hour * 3600;
+ 	if (0 > secs) secs += 24*3600;
+-	char buff[24];
+ 	qof_print_hours_elapsed_buff (buff, 24, secs, config_show_secs);   
+ 	gtk_entry_set_text (dlg->daystart_secs, buff);
+ }
diff --git a/deskutils/gnotime/files/patch-src::query.c b/deskutils/gnotime/files/patch-src::query.c
new file mode 100644
index 000000000..28d04a6d0
--- /dev/null
+++ b/deskutils/gnotime/files/patch-src::query.c
@@ -0,0 +1,16 @@
+--- src/query.c.orig	Mon May 24 20:30:42 2004
++++ src/query.c	Mon May 24 20:30:55 2004
+@@ -74,12 +74,12 @@
+ 
+ 	while (1)
+ 	{
++		GttBucket *bu;
+ 		/* Check error bounds, should never happen */
+ 		if ((0 > arr_day) || (arr_day >= da->array_len))
+ 		{
+ 			return 1;
+ 		}
+-		GttBucket *bu;
+ 		bu = &g_array_index (da->buckets, GttBucket, arr_day);
+ 
+ 		stm.tm_mday ++;