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

Properly calculate row count when importing from JSON

Browse source
This commit is contained in:
Paweł Forysiuk 2011-03-24 22:54:58 +01:00 committed by Christian Dywan
parent 599bd748df
commit 7cafd62552
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/main.c
View file

@ -1477,6 +1477,7 @@ speeddial_new_from_file (const gchar* config,
guint i = 0; guint i = 0;
guint columns = 3; guint columns = 3;
guint slot_count = 0; guint slot_count = 0;
guint rows;
gchar* json_content; gchar* json_content;
gchar** parts; gchar** parts;
@ -1594,9 +1595,10 @@ speeddial_new_from_file (const gchar* config,
} }
} }
/* Without JSON we save 3 columns and 0 rows, columns are initialised as 3 */ /* Default to 3 x 3 grid. Calculate rows here, columns is initialized as 3 */
rows = slot_count / columns > 3 ? slot_count / columns : 3;
g_key_file_set_integer (key_file, "settings", "columns", columns); g_key_file_set_integer (key_file, "settings", "columns", columns);
g_key_file_set_integer (key_file, "settings", "rows", slot_count / columns ? 0 : 3); g_key_file_set_integer (key_file, "settings", "rows", rows);
g_strfreev (parts); g_strfreev (parts);
g_free (json_content); g_free (json_content);