Only show close in speed dial if it can be saved

And un-negate return value of sokoke_is_app_or_private().

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 4d4a771dd8eba6e0534ed9f794d3961e7aaaf2f9..59ade73c45f9fa69ce1d3fa2374fbb3c9f0da2ed 100644 (file)
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -296,7 +296,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     #define SPANNED_ADD(__widget) \
      katze_preferences_add_widget (_preferences, __widget, "spanned")
     /* Page "General" */
-    if (sokoke_is_app_or_private ())
+    if (!sokoke_is_app_or_private ())
     {
     PAGE_NEW (GTK_STOCK_HOME, _("Startup"));
     FRAME_NEW (NULL);

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 80fd9d240b5a67dc597bb5f39ee666e057fc8b29..8e2086ca666d1d0f5a48f2661aa7acc1addd3996 100644 (file)
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -2609,7 +2609,7 @@ midori_view_populate_popup (MidoriView* view,
                 gtk_action_group_get_action (actions, "BookmarkAdd"));
         gtk_menu_shell_append (menu_shell, menuitem);
 
-        if (!midori_view_is_blank (view) && sokoke_is_app_or_private ())
+        if (!midori_view_is_blank (view) && !sokoke_is_app_or_private ())
         {
             menuitem = sokoke_action_create_popup_menu_item (
                 gtk_action_group_get_action (actions, "AddSpeedDial"));
@@ -3332,6 +3332,12 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings,
         view->middle_click_opens_selection = g_value_get_boolean (&value);
     else if (name == g_intern_string ("open-tabs-in-the-background"))
         view->open_tabs_in_the_background = g_value_get_boolean (&value);
+    else if (name == g_intern_string ("enable-scripts"))
+    {
+        /* Speed dial is only editable with scripts, so regenerate it */
+        if (midori_view_is_blank (view))
+            midori_view_reload (view, FALSE);
+    }
 
     g_value_unset (&value);
 }
@@ -3740,8 +3746,12 @@ prepare_speed_dial_html (MidoriView* view)
 
    /* percent width size of one slot */
    slot_size = (100 / grid_index);
+   /* No editing in private/ app mode or without scripts */
    g_string_append_printf (markup,
+        "%s<style>.cross { display:none }</style>%s"
         "<style> div.shortcut { height: %d%%; width: %d%%; }</style>\n",
+        sokoke_is_app_or_private () ? "" : "<noscript>",
+        sokoke_is_app_or_private () ? "" : "</noscript>",
         slot_size + 1, slot_size - 4);
 
     while (slot <= slot_count)

diff --git a/midori/sokoke.c b/midori/sokoke.c
index 1ed09cc605480a3690d854deb4c9b0d6f28274ac..707490a99d7f433fd55430c8ca836a6f89d7d2f9 100644 (file)
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -1633,7 +1633,7 @@ sokoke_set_config_dir (const gchar* new_config_dir)
 gboolean
 sokoke_is_app_or_private (void)
 {
-    return strcmp ("/", sokoke_set_config_dir (NULL));
+    return !strcmp ("/", sokoke_set_config_dir (NULL));
 }
 
 /**