Updating branch refs/heads/master
to e0168e5a94b612909ef0218010411fbf2413bff6 (commit)
from bcc4373857077d32b73b211f6d743ec0ddcddb90 (commit)
commit e0168e5a94b612909ef0218010411fbf2413bff6
Author: Christian Dywan <christ...@twotoasts.de>
Date: Fri Nov 18 21:21:50 2011 +0100
Undo "Don't show empty speed dial shortcuts in-between"
This needs more work. The way it is, dial count is broken.
midori/midori-view.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 204e854..35c4af7 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -3741,7 +3741,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 && strstr (uri, "://") != NULL)
+ if (uri && *uri && *uri != '#')
{
gchar* title = g_key_file_get_string (key_file, dial_entry,
"title", NULL);
gchar* thumb_file = sokoke_build_thumbnail_path (uri);
@@ -3773,7 +3773,7 @@ prepare_speed_dial_html (MidoriView* view,
g_free (title);
g_free (encoded);
}
- else if (slot == slot_count)
+ else
{
g_string_append_printf (markup,
"<div class=\"shortcut\" id=\"s%d\"><div class=\"preview
new\">"
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
