From beccdd64f5f26ff2e01e45b455b79e4381b84ebc Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 29 Apr 2012 21:47:23 -0400 Subject: [PATCH] frames: Remove invalidate_cache_timeout WTF was this for? Was this a hacky bugfix? The git log gives no information. --- src/ui/frames.c | 18 ------------------ src/ui/frames.h | 1 - 2 files changed, 19 deletions(-) diff --git a/src/ui/frames.c b/src/ui/frames.c index b4d52cfbe..c69dfe6d7 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -194,7 +194,6 @@ meta_frames_init (MetaFrames *frames) frames->expose_delay_count = 0; - frames->invalidate_cache_timeout_id = 0; frames->invalidate_frames = NULL; frames->cache = g_hash_table_new (g_direct_hash, g_direct_equal); @@ -250,8 +249,6 @@ meta_frames_finalize (GObject *object) g_hash_table_destroy (frames->text_heights); invalidate_all_caches (frames); - if (frames->invalidate_cache_timeout_id) - g_source_remove (frames->invalidate_cache_timeout_id); g_assert (g_hash_table_size (frames->frames) == 0); g_hash_table_destroy (frames->frames); @@ -322,16 +319,6 @@ invalidate_all_caches (MetaFrames *frames) frames->invalidate_frames = NULL; } -static gboolean -invalidate_cache_timeout (gpointer data) -{ - MetaFrames *frames = data; - - invalidate_all_caches (frames); - frames->invalidate_cache_timeout_id = 0; - return FALSE; -} - static void queue_recalc_func (gpointer key, gpointer value, gpointer data) { @@ -1739,11 +1726,6 @@ populate_cache (MetaFrames *frames, if (!piece->pixmap) piece->pixmap = generate_pixmap (frames, frame, &piece->rect); } - - if (frames->invalidate_cache_timeout_id) - g_source_remove (frames->invalidate_cache_timeout_id); - - frames->invalidate_cache_timeout_id = g_timeout_add (1000, invalidate_cache_timeout, frames); if (!g_list_find (frames->invalidate_frames, frame)) frames->invalidate_frames = diff --git a/src/ui/frames.h b/src/ui/frames.h index ea149ae2a..816fa99a1 100644 --- a/src/ui/frames.h +++ b/src/ui/frames.h @@ -97,7 +97,6 @@ struct _MetaFrames int expose_delay_count; - int invalidate_cache_timeout_id; GList *invalidate_frames; GHashTable *cache; };