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

Move slot and dial_id out of the loop for JSON import

Browse source
This commit is contained in:
Paweł Forysiuk 2011-04-03 23:24:53 +02:00 committed by Christian Dywan
parent b8eb9c50f7
commit 1e5e1710ee
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/main.c
View file

@ -1478,6 +1478,8 @@ speeddial_new_from_file (const gchar* config,
guint columns = 3; guint columns = 3;
guint slot_count = 0; guint slot_count = 0;
guint rows; guint rows;
gchar* slot = NULL;
gchar* dial_id = NULL;
gchar* json_content; gchar* json_content;
gchar** parts; gchar** parts;
@ -1494,9 +1496,6 @@ speeddial_new_from_file (const gchar* config,
{ {
gchar* key; gchar* key;
gchar* val; gchar* val;
gchar* slot = NULL;
gchar* dial_id = NULL;
gchar* uri;
gchar** values = g_strsplit (parts[i], "\"", -1); gchar** values = g_strsplit (parts[i], "\"", -1);
if (*values[1]) if (*values[1])
@ -1526,9 +1525,8 @@ speeddial_new_from_file (const gchar* config,
} }
else if (g_str_equal (key, "href") && (*val && strncmp (val, "#", 1))) else if (g_str_equal (key, "href") && (*val && strncmp (val, "#", 1)))
{ {
uri = g_strdup (val);
g_key_file_set_value (key_file, dial_id, "name", slot); g_key_file_set_value (key_file, dial_id, "name", slot);
g_key_file_set_value (key_file, dial_id, "uri", uri); g_key_file_set_value (key_file, dial_id, "uri", val);
} }
else if (g_str_equal (key, "img") && *val) else if (g_str_equal (key, "img") && *val)
{ {
@ -1597,6 +1595,8 @@ speeddial_new_from_file (const gchar* config,
sokoke_key_file_save_to_file (key_file, config_file, NULL); sokoke_key_file_save_to_file (key_file, config_file, NULL);
g_strfreev (parts); g_strfreev (parts);
g_free (dial_id);
g_free (slot);
g_free (config_file); g_free (config_file);
g_free (json_content); g_free (json_content);
return key_file; return key_file;