Don't queue thumbs already waiting, 5 seconds timeout

diff --git a/midori/midori-view.c b/midori/midori-view.c
index ca0d611e5b202a936b6c0825b7a692c6782df318..3f73dfbde2265f89129de8c2300a652f12423442 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -69,6 +69,9 @@ midori_view_speed_dial_get_thumb (MidoriView* view,
                                   gchar*      dial_id,
                                   gchar*      url);
 
+static void
+midori_view_speed_dial_thumb_apply (MidoriView* view);
+
 struct _MidoriView
 {
     GtkVBox parent_instance;
@@ -195,6 +198,7 @@ static guint signals[LAST_SIGNAL];
 static gchar* speeddial_markup = NULL;
 static GtkWidget* thumb_view = NULL;
 static GList* thumb_queue = NULL;
+static guint thumb_timeout = 0;
 
 static void
 midori_view_finalize (GObject* object);
@@ -5345,6 +5349,22 @@ static void
 thumb_view_load_status_cb (WebKitWebView* thumb_view_,
                            GParamSpec*    pspec,
                            MidoriView*    view)
+{
+    if (webkit_web_view_get_load_status (thumb_view_) != WEBKIT_LOAD_FINISHED)
+        return;
+
+    midori_view_speed_dial_thumb_apply (view);
+}
+
+static void
+midori_view_speed_dial_thumb_timeout (MidoriView* view)
+{
+    webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (thumb_view));
+    midori_view_speed_dial_thumb_apply (view);
+}
+
+static void
+midori_view_speed_dial_thumb_apply (MidoriView* view)
 {
     GdkPixbuf* img;
     #if HAVE_OFFSCREEN
@@ -5359,8 +5379,8 @@ thumb_view_load_status_cb (WebKitWebView* thumb_view_,
     GKeyFile* key_file;
     const gchar* title;
 
-    if (webkit_web_view_get_load_status (thumb_view_) != WEBKIT_LOAD_FINISHED)
-        return;
+    if (thumb_timeout > 0)
+        g_source_remove (thumb_timeout);
 
     spec = g_object_get_data (G_OBJECT (thumb_view), "spec");
     url = strstr (spec, "|") + 1;
@@ -5398,6 +5418,10 @@ thumb_view_load_status_cb (WebKitWebView* thumb_view_,
     thumb_queue = g_list_remove (thumb_queue, spec);
     if (thumb_queue != NULL)
     {
+        /* At best wait 5 seconds for a single thumbnail to load */
+        thumb_timeout = g_timeout_add_seconds (5,
+            (GSourceFunc)midori_view_speed_dial_thumb_timeout, view);
+
         g_object_set_data_full (G_OBJECT (thumb_view), "spec",
                                 thumb_queue->data, (GDestroyNotify)g_free);
         webkit_web_view_open (WEBKIT_WEB_VIEW (thumb_view),
@@ -5408,6 +5432,14 @@ thumb_view_load_status_cb (WebKitWebView* thumb_view_,
             thumb_view, thumb_view_load_status_cb, view);
 }
 
+static gint
+midori_view_speed_dial_thumb_cf (gconstpointer spec1,
+                                 gconstpointer spec2)
+{
+    /* Compare URL without dial id */
+    return strcmp (strstr (spec1, "|") + 1, strstr (spec2, "|") + 1);
+}
+
 /**
  * midori_view_speed_dial_get_thumb
  * @view: a #MidoriView
@@ -5421,6 +5453,7 @@ midori_view_speed_dial_get_thumb (MidoriView* view,
 {
     WebKitWebSettings* settings;
     GtkWidget* browser;
+    gchar* spec;
     #if !HAVE_OFFSCREEN
     GtkWidget* notebook;
     GtkWidget* label;
@@ -5470,10 +5503,23 @@ midori_view_speed_dial_get_thumb (MidoriView* view,
     g_object_unref (notebook);
     #endif
 
-    thumb_queue = g_list_append (thumb_queue, g_strconcat (dial_id, "|", url, NULL));
+    spec = g_strconcat (dial_id, "|", url, NULL);
+    /* If spec is already queued, there's nothing to be done */
+    if (g_list_find_custom (thumb_queue, spec, midori_view_speed_dial_thumb_cf))
+    {
+        g_free (spec);
+        return;
+    }
+    thumb_queue = g_list_append (thumb_queue, spec);
     if (g_list_nth_data (thumb_queue, 1) != NULL)
         return;
 
+    /* At best wait 5 seconds for a single thumbnail to load */
+    if (thumb_timeout > 0)
+        g_source_remove (thumb_timeout);
+    thumb_timeout = g_timeout_add_seconds (5,
+        (GSourceFunc)midori_view_speed_dial_thumb_timeout, view);
+
     g_object_set_data_full (G_OBJECT (thumb_view), "spec",
                             thumb_queue->data, (GDestroyNotify)g_free);
     g_signal_connect (thumb_view, "notify::load-status",