debian/midori
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove spaces from the speed dial JSON

Browse source
This commit is contained in:
Jean-François Guchens 2009-05-23 23:59:22 +02:00 committed by Christian Dywan
parent 32b7dff63d
commit 017d789f4f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/speeddial.json
View file

@ -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":""}]}'

7
midori/midori-browser.c
View file

@ -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);