[vte] Bug 638782 - vte build is broken by using gtk_quit_add: uplift needed
- From: Behdad Esfahbod <behdad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] Bug 638782 - vte build is broken by using gtk_quit_add: uplift needed
- Date: Thu, 6 Jan 2011 01:21:37 +0000 (UTC)
commit 63ad8cf6c00c92e959e7856b6529281892a63d59
Author: Behdad Esfahbod <behdad behdad org>
Date: Wed Jan 5 20:20:39 2011 -0500
Bug 638782 - vte build is broken by using gtk_quit_add: uplift needed
Harmlessly remove cleanup...
src/vtedraw.c | 41 -----------------------------------------
1 files changed, 0 insertions(+), 41 deletions(-)
---
diff --git a/src/vtedraw.c b/src/vtedraw.c
index 07fda00..029ebb3 100644
--- a/src/vtedraw.c
+++ b/src/vtedraw.c
@@ -101,10 +101,6 @@
*
* * Zooming in and out a terminal reuses the font info structs.
*
- * Since we use gdk timeout to schedule the delayed destruction, we also
- * add a gtk quit handler which is run when the innermost main loop exits
- * to cleanup any pending delayed destructions.
- *
*
* Pre-caching ASCII letters:
*
@@ -447,42 +443,6 @@ font_info_free (struct font_info *info)
static GHashTable *font_info_for_context;
-static guint quit_id;
-
-static gboolean
-cleanup_delayed_font_info_destroys_predicate (PangoContext *context,
- struct font_info *info)
-{
- if (info->destroy_timeout) {
- g_source_remove (info->destroy_timeout);
- info->destroy_timeout = 0;
-
- font_info_free (info);
- return TRUE;
- }
-
- return FALSE;
-}
-
-static gboolean
-cleanup_delayed_font_info_destroys (void)
-{
- g_hash_table_foreach_remove (font_info_for_context,
- (GHRFunc) cleanup_delayed_font_info_destroys_predicate,
- NULL);
-
- quit_id = 0;
- return 0;
-}
-
-static void
-ensure_quit_handler (void)
-{
- if (G_UNLIKELY (quit_id == 0))
- quit_id = gtk_quit_add (1,
- (GtkFunction) cleanup_delayed_font_info_destroys,
- NULL);
-}
static struct font_info *
font_info_register (struct font_info *info)
@@ -544,7 +504,6 @@ font_info_destroy (struct font_info *info)
return;
/* Delay destruction by a few seconds, in case we need it again */
- ensure_quit_handler ();
info->destroy_timeout = gdk_threads_add_timeout_seconds (FONT_CACHE_TIMEOUT,
(GSourceFunc) font_info_destroy_delayed,
info);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]