Update to 2.3.0:

New in the 2.3.0 Release:
-------------------------
The main changes in this release are:
* a new implementation of the projects tree using the GtkTreeView
  component which fixes a lot of the bugs regarding the projects
  tree manipulation and prepares the way for many customizations
  in future releases.
* an initial implementation of a tray icon that displays timer status
  and allows the user to toggle the timer by clicking on it.
* a rewrite of the idle detection using the XScreenSaver extension and
  of the timer system to make it more system power conservation
  friendly.
* port of the report system to use guile version 1.8.
* many changes in the configure script, including porperly checking for
  guile and gconf and version of available DBUS.
* removal of some deprecated APIs usage.


In addition, many bugs have been fixed, including:
* broken behavior of drag-and-drop (#1856268)
* compiles but crashes on startup in fedora core 5 (#1802501)
* activity journal truncates seconds (#1706365)
* green bar flickers when value changes (#1171204)
* dragging project to make sub-project will not scroll (#831808)

New in the 2.2.3 Release:
-------------------------
This release brings better internationalization in reports with locale
based formating of times and monetary values. The newly added support
for DBus messages allows users to start/stop the timer and save/reload
the data file from the command line using the gnotime-remote
script. Also, an update user's manual covers most of the features
available in this version. In addition, many bugs have been fixed,
including:

-- Crash when saving to full filesystem (#1548248)
-- Day of century calculation error causing skipped day in reports
-- Conflicting keybindings (#1639477)
-- Invoice report doesn't work in locales other than C
-- Hidden question dialog when overwriting file during report saving
   (http://bugs.debian.org/422023)

23 files changed, 48 insertions, 1740 deletions

diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 2a43b39288d..e82eca96561 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2008/06/20 01:09:39 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2008/10/28 23:38:33 wiz Exp $
 
-DISTNAME=	gnotime-2.2.1
-PKGREVISION=	16
+DISTNAME=	gnotime-2.3.0
 CATEGORIES=	time gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gttr/}
 
@@ -18,8 +17,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
 GCONF_SCHEMAS=		gnotime.schemas
-
-BUILDLINK_DEPMETHOD.libXt?=	build
+MAKE_ENV+=		GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q}
 
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -28,13 +26,13 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+.include "../../devel/qof/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/gtkhtml38/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
+.include "../../www/gtkhtml314/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnotime/PLIST b/time/gnotime/PLIST
index 7eea32ae368..a0f95bd3fc0 100644
--- a/time/gnotime/PLIST
+++ b/time/gnotime/PLIST
@@ -1,42 +1,35 @@
-@comment $NetBSD: PLIST,v 1.5 2007/09/25 10:54:19 hira Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/10/28 23:38:33 wiz Exp $
 bin/gnotime
-include/gnotime/gnc-date.h
-include/gnotime/gnc-engine-util.h
-include/gnotime/gnc-event.h
-include/gnotime/gnc-numeric.h
-include/gnotime/gnc-trace.h
-include/gnotime/guid.h
-include/gnotime/kvp-util.h
-include/gnotime/kvp_frame.h
-include/gnotime/qof.h
-include/gnotime/qofbackend.h
-include/gnotime/qofbook.h
-include/gnotime/qofclass.h
-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
-include/gnotime/qofsql.h
-include/gnotime/sql_parser.h
-lib/libqof.la
-lib/libqofsql.la
+bin/gnotime-remote
+man/man1/gnotime-remote.1
 man/man1/gnotime.1
 share/applications/gnotime.desktop
 share/gconf/schemas/gnotime.schemas
+share/gnome/help/gnotime/C/figures/gtt_edit_reports_dialog.png
 share/gnome/help/gnotime/C/figures/gtt_mainwin.png
+share/gnome/help/gnotime/C/figures/gtt_new_project.png
+share/gnome/help/gnotime/C/figures/gtt_new_report_dialog.png
+share/gnome/help/gnotime/C/figures/gtt_prefs_display.png
+share/gnome/help/gnotime/C/figures/gtt_prefs_fields.png
+share/gnome/help/gnotime/C/figures/gtt_prefs_logfile.png
+share/gnome/help/gnotime/C/figures/gtt_prefs_misc.png
+share/gnome/help/gnotime/C/figures/gtt_prefs_reports.png
+share/gnome/help/gnotime/C/figures/gtt_prefs_shell.png
+share/gnome/help/gnotime/C/figures/gtt_prefs_toolbar.png
 share/gnome/help/gnotime/C/figures/gtt_prefswin.png
+share/gnome/help/gnotime/C/figures/gtt_props_intervals.png
+share/gnome/help/gnotime/C/figures/gtt_props_planning.png
+share/gnome/help/gnotime/C/figures/gtt_props_project.png
+share/gnome/help/gnotime/C/figures/gtt_props_rates.png
+share/gnome/help/gnotime/C/figures/gtt_report_activity.png
+share/gnome/help/gnotime/C/figures/gtt_report_daily.png
+share/gnome/help/gnotime/C/figures/gtt_report_invoice.png
+share/gnome/help/gnotime/C/figures/gtt_report_journal.png
+share/gnome/help/gnotime/C/figures/gtt_report_todo.png
+share/gnome/help/gnotime/C/figures/gtt_restartwin.png
+share/gnome/help/gnotime/C/figures/gtt_startprojwin.png
 share/gnome/help/gnotime/C/gnotime.xml
-share/gnome/help/gnotime/es/figures/gtt_mainwin.png
-share/gnome/help/gnotime/es/figures/gtt_prefswin.png
-share/gnome/help/gnotime/es/gnotime.xml
-share/gnome/help/gnotime/eu/figures/gtt_mainwin.png
-share/gnome/help/gnotime/eu/figures/gtt_prefswin.png
-share/gnome/help/gnotime/eu/gnotime.xml
+share/gnotime/ghtml/C/activity.ghtml
 share/gnotime/ghtml/C/basic-daily.ghtml
 share/gnotime/ghtml/C/basic-invoice.ghtml
 share/gnotime/ghtml/C/basic-journal.ghtml
@@ -46,17 +39,18 @@ share/gnotime/ghtml/C/gnotime-logo.png
 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/journal.ghtml
+share/gnotime/ghtml/C/monthly-daily.ghtml
 share/gnotime/ghtml/C/noproject.ghtml
 share/gnotime/ghtml/C/primer.ghtml
 share/gnotime/ghtml/C/query.ghtml
 share/gnotime/ghtml/C/status.ghtml
 share/gnotime/ghtml/C/tab-delim.ghtml
-share/gnotime/ghtml/C/time-interval.ghtml
 share/gnotime/ghtml/C/todo-export.ghtml
 share/gnotime/ghtml/C/todo.ghtml
 share/gnotime/glade/active.glade
+share/gnotime/glade/column_menu.glade
 share/gnotime/glade/idle.glade
 share/gnotime/glade/interval_edit.glade
 share/gnotime/glade/interval_popup.glade
@@ -91,9 +85,9 @@ share/locale/ko/LC_MESSAGES/gnotime-2.0.mo
 share/locale/lt/LC_MESSAGES/gnotime-2.0.mo
 share/locale/lv/LC_MESSAGES/gnotime-2.0.mo
 share/locale/ms/LC_MESSAGES/gnotime-2.0.mo
+share/locale/nb/LC_MESSAGES/gnotime-2.0.mo
 share/locale/nl/LC_MESSAGES/gnotime-2.0.mo
 share/locale/nn/LC_MESSAGES/gnotime-2.0.mo
-share/locale/no/LC_MESSAGES/gnotime-2.0.mo
 share/locale/pl/LC_MESSAGES/gnotime-2.0.mo
 share/locale/pt/LC_MESSAGES/gnotime-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnotime-2.0.mo
@@ -110,22 +104,15 @@ share/locale/wa/LC_MESSAGES/gnotime-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnotime-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnotime-2.0.mo
 share/omf/gnotime/gnotime-C.omf
-share/omf/gnotime/gnotime-es.omf
-share/omf/gnotime/gnotime-eu.omf
 @dirrm share/omf/gnotime
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @dirrm share/gnotime/glade
 @dirrm share/gnotime/ghtml/C
 @dirrm share/gnotime/ghtml
 @dirrm share/gnotime
-@dirrm share/gnome/help/gnotime/eu/figures
-@dirrm share/gnome/help/gnotime/eu
-@dirrm share/gnome/help/gnotime/es/figures
-@dirrm share/gnome/help/gnotime/es
 @dirrm share/gnome/help/gnotime/C/figures
 @dirrm share/gnome/help/gnotime/C
 @dirrm share/gnome/help/gnotime
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
-@dirrm include/gnotime
diff --git a/time/gnotime/distinfo b/time/gnotime/distinfo
index 9d85895ffce..1186fc11154 100644
--- a/time/gnotime/distinfo
+++ b/time/gnotime/distinfo
@@ -1,25 +1,6 @@
-$NetBSD: distinfo,v 1.8 2006/04/04 15:32:22 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2008/10/28 23:38:33 wiz Exp $
 
-SHA1 (gnotime-2.2.1.tar.gz) = 87f9f28aaad66597e0ba27d88f506602ac93963d
-RMD160 (gnotime-2.2.1.tar.gz) = b72f9d0e2e236a98983237d99b01f5a9c7258fc0
-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
-SHA1 (patch-ae) = 13df9a08b372bbd9f491b2159151d8eaed58e6fd
-SHA1 (patch-af) = adc0c63aab58c5ac15be9c194b7d76ac7a37736c
-SHA1 (patch-ag) = 4816d594079adfdef51a7471b587db62167c9d57
-SHA1 (patch-ah) = 8683366be0995489347cb7f72e4a3ce3ac1204cb
-SHA1 (patch-ai) = 440941dfaa4454f7d5dee90c43e79c950704d3ad
-SHA1 (patch-aj) = fbae54ccfb5a195852006ec85ee3e1c484fe5998
-SHA1 (patch-ak) = c198f95978471a946e0008d4d80f5630716ac991
-SHA1 (patch-al) = 36e08dfe8ee0a38a27db99f1edcb05669a57f29c
-SHA1 (patch-am) = 64fbb093f01c1a4c464868c697e91c68d483ab9a
-SHA1 (patch-an) = 120164b440724278e4bb4d4bc97404b3e4e76481
-SHA1 (patch-ao) = 18df822656eb97273b496eb2476ecd39f6df2251
-SHA1 (patch-ap) = a37c79e17986963ffc3cecd4207270ff95cd16bf
-SHA1 (patch-aq) = 1584c3e958137c2755de8d801488a755f51d3d82
-SHA1 (patch-ar) = 6b20a5786f29a7d8f66f1245a4a8b55dfb1cf84b
-SHA1 (patch-as) = cf0ba3a29f2b5f5d96df667e94f803ac86bfc7b4
-SHA1 (patch-at) = 27db86b595055c31706c246fc1eeb94f54acb555
+SHA1 (gnotime-2.3.0.tar.gz) = 1cd38b5a3d3548d19543f0aea421152367523a90
+RMD160 (gnotime-2.3.0.tar.gz) = 361e45d82997cbac691751b830a2279e6ed74134
+Size (gnotime-2.3.0.tar.gz) = 1987788 bytes
+SHA1 (patch-ab) = c78194b5eb8caef9d118246c0da1c923a32a2e8c
diff --git a/time/gnotime/patches/patch-aa b/time/gnotime/patches/patch-aa
deleted file mode 100644
index 6f03bb97b13..00000000000
--- a/time/gnotime/patches/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
-$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
-@@ -299,6 +299,7 @@
- 	char * xml_filepath;
- 	gboolean read_is_ok;
- 	char *errmsg, *qmsg;
-+	GtkWidget *mb;
- 
- 	xml_filepath = resolve_old_path (config_data_url);
- 
-@@ -347,7 +348,6 @@
- 			_("Do you want to continue?"),
- 			NULL);
- 
--	GtkWidget *mb;
- 	mb = gtk_message_dialog_new (NULL,
- 	         GTK_DIALOG_MODAL,
- 	         GTK_MESSAGE_ERROR,
-@@ -398,13 +398,13 @@
- 	{
- 		const char *fp;
- 		char *errmsg, *qmsg;
-+		GtkWidget *mb;
- 		fp = gtt_get_config_filepath();
- 		errmsg = gtt_err_to_string (conf_errcode, fp);
- 		qmsg = g_strconcat (errmsg, 
- 			_("Shall I setup a new configuration?"),
- 			NULL);
- 
--		GtkWidget *mb;
- 		mb = gtk_message_dialog_new (NULL,
- 		         GTK_DIALOG_MODAL,
- 		         GTK_MESSAGE_ERROR,
-@@ -724,6 +724,8 @@
- 	memset(&reapchildren, 0, sizeof reapchildren);
- #endif /*  WNOHANG/SA_NOCLDWAIT */
- 
-+	{
-+	GnomeClient *client;
- 	static char *geometry_string = NULL;
- 	static const struct poptOption geo_options[] =
- 	{
-@@ -745,7 +747,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",
-@@ -806,6 +808,7 @@
- 
- 	scm_boot_guile (argc, argv, guile_inner_main, NULL);
- 	return 0; /* not reached !? */
-+	}
- }
- 
- /* ======================= END OF FILE =================== */
diff --git a/time/gnotime/patches/patch-ab b/time/gnotime/patches/patch-ab
index 50e55aea195..5d57146eec7 100644
--- a/time/gnotime/patches/patch-ab
+++ b/time/gnotime/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2004/10/23 13:54:46 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2008/10/28 23:38:33 wiz Exp $
 
---- gconf/Makefile.in.orig	2004-04-25 06:51:13.000000000 +0200
+--- gconf/Makefile.in.orig	2008-02-15 20:11:59.000000000 +0000
 +++ gconf/Makefile.in
-@@ -205,7 +205,7 @@ EXTRA_DIST = \
+@@ -259,7 +259,7 @@ top_srcdir = @top_srcdir@
+ EXTRA_DIST = \
  	gnotime.schemas.in
  
- 
 -schemasdir = $(sysconfdir)/gconf/schemas
-+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
++schemasdir = $(GCONF_SCHEMAS_DIR)
  schemas_in_files = gnotime.schemas.in
  schemas_DATA = gnotime.schemas
- subdir = gconf
+ all: all-am
diff --git a/time/gnotime/patches/patch-ac b/time/gnotime/patches/patch-ac
deleted file mode 100644
index e4c1ebe7053..00000000000
--- a/time/gnotime/patches/patch-ac
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- src/export.c.orig	Wed Nov 24 18:55:31 2004
-+++ src/export.c	Wed Nov 24 18:57:12 2004
-@@ -124,12 +124,14 @@
- export_really (GtkWidget *widget, export_format_t *xp)
- {
- 	gboolean rc;
-+	GnomeVFSURI *parsed_uri;
-+	gboolean exists;
-+	GnomeVFSResult result;
- 
- 	xp->uri = gtk_file_selection_get_filename (xp->picker);
- 
--	GnomeVFSURI *parsed_uri;
- 	parsed_uri = gnome_vfs_uri_new (xp->uri);
--	gboolean exists = gnome_vfs_uri_exists (parsed_uri);
-+	exists = gnome_vfs_uri_exists (parsed_uri);
- 	if (exists) 
- 	{
- 		GtkWidget *w;
-@@ -144,14 +146,14 @@
- 		if (0 == gnome_dialog_run (GNOME_DIALOG (w))) goto done;
- 	}
- 
--	GnomeVFSResult result;
- 	result = gnome_vfs_create (&xp->handle, xp->uri, GNOME_VFS_OPEN_WRITE,
- 	                 FALSE, 0644);
- 	if (GNOME_VFS_OK != result)
- 	{
- 		char *s;
-+		GtkWidget *w;
- 		s = g_strdup_printf (_("File %s dould not be opened"), xp->uri);
--		GtkWidget *w = gnome_error_dialog (s);
-+		w = gnome_error_dialog (s);
- 		gnome_dialog_set_parent (GNOME_DIALOG (w), GTK_WINDOW (xp->picker));
- 		g_free (s);
- 		goto done;
diff --git a/time/gnotime/patches/patch-ad b/time/gnotime/patches/patch-ad
deleted file mode 100644
index 82e82ddedda..00000000000
--- a/time/gnotime/patches/patch-ad
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- src/ghtml.c.orig	Wed Nov 24 18:57:51 2004
-+++ src/ghtml.c	Wed Nov 24 18:59:31 2004
-@@ -169,8 +169,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)))
-@@ -1255,6 +1256,8 @@
- 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))
- 	{
-@@ -1263,8 +1266,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;
-@@ -1281,8 +1284,9 @@
- 	/* no-op for now, just copy it into the window  */
- 	if (ghtml->write_stream)
- 	{
-+		size_t nr;
- 		(ghtml->write_stream) (ghtml, "<link", 5, ghtml->user_data);
--		size_t nr = strlen (str);
-+		nr = strlen (str);
- 		(ghtml->write_stream) (ghtml, str, nr, ghtml->user_data);
- 		(ghtml->write_stream) (ghtml, ">", 1, ghtml->user_data);
- 	}
-@@ -1297,6 +1301,8 @@
- 	GString *template;
- 	char *start, *end, *scmstart, *comstart, *linkstart;
- 	size_t nr;
-+	GnomeVFSResult    result;
-+	GnomeVFSHandle   *handle;
- 
- 	if (!ghtml) return;
- 	if (prj) ghtml->prj = prj;
-@@ -1311,8 +1317,6 @@
- 	}
- 
- 	/* Try to get the ghtml file ... */
--	GnomeVFSResult    result;
--	GnomeVFSHandle   *handle;
- 	result = gnome_vfs_open (&handle, filepath, GNOME_VFS_OPEN_READ);
- 	if ((GNOME_VFS_OK != result) && (0==ghtml->open_count))
- 	{
diff --git a/time/gnotime/patches/patch-ae b/time/gnotime/patches/patch-ae
deleted file mode 100644
index ef54ba978e6..00000000000
--- a/time/gnotime/patches/patch-ae
+++ /dev/null
@@ -1,226 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/03/16 12:48:49 rillig Exp $
-
---- src/journal.c.orig	Sat May  8 18:14:49 2004
-+++ src/journal.c	Wed Mar 16 11:03:07 2005
-@@ -197,11 +197,12 @@ remember_uri (Wiggy *wig, const char * f
- static void 
- save_to_gnomevfs (Wiggy *wig, const char * filename)
- {
--
-+	gboolean exists;
-+	GnomeVFSResult    result;
- 	/* Don't clobber the file, ask user for permission */
- 	GnomeVFSURI *parsed_uri;
- 	parsed_uri = gnome_vfs_uri_new  (filename);
--	gboolean exists = gnome_vfs_uri_exists (parsed_uri);
-+	exists = gnome_vfs_uri_exists (parsed_uri);
- 	gnome_vfs_uri_unref (parsed_uri);
- 	if (exists)
- 	{
-@@ -217,7 +218,6 @@ save_to_gnomevfs (Wiggy *wig, const char
- 	}
- 		
- 	/* Try to open the file for writing */
--	GnomeVFSResult    result;
- 	result = gnome_vfs_create (&wig->handle, filename, 
- 	                     GNOME_VFS_OPEN_WRITE, FALSE, 0644);
- 
-@@ -392,12 +392,14 @@ interval_move_up_clicked_cb(GtkWidget * 
- 	GttTask *tsk = gtt_interval_get_parent (wig->interval);
- 	GttProject *prj = gtt_task_get_parent (tsk);
- 	GList *tasks = gtt_project_get_tasks (prj);
-+	GList *this_task, *prev_task;
-+	GttTask *newtask;
- 	if (!tasks) return;
--	GList *this_task = g_list_find (tasks, tsk);
-+	this_task = g_list_find (tasks, tsk);
- 	if (!this_task) return;
--	GList *prev_task = this_task->prev;
--	if (!prev_task) return;
--	GttTask *newtask = prev_task->data;
-+	prev_task = this_task->prev;
-+	if (!prev_task) return; /* FIXME: Memory leak */
-+	newtask = prev_task->data;
- 	gtt_task_append_interval (newtask, wig->interval);
- }
- 
-@@ -408,12 +410,14 @@ interval_move_down_clicked_cb(GtkWidget 
- 	GttTask *tsk = gtt_interval_get_parent (wig->interval);
- 	GttProject *prj = gtt_task_get_parent (tsk);
- 	GList *tasks = gtt_project_get_tasks (prj);
-+	GList *this_task, *next_task;
-+	GttTask *newtask;
- 	if (!tasks) return;
--	GList *this_task = g_list_find (tasks, tsk);
-+	this_task = g_list_find (tasks, tsk);
- 	if (!this_task) return;
--	GList *next_task = this_task->next;
-+	next_task = this_task->next;
- 	if (!next_task) return;
--	GttTask *newtask = next_task->data;
-+	newtask = next_task->data;
- 	gtt_task_add_interval (newtask, wig->interval);
- }
- 
-@@ -461,6 +465,7 @@ interval_paste_memo_cb(GtkWidget * w, gp
- static void
- interval_popup_cb (Wiggy *wig)
- {
-+	GttTask *tsk;
- 	gtk_menu_popup(GTK_MENU(wig->interval_popup), 
- 		NULL, NULL, NULL, wig, 1, 0);
- 	if (cutted_task_list)
-@@ -494,7 +499,7 @@ interval_popup_cb (Wiggy *wig)
- 		gtk_widget_set_sensitive (wig->interval_move_down, FALSE);
- 	}
- 
--	GttTask *tsk = gtt_interval_get_parent(wig->interval);
-+	tsk = gtt_interval_get_parent(wig->interval);
- 	if (gtt_task_is_first_task (tsk))
- 	{
- 		gtk_widget_set_sensitive (wig->interval_move_up, FALSE);
-@@ -558,6 +563,7 @@ task_edit_task_clicked_cb(GtkWidget * w,
- static void
- task_delete_memo_clicked_cb(GtkWidget * w, gpointer data) 
- {
-+	GList * ctl;
- 	Wiggy *wig = (Wiggy *) data;
- 
- 	/* It is physically impossible to cut just the memo, without
-@@ -566,7 +572,7 @@ task_delete_memo_clicked_cb(GtkWidget * 
- 
- 	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;
- }
-@@ -747,10 +753,11 @@ on_save_clicked_cb (GtkWidget *w, gpoint
- static void 
- on_close_clicked_cb (GtkWidget *w, gpointer data)
- {
-+	GtkWidget *topper;
- 	Wiggy *wig = (Wiggy *) data;
- 
- 	if (NULL == wig->top) return;  /* avoid recursive double-free */
--	GtkWidget *topper = wig->top;   /* avoid recursion */
-+	topper = wig->top;   /* avoid recursion */
- 	wig->top = NULL;
- 	gtk_widget_destroy (topper);
- 
-@@ -836,19 +843,20 @@ static void
- html_url_requested_cb(GtkHTML *doc, const gchar * url, 
-                       GtkHTMLStream *handle, gpointer data) 
- {
-+	GnomeVFSResult    result;
-+	GnomeVFSHandle   *vfs;
-+#define BSZ 16000
-+	char buff[BSZ];
-+	GnomeVFSFileSize  bytes_read;
-+
- 	Wiggy *wig = data;
- 	const char * path = gtt_ghtml_resolve_path (url, wig->filepath);
- 	if (!path) return;
- 
--	GnomeVFSResult    result;
--	GnomeVFSHandle   *vfs;
- 	result = gnome_vfs_open (&vfs, path, GNOME_VFS_OPEN_READ);
- 
- 	if (GNOME_VFS_OK != result) return;
- 	
--#define BSZ 16000
--	char buff[BSZ];
--	GnomeVFSFileSize  bytes_read; 
- 	result = gnome_vfs_read (vfs, buff, BSZ, &bytes_read);
- 	while (GNOME_VFS_OK == result)
- 	{
-@@ -909,8 +917,10 @@ get_hover_msg (const gchar *url)
- 		return msg;
- 	}
- 
-+	{
- 	char * msg = _("Left-click to bring up menu");
- 	return g_strdup (msg);
-+	}
- }
- 
- static gint
-@@ -972,8 +982,13 @@ html_on_url_cb(GtkHTML *doc, const gchar
- 	/* Create and initialize the hover-help window */
- 	if (!wig->hover_help_window)
- 	{
-+		GtkWindow *wino;
-+		GtkWidget *frame;
-+		GtkWidget *align;
-+		GtkWidget *label;
-+		int px=0, py=0, rx=0, ry=0;
- 		wig->hover_help_window = gtk_window_new(GTK_WINDOW_POPUP);
--		GtkWindow *wino = GTK_WINDOW (wig->hover_help_window);
-+		wino = GTK_WINDOW (wig->hover_help_window);
- 		gtk_window_set_decorated (wino, FALSE);
- 		gtk_window_set_destroy_with_parent (wino, TRUE);
- 		gtk_window_set_transient_for (wino, GTK_WINDOW(wig->top));
-@@ -981,19 +996,19 @@ html_on_url_cb(GtkHTML *doc, const gchar
- 		gtk_window_set_resizable (wino, FALSE);  /* FALSE to enable auto-resize */
- 
- 		/* There must be a better way to draw a line around the box ?? */
--		GtkWidget *frame = gtk_frame_new (NULL);
-+		frame = gtk_frame_new (NULL);
- 		gtk_container_add(GTK_CONTAINER(wino), frame);
- 		gtk_container_set_resize_mode (GTK_CONTAINER(frame), GTK_RESIZE_PARENT);
- 		gtk_widget_show (frame);
- 
- 		/* There must be a better way to pad the text all around ?? */
--		GtkWidget *align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-+		align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
- 		// gtk_alignment_set_padding (GTK_ALIGNMENT(align), 6, 6, 6, 6);
- 		gtk_container_add(GTK_CONTAINER(frame), align);
- 		gtk_container_set_resize_mode (GTK_CONTAINER(align), GTK_RESIZE_PARENT);
- 		gtk_widget_show (align);
- 		
--		GtkWidget *label = gtk_label_new ("xxx");
-+		label = gtk_label_new ("xxx");
- 		wig->hover_label = GTK_LABEL (label);
- 		gtk_container_add(GTK_CONTAINER(align), label);
- 		gtk_widget_show (label);
-@@ -1002,7 +1017,6 @@ html_on_url_cb(GtkHTML *doc, const gchar
- 		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 (wino, rx+px, ry+py);
-@@ -1053,25 +1067,28 @@ static GList *
- perform_form_query (KvpFrame *kvpf)
- {
- 	GList *results, *n;
-+	char *user_debug;
-+	QofSqlQuery *q;
-+	char *query_string;
- 
- 	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/time/gnotime/patches/patch-af b/time/gnotime/patches/patch-af
deleted file mode 100644
index 508475a0b6d..00000000000
--- a/time/gnotime/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- src/log.c.orig	Wed Nov 24 22:27:06 2004
-+++ src/log.c	Wed Nov 24 22:28:10 2004
-@@ -37,6 +37,8 @@
- 	char *filename;
- 	GnomeVFSHandle   *handle;
- 	GnomeVFSResult    result;
-+	int rc;
-+	GnomeVFSFileSize bytes_written;
- 
- 	g_return_val_if_fail (logstr != NULL, FALSE);
- 
-@@ -67,12 +69,11 @@
- 		t = time(NULL);
- 
- 	/* Translators: Format to use in the gnotime logfile */
--	int rc = strftime (date, sizeof (date), _("%b %d %H:%M:%S"), localtime(&t));
-+	rc = strftime (date, sizeof (date), _("%b %d %H:%M:%S"), localtime(&t));
- 	if (0 >= rc) strcpy (date, "???");
- 
- 	/* Append to end of file */
- 	gnome_vfs_seek (handle, GNOME_VFS_SEEK_END, 0);
--	GnomeVFSFileSize bytes_written;
- 	gnome_vfs_write (handle, date, strlen(date), &bytes_written);
- 	gnome_vfs_write (handle, logstr, strlen(logstr), &bytes_written);
- 	gnome_vfs_write (handle, "\n", 1, &bytes_written);
diff --git a/time/gnotime/patches/patch-ag b/time/gnotime/patches/patch-ag
deleted file mode 100644
index 9f84505eb73..00000000000
--- a/time/gnotime/patches/patch-ag
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- src/menucmd.c.orig	Wed Nov 24 22:31:41 2004
-+++ src/menucmd.c	Wed Nov 24 22:33:52 2004
-@@ -343,6 +343,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. 
-@@ -364,7 +365,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 */
-@@ -424,6 +425,7 @@
- copy_project(GtkWidget *w, gpointer data)
- {
- 	GttProject *prj;
-+	GList *n;
- 	prj = ctree_get_focus_project (global_ptw);
- 
- 	if (!prj) return;
-@@ -434,7 +436,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;
-@@ -519,12 +521,12 @@
- menu_howto_edit_times (GtkWidget *w,gpointer data)
- {
- 	char * msg;
-+	GtkWidget *mb;
- 
- 	msg = _("To edit the timer interval for this project,\n"
- 	        "open the Journal window and click on a link.\n"
- 	        "This will bring up a menu of time editing options.\n");
- 
--	GtkWidget *mb;
- 	mb = gtk_message_dialog_new (NULL,
- 	         GTK_DIALOG_MODAL,
- 	         GTK_MESSAGE_INFO,
diff --git a/time/gnotime/patches/patch-ah b/time/gnotime/patches/patch-ah
deleted file mode 100644
index 1b3236cb66f..00000000000
--- a/time/gnotime/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- src/plug-in.c.orig	Wed Nov 24 22:34:26 2004
-+++ src/plug-in.c	Wed Nov 24 22:35:31 2004
-@@ -96,6 +96,8 @@
- {
- 	const char *title, *path, *tip;
- 	NewPluginDialog *dlg = data;
-+	GnomeVFSURI *parsed_uri;
-+	gboolean exists;
- 
- 	/* Get the dialog contents */
- 	title = gtk_entry_get_text (dlg->plugin_name);
-@@ -103,9 +105,8 @@
- 	tip = gtk_entry_get_text (dlg->plugin_tooltip);
- 
- 	/* Do a basic sanity check */
--	GnomeVFSURI *parsed_uri;
- 	parsed_uri = gnome_vfs_uri_new (path);
--	gboolean exists = gnome_vfs_uri_exists (parsed_uri);
-+	exists = gnome_vfs_uri_exists (parsed_uri);
- 	gnome_vfs_uri_unref (parsed_uri);
- 	if (!exists)
- 	{
diff --git a/time/gnotime/patches/patch-ai b/time/gnotime/patches/patch-ai
deleted file mode 100644
index a2ad924750f..00000000000
--- a/time/gnotime/patches/patch-ai
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- src/prefs.c.orig	Wed Nov 24 22:35:57 2004
-+++ src/prefs.c	Wed Nov 24 22:40:01 2004
-@@ -199,11 +199,12 @@
- static int
- scan_time_string (const char *str)
- {
-+	char * p;
- 	int hours=0, minutes=0, seconds = 0;
- 	char buff[24];
- 	strncpy (buff, str, 24);
- 	buff[23]=0;
--	char * p = strchr (buff, ':');
-+	p = strchr (buff, ':');
- 	if (p) *p = 0;
- 	hours = atoi (buff);
- 	if (p)
-@@ -221,9 +222,11 @@
- 	minutes %= 60;
- 	hours %= 24;
- 
-+	{
- 	int totalsecs = hours*3600 + minutes*60 + seconds;
- 	if (12*3600 < totalsecs) totalsecs -= 24*3600;
- 	return totalsecs;
-+	}
- }
- 
- /* ============================================================== */
-@@ -372,15 +375,17 @@
- 
- 	if (5 == page)
- 	{
-+		int off, day;
-+		const char * buff;
- 		int change = 0;
- 		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)
-@@ -420,6 +425,8 @@
- static void 
- options_dialog_set(PrefsDialog *odlg)
- {
-+	int hour, day, secs;
-+	char buff[24];
- 	char s[30];
- 
- 	SET_ACTIVE(secs);
-@@ -495,7 +502,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 +516,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 */
-@@ -529,14 +534,15 @@
- static void 
- daystart_menu_changed (gpointer data, GtkOptionMenu *w)
- {
-+	int secs;
-+	char buff[24];
- 	PrefsDialog *dlg = data;
- 
- 	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/time/gnotime/patches/patch-aj b/time/gnotime/patches/patch-aj
deleted file mode 100644
index 358db864e83..00000000000
--- a/time/gnotime/patches/patch-aj
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2005/03/16 12:48:49 rillig Exp $
-
---- src/proj.c.orig	Sat May 22 16:27:59 2004
-+++ src/proj.c	Wed Mar 16 11:12:06 2005
-@@ -1948,8 +1948,6 @@ prj_obj_get_latest (GttProject *prj)
- gboolean 
- gtt_project_obj_register (void)
- {
--	global_book = qof_book_new();
--
- /* Associate an ASCII name to each getter, as well as the return type */
- static QofParam params[] = {
- 		{ GTT_PROJECT_EARLIEST, QOF_TYPE_DATE, (QofAccessFunc)prj_obj_get_earliest, NULL},
-@@ -1957,6 +1955,8 @@ static QofParam params[] = {
- 		{ NULL },
- 	};
- 
-+	global_book = qof_book_new();
-+
- 	qof_class_register (GTT_PROJECT_ID, (QofSortFunc)prj_obj_order, params);
- 	return qof_object_register (&prj_object_def);
- }
-@@ -2290,9 +2290,10 @@ gtt_task_is_first_task (GttTask *tsk)
- gboolean
- gtt_task_is_last_task (GttTask *tsk)
- {
-+	GList *last;
- 	if (!tsk || !tsk->parent || !tsk->parent->task_list) return TRUE;
- 	
--	GList *last = g_list_last (tsk->parent->task_list);
-+	last = g_list_last (tsk->parent->task_list);
- 	if ((GttTask *) last->data == tsk) return TRUE;
- 	return FALSE;
- }
-@@ -2354,10 +2355,10 @@ time_t
- gtt_task_get_secs_earliest (GttTask *tsk)
- {
- 	GList *node;
--	if (NULL == tsk->interval_list) return 0;
--
- 	time_t earliest = INT_MAX;
- 
-+	if (NULL == tsk->interval_list) return 0;
-+
- 	for (node=tsk->interval_list; node; node=node->next)
- 	{
- 		GttInterval * ivl = node->data;
-@@ -2370,9 +2371,8 @@ time_t
- gtt_task_get_secs_latest (GttTask *tsk)
- {
- 	GList *node;
--	if (NULL == tsk->interval_list) return 0;
--
- 	time_t latest = INT_MIN;
-+	if (NULL == tsk->interval_list) return 0;
- 
- 	for (node=tsk->interval_list; node; node=node->next)
- 	{
diff --git a/time/gnotime/patches/patch-ak b/time/gnotime/patches/patch-ak
deleted file mode 100644
index a5d8dbdf5f2..00000000000
--- a/time/gnotime/patches/patch-ak
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- src/query.c.orig	Wed Nov 24 22:41:39 2004
-+++ src/query.c	Wed Nov 24 22:41: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 ++;
diff --git a/time/gnotime/patches/patch-al b/time/gnotime/patches/patch-al
deleted file mode 100644
index 51f60adff65..00000000000
--- a/time/gnotime/patches/patch-al
+++ /dev/null
@@ -1,145 +0,0 @@
-$NetBSD: patch-al,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- lib/qof/qofgobj.c.orig	Wed Nov 24 18:04:20 2004
-+++ lib/qof/qofgobj.c	Wed Nov 24 18:11:07 2004
-@@ -57,10 +57,10 @@
- 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 +83,13 @@
- 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);
- }
-@@ -106,41 +108,45 @@
-    * mapping below ... */
-   if (G_IS_PARAM_SPEC_STRING(gps))
-   {
-+    const char * str;
-     GValue gval = {G_TYPE_INVALID};
-     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 +167,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;
-   } 
- 
-@@ -204,17 +212,17 @@
- void
- qof_gobject_register (QofType e_type, GObjectClass *obclass)
- {
--
-+  int i, j=0;
-+  QofParam *qof_param_list;
-   /* Get the GObject properties, convert to QOF properties */
-   GParamSpec **prop_list;
-   int n_props;
-   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,6 +296,7 @@
- 
-   /* ------------------------------------------------------ */
-    /* Now do the class itself */
-+  {
-   QofObject *class_def = g_new0 (QofObject, 1);
-   classList = g_slist_prepend (classList, class_def);
- 
-@@ -304,6 +313,7 @@
-   class_def->printable = NULL;
-  
-   qof_object_register (class_def);
-+  }
- }
- 
- /* ======================= END OF FILE ================================ */
diff --git a/time/gnotime/patches/patch-am b/time/gnotime/patches/patch-am
deleted file mode 100644
index 52e3052278a..00000000000
--- a/time/gnotime/patches/patch-am
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-am,v 1.4 2006/04/04 15:32:22 jmmv Exp $
-
---- configure.orig	2004-05-23 22:09:39.000000000 +0200
-+++ configure
-@@ -12520,23 +12520,23 @@ fi
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED" >&5
--echo $ECHO_N "checking for libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED... $ECHO_C" >&6
-+        echo "$as_me:$LINENO: checking for libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED" >&5
-+echo $ECHO_N "checking for libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED... $ECHO_C" >&6
- 
--        if $PKG_CONFIG --exists "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED" ; then
-+        if $PKG_CONFIG --exists "libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED" ; then
-             echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-             succeeded=yes
- 
-             echo "$as_me:$LINENO: checking LIBGTKHTML_CFLAGS" >&5
- echo $ECHO_N "checking LIBGTKHTML_CFLAGS... $ECHO_C" >&6
--            LIBGTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"`
-+            LIBGTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED"`
-             echo "$as_me:$LINENO: result: $LIBGTKHTML_CFLAGS" >&5
- echo "${ECHO_T}$LIBGTKHTML_CFLAGS" >&6
- 
-             echo "$as_me:$LINENO: checking LIBGTKHTML_LIBS" >&5
- echo $ECHO_N "checking LIBGTKHTML_LIBS... $ECHO_C" >&6
--            LIBGTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"`
-+            LIBGTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED"`
-             echo "$as_me:$LINENO: result: $LIBGTKHTML_LIBS" >&5
- echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6
-         else
-@@ -12544,7 +12544,7 @@ echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6
-             LIBGTKHTML_LIBS=""
-             ## If we have a custom action on failure, don't print errors, but
-             ## do set a variable so people can do so.
--            LIBGTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"`
-+            LIBGTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED"`
-             echo $LIBGTKHTML_PKG_ERRORS
-         fi
- 
-@@ -12559,8 +12559,8 @@ echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6
-   if test $succeeded = yes; then
-      :
-   else
--     { { echo "$as_me:$LINENO: error: Library requirements (libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
--echo "$as_me: error: Library requirements (libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-+     { { echo "$as_me:$LINENO: error: Library requirements (libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-+echo "$as_me: error: Library requirements (libgtkhtml-3.8 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
diff --git a/time/gnotime/patches/patch-an b/time/gnotime/patches/patch-an
deleted file mode 100644
index 485008267c3..00000000000
--- a/time/gnotime/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/11/24 22:35:25 kristerw Exp $
-
---- src/app.c.orig	Wed Nov 24 23:13:21 2004
-+++ src/app.c	Wed Nov 24 23:13:49 2004
-@@ -26,6 +26,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <pthread.h>
- 
- #include <qof/gnc-date.h>
- 
diff --git a/time/gnotime/patches/patch-ao b/time/gnotime/patches/patch-ao
deleted file mode 100644
index ee5636b0f08..00000000000
--- a/time/gnotime/patches/patch-ao
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/03/16 12:48:49 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- lib/qof/qofid.c.orig	Sun May 23 22:57:30 2004
-+++ lib/qof/qofid.c	Wed Mar 16 09:26:50 2005
-@@ -182,8 +182,9 @@ qof_collection_get_type (QofCollection *
- static void
- qof_collection_remove_entity (QofEntity *ent)
- {
-+  QofCollection *col;
-   if (!ent) return;
--  QofCollection *col = ent->collection;
-+  col = ent->collection;
-   if (!col) return;
-   g_hash_table_remove (col->hash_of_entities, &ent->guid);
-   ent->collection = NULL;
diff --git a/time/gnotime/patches/patch-ap b/time/gnotime/patches/patch-ap
deleted file mode 100644
index e6579efa12d..00000000000
--- a/time/gnotime/patches/patch-ap
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2005/03/16 12:48:49 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- lib/qof/qofquery.c.orig	Sun May 23 22:57:30 2004
-+++ lib/qof/qofquery.c	Wed Mar 16 09:28:08 2005
-@@ -1216,13 +1216,14 @@ void qof_query_add_guid_match (QofQuery 
- 
- void qof_query_set_book (QofQuery *q, QofBook *book)
- {
-+  GSList *slist;
-   if (!q || !book) return;
- 
-   /* Make sure this book is only in the list once */
-   if (g_list_index (q->books, book) == -1)
-     q->books = g_list_prepend (q->books, book);
- 
--  GSList *slist = NULL;
-+  slist = NULL;
-   g_slist_prepend (slist, QOF_PARAM_GUID);
-   g_slist_prepend (slist, QOF_PARAM_BOOK);
-   qof_query_add_guid_match (q, slist,
diff --git a/time/gnotime/patches/patch-aq b/time/gnotime/patches/patch-aq
deleted file mode 100644
index 0c3c23c4846..00000000000
--- a/time/gnotime/patches/patch-aq
+++ /dev/null
@@ -1,158 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2005/03/16 12:48:49 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- lib/qof/qofquery-deserial.c.orig	Sun May 23 22:57:30 2004
-+++ lib/qof/qofquery-deserial.c	Wed Mar 16 09:43:29 2005
-@@ -184,6 +184,7 @@ SUBRNAME (xmlNodePtr root)              
- {                                                               \
- 	xmlNodePtr xp = root->xmlChildrenNode;                       \
- 	xmlNodePtr node;                                             \
-+	QofQueryPredData *pred;					\
-                                                                 \
- 	QofQueryCompare how = QOF_COMPARE_EQUAL;                     \
- 	CTYPE val = 0;                                               \
-@@ -197,7 +198,6 @@ SUBRNAME (xmlNodePtr root)              
- 		{}                                                        \
- 	}                                                            \
-                                                                 \
--	QofQueryPredData *pred;                                      \
- 	pred = PRED (how, val);                                      \
- 	return pred;                                                 \
- }
-@@ -251,6 +251,7 @@ qof_query_pred_kvp_from_xml (xmlNodePtr 
- 	QofQueryCompare how = QOF_COMPARE_EQUAL;
- 	GSList *path = NULL;
- 	KvpValue *value = NULL;
-+	QofQueryPredData *pred;
- 
- 	for (node=xp; node; node = node->next)
- 	{
-@@ -271,7 +272,6 @@ qof_query_pred_kvp_from_xml (xmlNodePtr 
- 		GET_DATE(&value,    wrap_new_timespec, "qofquery:date");
- 	}
- 
--	QofQueryPredData *pred;
- 	pred = qof_query_kvp_predicate (how, path, value);
- 	g_slist_free (path);
- 	return pred;
-@@ -287,6 +287,8 @@ qof_query_pred_guid_from_xml (xmlNodePtr
-    GList *guid_list = NULL;
- 
- 	QofGuidMatch sm = QOF_GUID_MATCH_ANY;
-+	QofQueryPredData *pred;
-+   GList *n;
- 
- 	for (node=xp; node; node = node->next)
- 	{
-@@ -313,11 +315,9 @@ qof_query_pred_guid_from_xml (xmlNodePtr
- 		}
- 	}
- 
--	QofQueryPredData *pred;
- 	pred = qof_query_guid_predicate (sm, guid_list);
- 
- 	/* The predicate made a copy of everything, so free our stuff */
--   GList *n;
- 	for (n=guid_list; n; n=n->next)
- 	{
- 		guid_free (n->data);
-@@ -336,6 +336,7 @@ qof_query_pred_char_from_xml (xmlNodePtr
- 
- 	QofCharMatch sm = QOF_CHAR_MATCH_ANY;
-    const char * char_list = NULL;
-+	QofQueryPredData *pred;
- 
- 	for (node=xp; node; node = node->next)
- 	{
-@@ -348,7 +349,6 @@ qof_query_pred_char_from_xml (xmlNodePtr
- 		{}
- 	}
- 
--	QofQueryPredData *pred;
- 	pred = qof_query_char_predicate (sm, char_list);
- 	return pred;
- }
-@@ -364,6 +364,7 @@ qof_query_pred_numeric_from_xml (xmlNode
- 	QofQueryCompare how = QOF_COMPARE_EQUAL;
- 	QofNumericMatch sm = QOF_NUMERIC_MATCH_ANY;
-    gnc_numeric num;
-+	QofQueryPredData *pred;
- 
- 	for (node=xp; node; node = node->next)
- 	{
-@@ -376,7 +377,6 @@ qof_query_pred_numeric_from_xml (xmlNode
- 		{}
- 	}
- 
--	QofQueryPredData *pred;
- 	pred = qof_query_numeric_predicate (how, sm, num);
- 	return pred;
- }
-@@ -392,6 +392,7 @@ qof_query_pred_date_from_xml (xmlNodePtr
- 	QofQueryCompare how = QOF_COMPARE_EQUAL;
- 	QofDateMatch sm = QOF_DATE_MATCH_ROUNDED;
- 	Timespec date = {0,0};
-+	QofQueryPredData *pred;
- 
- 	for (node=xp; node; node = node->next)
- 	{
-@@ -404,7 +405,6 @@ qof_query_pred_date_from_xml (xmlNodePtr
- 		{}
- 	}
- 
--	QofQueryPredData *pred;
- 	pred = qof_query_date_predicate (how, sm, date);
- 	return pred;
- }
-@@ -421,6 +421,7 @@ qof_query_pred_string_from_xml (xmlNodeP
- 	QofStringMatch sm = QOF_STRING_MATCH_CASEINSENSITIVE;
- 	gboolean is_regex = FALSE;
- 	const char *pstr = NULL;
-+	QofQueryPredData *pred;
- 
- 	for (node=xp; node; node = node->next)
- 	{
-@@ -434,7 +435,6 @@ qof_query_pred_string_from_xml (xmlNodeP
- 		{}
- 	}
- 
--	QofQueryPredData *pred;
- 	pred = qof_query_string_predicate (how, pstr, sm , is_regex);
- 	return pred;
- }
-@@ -476,8 +476,9 @@ qof_query_term_from_xml (QofQuery *q, xm
- 		if (0 == strcmp (node->name, "qofquery:invert"))
- 		{
- 			QofQuery *qt = qof_query_create();
-+			QofQuery *qinv;
- 			qof_query_term_from_xml (qt, node);
--			QofQuery *qinv = qof_query_invert (qt);
-+			qinv = qof_query_invert (qt);
- 			qof_query_merge_in_place (q, qinv, QOF_QUERY_AND);
- 			qof_query_destroy (qinv);
- 			qof_query_destroy (qt);
-@@ -594,10 +595,12 @@ QofQuery *
- qof_query_from_xml (xmlNodePtr root)
- {
- 	QofQuery *q;
-+	xmlChar *version;
-+	xmlNodePtr qpart, node;
- 
- 	if (!root) return NULL;
- 
--	xmlChar * version = xmlGetProp(root, "version");
-+	version = xmlGetProp(root, "version");
-    if (!root->name || strcmp ("qof:qofquery", root->name))
-    {
- 		// XXX something is wrong. warn ... 
-@@ -606,8 +609,7 @@ qof_query_from_xml (xmlNodePtr root)
- 
- 	q = qof_query_create ();
- 
--	xmlNodePtr qpart = root->xmlChildrenNode;
--	xmlNodePtr node;
-+	qpart = root->xmlChildrenNode;
- 	for (node=qpart; node; node = node->next)
- 	{
- 		if (node->type != XML_ELEMENT_NODE) continue;
diff --git a/time/gnotime/patches/patch-ar b/time/gnotime/patches/patch-ar
deleted file mode 100644
index 2715f092619..00000000000
--- a/time/gnotime/patches/patch-ar
+++ /dev/null
@@ -1,209 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2005/03/16 12:48:49 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- lib/qof/qofquery-serialize.c.orig	Sun May 23 22:57:30 2004
-+++ lib/qof/qofquery-serialize.c	Wed Mar 16 09:59:34 2005
-@@ -228,9 +228,10 @@ qof_query_pred_data_to_xml (QofQueryPred
- 	if (!safe_strcmp (pd->type_name, QOF_TYPE_STRING))
- 	{
- 		xmlNodePtr topnode = xmlNewNode (NULL, "qofquery:pred-string");
-+		query_string_t pdata;
- 		PUT_HOW ("qofquery:compare", pd->how, LT, LTE, EQUAL, GT, GTE, NEQ);
- 
--		query_string_t pdata = (query_string_t) pd;
-+		pdata = (query_string_t) pd;
- 		PUT_MATCH2("qofquery:string-match", pdata->options,
-                        STRING_MATCH, NORMAL, CASEINSENSITIVE);
- 		PUT_BOOL ("qofquery:is-regex", pdata->is_regex);
-@@ -240,9 +241,10 @@ qof_query_pred_data_to_xml (QofQueryPred
- 	if (!safe_strcmp (pd->type_name, QOF_TYPE_NUMERIC))
- 	{
- 		xmlNodePtr topnode = xmlNewNode (NULL, "qofquery:pred-numeric");
-+		query_numeric_t pdata;
- 		PUT_HOW ("qofquery:compare", pd->how, LT, LTE, EQUAL, GT, GTE, NEQ);
- 
--		query_numeric_t pdata = (query_numeric_t) pd;
-+		pdata = (query_numeric_t) pd;
- 		PUT_MATCH3("qofquery:numeric-match", pdata->options,
- 		                 NUMERIC_MATCH, DEBIT, CREDIT, ANY);
- 		
-@@ -252,11 +254,12 @@ qof_query_pred_data_to_xml (QofQueryPred
- 	if (!safe_strcmp (pd->type_name, QOF_TYPE_KVP))
- 	{
- 		xmlNodePtr topnode = xmlNewNode (NULL, "qofquery:pred-kvp");
-+		query_kvp_t pdata;
-+		GSList *n;
- 		PUT_HOW ("qofquery:compare", pd->how, LT, LTE, EQUAL, GT, GTE, NEQ);
- 
--		query_kvp_t pdata = (query_kvp_t) pd;
-+		pdata = (query_kvp_t) pd;
- 		
--		GSList *n;
- 		for (n=pdata->path; n; n=n->next)
- 		{
- 			PUT_STR ("qofquery:kvp-path", n->data);
-@@ -267,9 +270,10 @@ qof_query_pred_data_to_xml (QofQueryPred
- 	if (!safe_strcmp (pd->type_name, QOF_TYPE_DATE))
- 	{
- 		xmlNodePtr topnode = xmlNewNode (NULL, "qofquery:pred-date");
-+		query_date_t pdata;
- 		PUT_HOW ("qofquery:compare", pd->how, LT, LTE, EQUAL, GT, GTE, NEQ);
- 
--		query_date_t pdata = (query_date_t) pd;
-+		pdata = (query_date_t) pd;
- 		
- 		PUT_MATCH2("qofquery:date-match", pdata->options,
- 		                 DATE_MATCH, NORMAL, ROUNDED);
-@@ -280,18 +284,20 @@ qof_query_pred_data_to_xml (QofQueryPred
- 	if (!safe_strcmp (pd->type_name, QOF_TYPE_INT64))
- 	{
- 		xmlNodePtr topnode = xmlNewNode (NULL, "qofquery:pred-int64");
-+		query_int64_t pdata;
- 		PUT_HOW ("qofquery:compare", pd->how, LT, LTE, EQUAL, GT, GTE, NEQ);
- 
--		query_int64_t pdata = (query_int64_t) pd;
-+		pdata = (query_int64_t) pd;
- 		PUT_INT64 ("qofquery:int64", pdata->val);
- 		return topnode;
- 	}
- 	if (!safe_strcmp (pd->type_name, QOF_TYPE_INT32))
- 	{
- 		xmlNodePtr topnode = xmlNewNode (NULL, "qofquery:pred-int32");
-+		query_int32_t pdata;
- 		PUT_HOW ("qofquery:compare", pd->how, LT, LTE, EQUAL, GT, GTE, NEQ);
- 
--		query_int32_t pdata = (query_int32_t) pd;
-+		pdata = (query_int32_t) pd;
- 		
- 		PUT_INT32 ("qofquery:int32", pdata->val);
- 		return topnode;
-@@ -299,9 +305,10 @@ qof_query_pred_data_to_xml (QofQueryPred
- 	if (!safe_strcmp (pd->type_name, QOF_TYPE_DOUBLE))
- 	{
- 		xmlNodePtr topnode = xmlNewNode (NULL, "qofquery:pred-double");
-+		query_double_t pdata;
- 		PUT_HOW ("qofquery:compare", pd->how, LT, LTE, EQUAL, GT, GTE, NEQ);
- 
--		query_double_t pdata = (query_double_t) pd;
-+		pdata = (query_double_t) pd;
- 		
- 		PUT_DBL ("qofquery:double", pdata->val);
- 		return topnode;
-@@ -309,9 +316,10 @@ qof_query_pred_data_to_xml (QofQueryPred
- 	if (!safe_strcmp (pd->type_name, QOF_TYPE_BOOLEAN))
- 	{
- 		xmlNodePtr topnode = xmlNewNode (NULL, "qofquery:pred-boolean");
-+		query_boolean_t pdata;
- 		PUT_HOW ("qofquery:compare", pd->how, LT, LTE, EQUAL, GT, GTE, NEQ);
- 
--		query_boolean_t pdata = (query_boolean_t) pd;
-+		pdata = (query_boolean_t) pd;
- 		
- 		PUT_BOOL ("qofquery:boolean", pdata->val);
- 		return topnode;
-@@ -386,9 +394,10 @@ qof_query_and_terms_to_xml (GList *and_t
- 	for ( ; n; n=n->next)
- 	{
- 		QofQueryTerm *qt = n->data;
-+		xmlNodePtr t;
- 		if (!qt) continue;
- 
--		xmlNodePtr t = qof_query_one_term_to_xml (n->data);
-+		t = qof_query_one_term_to_xml (n->data);
- 		if (t) xmlAddChild (terms, t);
- 	}
- 	return terms;
-@@ -419,31 +428,37 @@ static xmlNodePtr
- qof_query_sorts_to_xml (QofQuery *q)
- {
- 	QofQuerySort *s[3];
-+	xmlNodePtr sortlist;
-+	int i;
- 	qof_query_get_sorts (q, &s[0], &s[1], &s[2]);
- 
- 	if (NULL == s[0]) return NULL;
- 
--	xmlNodePtr sortlist = xmlNewNode (NULL, "qofquery:sort-list");
--	int i;
-+	sortlist = xmlNewNode (NULL, "qofquery:sort-list");
- 	for (i=0; i<3; i++)
- 	{
-+		GSList *plist;
-+		xmlNodePtr sort, topnode, pl;
-+		gboolean increasing;
-+		gint opt;
-+		
- 		if (NULL == s[i]) continue;
- 
--		GSList *plist = qof_query_sort_get_param_path (s[i]);
-+		plist = qof_query_sort_get_param_path (s[i]);
- 		if (!plist) continue;
- 
--		xmlNodePtr sort = xmlNewNode (NULL, "qofquery:sort");
-+		sort = xmlNewNode (NULL, "qofquery:sort");
- 		xmlAddChild (sortlist, sort);
- 
--		xmlNodePtr topnode = sort;
-+		topnode = sort;
- 
--		gboolean increasing = qof_query_sort_get_increasing (s[i]);
-+		increasing = qof_query_sort_get_increasing (s[i]);
- 		PUT_STR ("qofquery:order", increasing ? "DESCENDING" : "ASCENDING");
- 
--		gint opt = qof_query_sort_get_sort_options (s[i]);
-+		opt = qof_query_sort_get_sort_options (s[i]);
- 		PUT_INT32 ("qofquery:options", opt);
- 
--		xmlNodePtr pl = qof_query_param_path_to_xml (plist);
-+		pl = qof_query_param_path_to_xml (plist);
- 		if (pl) xmlAddChild (sort, pl);
- 	}
- 
-@@ -456,15 +471,17 @@ static void
- do_qof_query_to_xml (QofQuery *q, xmlNodePtr topnode)
- {
- 	QofIdType search_for = qof_query_get_search_for (q);
-+	xmlNodePtr terms, sorts;
-+	gint max_results;
- 	PUT_STR ("qofquery:search-for", search_for);
- 
--	xmlNodePtr terms = qof_query_terms_to_xml(q);
-+	terms = qof_query_terms_to_xml(q);
- 	if (terms) xmlAddChild (topnode, terms);
- 
--	xmlNodePtr sorts = qof_query_sorts_to_xml (q);
-+	sorts = qof_query_sorts_to_xml (q);
- 	if (sorts) xmlAddChild (topnode, sorts);
- 
--	gint max_results = qof_query_get_max_results (q);
-+	max_results = qof_query_get_max_results (q);
- 	PUT_INT32 ("qofquery:max-results", max_results);
- }
- 
-@@ -499,6 +516,10 @@ int main (int argc, char * argv[])
- {
- 	QofQuery *q;
- 	QofSqlQuery *sq;
-+	xmlDocPtr doc;
-+	xmlNodePtr topnode;
-+	xmlChar *xbuf;
-+	int bufsz;
- 
- 	qof_query_init();
- 	qof_object_initialize ();
-@@ -523,12 +544,10 @@ int main (int argc, char * argv[])
- 
- 	qof_query_print (q);
- 
--	xmlDocPtr doc = doc = xmlNewDoc("1.0");
--	xmlNodePtr topnode = qof_query_to_xml (q);
-+	doc = doc = xmlNewDoc("1.0");
-+	topnode = qof_query_to_xml (q);
- 	xmlDocSetRootElement(doc,topnode);
- 
--	xmlChar *xbuf;
--	int bufsz;
- 	xmlDocDumpFormatMemory (doc, &xbuf, &bufsz, 1);
- 
- 	printf ("%s\n", xbuf);
diff --git a/time/gnotime/patches/patch-as b/time/gnotime/patches/patch-as
deleted file mode 100644
index f1fc6fafe4f..00000000000
--- a/time/gnotime/patches/patch-as
+++ /dev/null
@@ -1,314 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/03/16 12:48:49 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- lib/qof/qofsql.c.orig	Sun May 23 22:58:28 2004
-+++ lib/qof/qofsql.c	Wed Mar 16 10:21:03 2005
-@@ -134,8 +134,7 @@ dequote_string (char *str)
- 	    ('\"' == str[0]))
- 	{
- 		str ++;
--		size_t len = strlen(str);
--		str[len-1] = 0;
-+		str[strlen(str)-1] = 0;
- 	}
- 	return str;
- }
-@@ -145,7 +144,14 @@ handle_single_condition (QofSqlQuery *qu
- {
- 	char tmpbuff[128];
- 	GSList *param_list;
-+	QofQuery *qq;
- 	QofQueryPredData *pred_data = NULL;
-+	sql_field_item *sparam, *svalue;
-+	char *qparam_name, *qvalue_name;
-+	char *table_name;
-+	char *param_name;
-+	QofType param_type;
-+	QofQueryCompare qop;
- 	
- 	if (NULL == cond)
- 	{
-@@ -161,14 +167,14 @@ handle_single_condition (QofSqlQuery *qu
- 		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");
-@@ -183,13 +189,13 @@ handle_single_condition (QofSqlQuery *qu
- 		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");
-@@ -202,16 +208,18 @@ handle_single_condition (QofSqlQuery *qu
- 	 * 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;
-@@ -251,7 +259,6 @@ handle_single_condition (QofSqlQuery *qu
- 	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;
-@@ -270,8 +277,6 @@ handle_single_condition (QofSqlQuery *qu
- 	/* 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)
- 	{
-@@ -290,7 +295,7 @@ handle_single_condition (QofSqlQuery *qu
- 		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) 
- 	{
- 		PWARN ("The parameter \'%s\' on object \'%s\' is not known", 
-@@ -334,19 +339,20 @@ handle_single_condition (QofSqlQuery *qu
- 	}
- 	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);
-+		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);
-@@ -367,6 +373,8 @@ handle_single_condition (QofSqlQuery *qu
- 	else if (!strcmp (param_type, QOF_TYPE_GUID))
- 	{
- 		GUID guid;
-+		QofGuidMatch gm;
-+		GList *guid_list;
- 		gboolean rc = string_to_guid (qvalue_name, &guid);
- 		if (0 == rc)
- 		{
-@@ -377,9 +385,9 @@ handle_single_condition (QofSqlQuery *qu
- 		// XXX less, than greater than don't make sense,
- 		// should check for those bad conditions
- 
--		QofGuidMatch gm = QOF_GUID_MATCH_ANY;
-+		gm = QOF_GUID_MATCH_ANY;
- 		if (QOF_COMPARE_NEQ == qop) gm = QOF_GUID_MATCH_NONE;
--		GList *guid_list = g_list_append (NULL, &guid);
-+		guid_list = g_list_append (NULL, &guid);
- 		pred_data = qof_query_guid_predicate (gm, guid_list);
- 
- 		g_list_free (guid_list);
-@@ -389,12 +397,14 @@ handle_single_condition (QofSqlQuery *qu
- 		/* We are expecting an encoded value that looks like
- 		 * /some/path/string:value
- 		 */
--		char *sep = strchr (qvalue_name, ':');
-+		char *path, *str, *p, *sep;
-+		KvpValue *kval;
-+		int len;
-+		sep = strchr (qvalue_name, ':');
- 		if (!sep) return NULL;
- 		*sep = 0;
--		char * path = qvalue_name;
--		char * str = sep +1;
--		char * p;
-+		path = qvalue_name;
-+		str = sep +1;
- 		/* If str has only digits, we know its a plain number.
- 		 * If its numbers and a decimal point, assume a float
- 		 * If its numbers and a slash, assume numeric
-@@ -402,8 +412,8 @@ handle_single_condition (QofSqlQuery *qu
- 		 * If it looks like an iso date ... 
- 		 * else assume its a string.
- 		 */
--		KvpValue *kval = NULL;
--		int len = strlen (str);
-+		kval = NULL;
-+		len = strlen (str);
- 		if ((32 == len) && (32 == strspn (str, "0123456789abcdef")))
- 		{
- 			GUID guid;
-@@ -455,7 +465,7 @@ handle_single_condition (QofSqlQuery *qu
- 		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;
- }
-@@ -471,9 +481,10 @@ handle_where (QofSqlQuery *query, sql_wh
- 		{
- 			QofQuery *qleft = handle_where (query, swear->d.pair.left);
- 			QofQuery *qright = handle_where (query, swear->d.pair.right);
-+			QofQueryOp qop;
-+			QofQuery *qq;
- 			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;
-@@ -484,7 +495,7 @@ handle_where (QofSqlQuery *query, sql_wh
- 					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;
-@@ -511,12 +522,12 @@ handle_where (QofSqlQuery *query, sql_wh
- 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;
-@@ -524,14 +535,15 @@ handle_sort_order (QofSqlQuery *query, G
- 
- 		if (sorder_list)
- 		{
-+			char * qparam_name = NULL;
-+			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;
-+			n = sorder->name;
- 			if (n)
- 			{
- 				qparam_name = n->data;
-@@ -559,6 +571,10 @@ handle_sort_order (QofSqlQuery *query, G
- void 
- qof_sql_query_parse (QofSqlQuery *query, const char *str)
- {
-+	GList *tables;
-+	sql_select_statement *sss;
-+	sql_where *swear;
-+
- 	if (!query) return;
- 
- 	/* Delete old query, if any */
-@@ -590,14 +606,14 @@ qof_sql_query_parse (QofSqlQuery *query,
- 	 * 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 */
-@@ -625,7 +641,7 @@ qof_sql_query_parse (QofSqlQuery *query,
- GList * 
- qof_sql_query_run (QofSqlQuery *query, const char *str)
- {
--	GList *node;
-+	GList *node, *results;
- 
- 	if (!query) return NULL;
- 
-@@ -635,7 +651,7 @@ qof_sql_query_run (QofSqlQuery *query, c
- 	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;
- }
-@@ -643,7 +659,7 @@ qof_sql_query_run (QofSqlQuery *query, c
- GList * 
- qof_sql_query_rerun (QofSqlQuery *query)
- {
--	GList *node;
-+	GList *node, *results;
- 
- 	if (!query) return NULL;
- 
-@@ -652,7 +668,7 @@ qof_sql_query_rerun (QofSqlQuery *query)
- 	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/time/gnotime/patches/patch-at b/time/gnotime/patches/patch-at
deleted file mode 100644
index e110944e0a2..00000000000
--- a/time/gnotime/patches/patch-at
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-at,v 1.1 2005/03/16 12:48:49 rillig Exp $
-
-gcc-2.95.3 does not like code intermixed with declarations.
-
---- src/idle-dialog.c.orig	Sat May  8 18:14:49 2004
-+++ src/idle-dialog.c	Wed Mar 16 10:47:21 2005
-@@ -111,12 +111,13 @@ util_escape_html_markup (const char *str
- {
- 	char * p;
- 	char * ret;
-+	int ampcnt = 0, len;
-+	const char *start;
- 
- 	p = strchr (str, '&');
- 	if (!p) return g_strdup (str);
- 
- 	/* count number of ampersands */
--	int ampcnt = 0;
- 	while (p)
- 	{
- 		ampcnt ++;
-@@ -124,12 +125,12 @@ util_escape_html_markup (const char *str
- 	}
- 	
- 	/* make room for the escapes */
--	int len = strlen(str);
-+	len = strlen(str);
- 	ret = g_new0 (char, len+4*ampcnt+1);
- 	
- 	/* replace & by &amp; unless its already &amp; */
- 	p = strchr (str, '&');
--	const char *start = str;
-+	start = str;
- 	while (p)
- 	{
- 		strncat (ret, start, p-start);
-@@ -155,7 +156,7 @@ display_value (GttIdleDialog *dlg, time_
- {
- 	char tbuff [30];
- 	char mbuff [130];
--	char * msg;
-+	char *msg, *ptitle, *pdesc;
- 	time_t now = time(0);
- 	time_t idle_time;
- 	
-@@ -201,9 +202,9 @@ display_value (GttIdleDialog *dlg, time_
- 	/* Update the total elapsed time part of the message */
- 	idle_time = now - dlg->last_activity;
- 	
--	char *ptitle = util_escape_html_markup (
-+	ptitle = util_escape_html_markup (
- 	                            gtt_project_get_title(dlg->prj));
--	char *pdesc = util_escape_html_markup (
-+	pdesc = util_escape_html_markup (
- 	                            gtt_project_get_desc(dlg->prj));
- 	if (3600 > idle_time)
- 	{