[Xfce4-commits] <midori:master> Don't show empty speed dial shortcuts in-between

[Christian Dywan]

Updating branch refs/heads/master
         to 8ecfdd701ed57ad51d6e6df8e93cba570f04601d (commit)
       from 52ae8c90e856c166c71476f1ba5e98c9db76664e (commit)

commit 8ecfdd701ed57ad51d6e6df8e93cba570f04601d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Nov 15 21:13:49 2011 +0100

    Don't show empty speed dial shortcuts in-between
    
    It is confusing a lot of users.

 midori/midori-view.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index a63aba1..44ed73c 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3739,7 +3739,7 @@ prepare_speed_dial_html (MidoriView* view,
         gchar* dial_entry = g_strdup_printf ("Dial %d", slot);
         gchar* uri = g_key_file_get_string (key_file, dial_entry, "uri", NULL);
 
-        if (uri && *uri && *uri != '#')
+        if (uri && strstr (uri, "://") != NULL)
         {
             gchar* title = g_key_file_get_string (key_file, dial_entry, "title", NULL);
             gchar* thumb_file = sokoke_build_thumbnail_path (uri);
@@ -3764,14 +3764,14 @@ prepare_speed_dial_html (MidoriView* view,
             g_string_append_printf (markup,
                 "<div class=\"shortcut\" id=\"s%d\"><div class=\"preview\">"
                 "<a class=\"cross\" href=\"#\" onclick='clearShortcut(\"s%d\");'></a>"
-                "<a href=\"%s\"><img src=\"data:image/png;base64,%s\"></a>"
+                "<a href=\"%s\"><img src=\"%s%s\"></a>"
                 "</div><div class=\"title\" onclick='renameShortcut(\"s%d\");'>%s</div></div>\n",
-                slot, slot, uri, encoded, slot, title ? title : "");
+                slot, slot, uri, prefix, encoded, slot, title ? title : "");
 
             g_free (title);
             g_free (encoded);
         }
-        else
+        else if (slot == slot_count)
         {
             g_string_append_printf (markup,
                 "<div class=\"shortcut\" id=\"s%d\"><div class=\"preview new\">"