From 64b63c462de2151ec093a2ad4dcb91313d313a0d Mon Sep 17 00:00:00 2001
From: Volker Stolz <vs@FreeBSD.org>
Date: Thu, 10 Nov 2005 16:03:00 +0000
Subject: [PATCH] Fix some C99'isms for 4.x

Approved by: kwm
---
 .../patch-libgnomedb_gnome-db-data-proxy.c    | 18 ++++++++++++++++
 .../patch-libgnomedb_gnome-db-find-dialog.c   | 20 ++++++++++++++++++
 .../files/patch-libgnomedb_gnome-db-grid.c    | 21 +++++++++++++++++++
 .../patch-libgnomedb_gnome-db-sql-console.c   | 15 +++++++++++++
 4 files changed, 74 insertions(+)
 create mode 100644 databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-proxy.c
 create mode 100644 databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
 create mode 100644 databases/libgnomedb/files/patch-libgnomedb_gnome-db-grid.c
 create mode 100644 databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c

diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-proxy.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-proxy.c
new file mode 100644
index 000000000000..0cb48e48592a
--- /dev/null
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-proxy.c
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- libgnomedb/gnome-db-data-proxy.c.orig
++++ libgnomedb/gnome-db-data-proxy.c
+@@ -1272,10 +1272,10 @@
+ void
+ gnome_db_data_proxy_reset_all (GnomeDbDataProxy *proxy)
+ {
+-	g_return_if_fail (proxy && IS_GNOME_DB_DATA_PROXY (proxy));
+-	g_return_if_fail (proxy->priv);
+ 	GtkTreePath *path;
+ 	GtkTreeIter iter;
++	g_return_if_fail (proxy && IS_GNOME_DB_DATA_PROXY (proxy));
++	g_return_if_fail (proxy->priv);
+ 
+ 	/* new rows are first treated and removed (no memory de-allocation here, though) */
+ 	if (proxy->priv->new_rows) {
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
new file mode 100644
index 000000000000..44a4771037f8
--- /dev/null
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- libgnomedb/gnome-db-find-dialog.c.orig
++++ libgnomedb/gnome-db-find-dialog.c
+@@ -220,12 +220,14 @@
+ 	
+ 	g_object_ref (dm);
+ 	
++	{
+ 	GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title);
+ 	gnome_db_find_dialog_add_fields_from_model (dialog, dm);
+ 
+ 	g_object_unref (dm);
+ 
+ 	return dialog;
++	}
+ }
+ 
+ /**
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-grid.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-grid.c
new file mode 100644
index 000000000000..7d386cd95afe
--- /dev/null
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-grid.c
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- libgnomedb/gnome-db-grid.c.orig
++++ libgnomedb/gnome-db-grid.c
+@@ -1917,6 +1917,7 @@
+ 	else {
+ 		/* render all the parameters invalid */
+ 		grid->priv->internal_params_change = TRUE;
++		{
+ 		GSList *list = grid->priv->data_set->parameters;
+ 		while (list) {
+ 			GnomeDbParameter *tmp;
+@@ -1925,6 +1926,7 @@
+ 				gnome_db_parameter_declare_invalid (GNOME_DB_PARAMETER (list->data));
+ 			
+ 			list = g_slist_next (list);
++		}
+ 		}
+ 		grid->priv->internal_params_change = FALSE;
+ 	}
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
new file mode 100644
index 000000000000..607e5da74d26
--- /dev/null
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- libgnomedb/gnome-db-sql-console.c.orig
++++ libgnomedb/gnome-db-sql-console.c
+@@ -596,8 +596,8 @@
+ 
+ 	/* help */
+ 	if (!cmde_ok && !strcmp (pcmde, "?")) {
+-		cmde_ok = TRUE;
+ 		GString *string;
++		cmde_ok = TRUE;
+ 
+ 		string = g_string_new (_("SQL statements:\n"
+ 					 "  they can span several lines, and are executed\n"