[Xfce4-commits] <midori:master> Take into account JSON/ non-JSON column defaults

[Christian Dywan]

Updating branch refs/heads/master
         to d4cc81a6c290d36a1c8eeee5c254a8a2693f752d (commit)
       from c1f9d6f796fef77a6de1601c432c5fe1a01fc8d1 (commit)

commit d4cc81a6c290d36a1c8eeee5c254a8a2693f752d
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Wed Mar 23 02:22:42 2011 +0100

    Take into account JSON/ non-JSON column defaults

 midori/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index c7789a2..7900d62 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1594,8 +1594,9 @@ speeddial_new_from_file (const gchar* config,
         }
     }
 
+    /* Without JSON we save 3 columns and 0 rows, columns are initialised as 3 */
     g_key_file_set_integer (key_file, "settings", "columns", columns);
-    g_key_file_set_integer (key_file, "settings", "rows", slot_count / columns);
+    g_key_file_set_integer (key_file, "settings", "rows", slot_count / columns ? 0 : 3);
 
     g_strfreev (parts);
     g_free (json_content);