From: Jean-François Guchens <zcx000@gmail.com>
Date: Sat, 23 May 2009 21:59:22 +0000 (+0200)
Subject: Remove spaces from the speed dial JSON
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017d789f4faf0d962bf129f819a6a074cee52099;p=midori

Remove spaces from the speed dial JSON
---

diff --git a/data/speeddial.json b/data/speeddial.json
index 0bb63f32..eeb62ab8 100644
--- a/data/speeddial.json
+++ b/data/speeddial.json
@@ -1 +1 @@
-'{"shortcuts": [ { "id": "s1", "href": "#", "title": "", "img": "" }, { "id": "s2", "href": "#", "title": "", "img": "" }, { "id": "s3", "href": "#", "title": "", "img": "" }, { "id": "s4", "href": "#", "title": "", "img": "" }, { "id": "s5", "href": "#", "title": "", "img": "" }, { "id": "s6", "href": "#", "title": "", "img": "" }, { "id": "s7", "href": "#", "title": "", "img": "" }, { "id": "s8", "href": "#", "title": "", "img": "" }, { "id": "s9", "href": "#", "title": "", "img": "" } ] }'
+'{"shortcuts":[{"id":"s1","href":"#","title":"","img":""},{"id":"s2","href":"#","title":"","img":""},{"id":"s3","href":"#","title":"","img":""},{"id":"s4","href":"#","title":"","img":""},{"id":"s5","href":"#","title":"","img":""},{"id":"s6","href":"#","title":"","img":""},{"id":"s7","href":"#","title":"","img":""},{"id":"s8","href":"#","title":"","img":""},{"id":"s9","href":"#","title":"","img":""}]}'
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 6a4c38f8..e85ae554 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -932,7 +932,7 @@ midori_browser_speed_dial_get_next_free_slot (void)
     else
         g_file_get_contents (body_fname, &speed_dial_body, NULL, NULL);
 
-    regex = g_regex_new ("\"id\":[ \t]*\"(s[0-9])\"[ \t]*,[ \t]*\"href\":\"#\"",
+    regex = g_regex_new ("\"id\":\"(s[1-9])\",\"href\":\"#\"",
                          G_REGEX_MULTILINE, 0, NULL);
 
     if (g_regex_match (regex, speed_dial_body, 0, &match_info))
@@ -1029,9 +1029,8 @@ midori_browser_add_speed_dial (MidoriBrowser* browser)
             encoded = g_base64_encode ((guchar *)file_content, sz);
 
             replace_from = g_strdup_printf (
-                "\\{[ \t]*\"id\"[ \t]*:[ \t]*\"%s\"[ \t]*,[ \t]*\"href\"[ \t]*"\
-                "[ \t]*:[ \t]*\"#\"[ \t]*,[ \t]*\"title\"[ \t]*:[ \t]*\"\"[ \t]*,"\
-                "\"img\"[ \t]*:[ \t]*\"\"[ \t]*\\}", slot_id);
+                "\\{\"id\":\"%s\",\"href\":\"#\",\"title\":\"\",\"img\":\"\"\\}",
+                slot_id);
             replace_by = g_strdup_printf (
                 "{\"id\":\"%s\",\"href\":\"%s\",\"title\":\"%s\",\"img\":\"%s\"}",
                 slot_id, uri, title, encoded);