[Xfce4-commits] <ristretto:master> Fix assert

[Stephan Arts]

Updating branch refs/heads/master
         to d28d43cb7ad6d88f031befcfc3d112883b1c6833 (commit)
       from 84884ba370e3a8cee3458eeeeb4d53066e1b948a (commit)

commit d28d43cb7ad6d88f031befcfc3d112883b1c6833
Author: Stephan Arts <stephan at xfce.org>
Date:   Fri Jan 8 00:39:15 2010 +0100

    Fix assert

 src/thumbnail_bar.c |    2 ++
 src/thumbnailer.c   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/thumbnail_bar.c b/src/thumbnail_bar.c
index db7b832..11163a5 100644
--- a/src/thumbnail_bar.c
+++ b/src/thumbnail_bar.c
@@ -669,6 +669,8 @@ rstto_thumbnail_bar_remove(GtkContainer *container, GtkWidget *child)
 
 	widget_was_visible = GTK_WIDGET_VISIBLE(child);
 
+    rstto_thumbnailer_dequeue_image (bar->priv->thumbnailer, child);
+
     bar->priv->thumbs = g_list_remove(bar->priv->thumbs, child);
 
 	gtk_widget_unparent(child);
diff --git a/src/thumbnailer.c b/src/thumbnailer.c
index 623f742..11a1daf 100644
--- a/src/thumbnailer.c
+++ b/src/thumbnailer.c
@@ -238,7 +238,7 @@ rstto_thumbnailer_dequeue_image (RsttoThumbnailer *thumbnailer, RsttoImage *imag
     if (thumbnailer->priv->request_timer_id)
         g_source_remove (thumbnailer->priv->request_timer_id);
 
-    thumbnailer->priv->queue = g_slist_remove (thumbnailer->priv->queue, image);
+    thumbnailer->priv->queue = g_slist_remove_all (thumbnailer->priv->queue, image);
 
     thumbnailer->priv->request_timer_id = g_timeout_add_full (G_PRIORITY_LOW, 100, (GSourceFunc)rstto_thumbnailer_queue_request_timer, thumbnailer, NULL);
 }