55 lines
1.8 KiB
Plaintext
55 lines
1.8 KiB
Plaintext
$OpenBSD: patch-gtkhtml_htmlengine_c,v 1.1 2011/03/07 19:27:27 ajacoutot Exp $
|
||
|
||
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
|
||
|
||
--- gtkhtml/htmlengine.c.orig Mon Sep 13 14:16:11 2010
|
||
+++ gtkhtml/htmlengine.c Sat Feb 26 14:41:16 2011
|
||
@@ -4759,7 +4759,7 @@ html_engine_stream_write (GtkHTMLStream *handle,
|
||
html_tokenizer_write (e->ht, buffer, size == -1 ? strlen (buffer) : size);
|
||
|
||
if (e->parsing && e->timerId == 0) {
|
||
- e->timerId = g_timeout_add (10, (GtkFunction) html_engine_timer_event, e);
|
||
+ e->timerId = g_timeout_add (10, (GSourceFunc) html_engine_timer_event, e);
|
||
}
|
||
}
|
||
|
||
@@ -4877,7 +4877,7 @@ html_engine_schedule_update (HTMLEngine *e)
|
||
return;
|
||
DI (printf ("html_engine_schedule_update - timer %d\n", e->updateTimer));
|
||
if (e->updateTimer == 0)
|
||
- e->updateTimer = g_idle_add ((GtkFunction) html_engine_update_event, e);
|
||
+ e->updateTimer = g_idle_add ((GSourceFunc) html_engine_update_event, e);
|
||
}
|
||
|
||
|
||
@@ -5155,7 +5155,7 @@ html_engine_draw (HTMLEngine *e, gint x, gint y, gint
|
||
html_engine_draw_real (e, x, y, width, height, FALSE);
|
||
}
|
||
|
||
-static gint
|
||
+static gboolean
|
||
redraw_idle (HTMLEngine *e)
|
||
{
|
||
g_return_val_if_fail (HTML_IS_ENGINE (e), 0);
|
||
@@ -5179,7 +5179,7 @@ html_engine_schedule_redraw (HTMLEngine *e)
|
||
else if (e->redraw_idle_id == 0) {
|
||
clear_pending_expose (e);
|
||
html_draw_queue_clear (e->draw_queue);
|
||
- e->redraw_idle_id = g_idle_add ((GtkFunction) redraw_idle, e);
|
||
+ e->redraw_idle_id = g_idle_add ((GSourceFunc) redraw_idle, e);
|
||
}
|
||
}
|
||
|
||
@@ -5393,7 +5393,7 @@ html_engine_parse (HTMLEngine *e)
|
||
|
||
e->avoid_para = FALSE;
|
||
|
||
- e->timerId = g_idle_add ((GtkFunction) html_engine_timer_event, e);
|
||
+ e->timerId = g_idle_add ((GSourceFunc) html_engine_timer_event, e);
|
||
}
|
||
|
||
|