$OpenBSD: patch-gtkhtml_testgtkhtml_c,v 1.1 2011/03/07 19:27:27 ajacoutot Exp $

From d085cd1cb81aab0767ab8276bef27b9ffdd832ed Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 25 Oct 2010 23:06:32 +0000
Subject: Fix build issues.

From be95ffabe801e1c273f0bceb32d592e5a53eacb7 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 18 Nov 2010 11:13:20 +0000
Subject: Use GSourceFunc instead of GtkFunction

From 3bf9eb43743cc1526802e0ce52b295e31e5a3c82 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 20 Oct 2010 13:51:48 +0000
Subject: Bug 632601 - Handle combo box text API going away

--- gtkhtml/testgtkhtml.c.orig	Mon Sep 13 14:16:11 2010
+++ gtkhtml/testgtkhtml.c	Sat Feb 26 15:36:33 2011
@@ -49,6 +49,9 @@
 
 #include "gtkhtmldebug.h"
 
+/* backward-compatibility cruft */
+#include "gtk-compat.h"
+
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
@@ -445,10 +448,10 @@ create_toolbars ()
 		0,                      0);
 
 	find_examples ();
-	test_combo_box = gtk_combo_box_new_text ();
+	test_combo_box = gtk_combo_box_text_new ();
 	for (i = 0; i < examples->len; i++) {
 		Example *example = examples->pdata[i];
-		gtk_combo_box_append_text (GTK_COMBO_BOX (test_combo_box), example->title);
+		gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (test_combo_box), example->title);
 	}
 	gtk_combo_box_set_active (GTK_COMBO_BOX (test_combo_box), 0);
 	g_signal_connect (test_combo_box, "changed", G_CALLBACK (example_changed_cb), NULL);
@@ -766,7 +769,7 @@ on_redirect (GtkHTML *html, const gchar *url, gint del
 
 		redirect_url = g_strdup(url);
 
-		redirect_timerId = g_timeout_add (delay * 1000,(GtkFunction) redirect_timer_event, NULL);
+		redirect_timerId = g_timeout_add (delay * 1000,(GSourceFunc) redirect_timer_event, NULL);
 	}
 }
 
@@ -822,7 +825,7 @@ on_link_clicked (GtkHTML *html, const gchar *url, gpoi
 }
 
 /* simulate an async object isntantiation */
-static gint
+static gboolean
 object_timeout(GtkHTMLEmbedded *eb)
 {
 	GtkWidget *w;
@@ -847,7 +850,7 @@ object_requested_cmd (GtkHTML *html, GtkHTMLEmbedded *
 		return FALSE;
 
 	g_object_ref (eb);
-	g_timeout_add(rand() % 5000 + 1000, (GtkFunction) object_timeout, eb);
+	g_timeout_add(rand() % 5000 + 1000, (GSourceFunc) object_timeout, eb);
 	/* object_timeout (eb); */
 
 	return TRUE;