Fix hildon-desktop crashing if snap-grid == 0, and bump values up a bit.

[tweakr] / modules / tweakr-desktop.c

diff --git a/modules/tweakr-desktop.c b/modules/tweakr-desktop.c
index e5eae17..e07412a 100644 (file)
--- a/modules/tweakr-desktop.c
+++ b/modules/tweakr-desktop.c
@@ -46,10 +46,10 @@ enum
 
 enum
 {
-    SNAP_NONE_VALUE,
-    SNAP_SMALL_VALUE = 8,
-    SNAP_LARGE_VALUE = 16,
-    SNAP_HUGE_VALUE = 32
+    SNAP_NONE_VALUE = 4,
+    SNAP_SMALL_VALUE = 16,
+    SNAP_LARGE_VALUE = 32,
+    SNAP_HUGE_VALUE = 48
 };
 
 static gint snap_values [] = {
@@ -259,6 +259,7 @@ _add_bookmark (gchar *bookmark, TweakrDesktopSection *section)
 
     gchar *bookmark_name;
     gchar *applet_path;
+    gchar *view_path;
 
     b = g_new0 (bookmark_t, 1);
     b->path = g_strconcat (bookmark, "/label", NULL);
@@ -272,8 +273,10 @@ _add_bookmark (gchar *bookmark, TweakrDesktopSection *section)
     bookmark_name = g_path_get_basename (bookmark);
     applet_path = g_strconcat (GCONF_APPLETS, "/BookmarkShortcut:",
                                bookmark_name, NULL);
+    view_path = g_strconcat (applet_path, "/view", NULL);
     if (applet_path &&
-        gconf_client_dir_exists (section->gconf, applet_path, NULL))
+        gconf_client_dir_exists (section->gconf, applet_path, NULL) &&
+        gconf_client_get_int (section->gconf, view_path, NULL) != 0)
     {
         button = hildon_button_new_with_text
             (HILDON_SIZE_FINGER_HEIGHT, HILDON_BUTTON_ARRANGEMENT_VERTICAL,
@@ -302,6 +305,7 @@ _add_bookmark (gchar *bookmark, TweakrDesktopSection *section)
     g_free (value);
     g_free (bookmark_name);
     g_free (applet_path);
+    g_free (view_path);
 }
 
 static void