Merge lp:~midori/midori/availactions into lp:midori

[Cris Dywan]

Implement available-actions whitelist

midori -c /tmp/kiosktest -e available-actions=SaveAs,Fullscreen,TabNew,Cut,Navigationbar

[lp:~midori/midori/availactions]

6174. By Cris Dywan on 2013-05-22

Fix different action entry lists inside loops

[Cory J. Geesaman (cory-g)]

Christian,
Thanks for the update, but there are still some items that are visible with the flag -e available-actions=none:

Back
Forward
Stop
Refresh
Inspect Element
Undo Close Tab
Open in New Window
Add Bookmark

The Back/Forward/Stop/Refresh buttons should go since they can control the flow of an application (it would be nice if the shortcuts extension could disable F5/Refresh but that one isn't so bad), Inspect Element/Undo Close Tab/Open in New Window/Add Bookmark can definitely be used to circumvent a kiosk setup.

With ctrl+right-click the items visible are:

Undo Close Tab
Open in New Window
Add Bookmark
Inspect Element

Like you said, the ctrl+right-click one looks a bit better, but the command doesn't remove all the menu items.

Unmerged revisions

6174. By Cris Dywan on 2013-05-22

Fix different action entry lists inside loops

6173. By Cris Dywan on 2013-05-22

Implement available-actions whitelist

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-05-21 19:59:59 +0000
+++ midori/midori-browser.c	2013-05-23 00:01:27 +0000
@@ -6748,6 +6748,7 @@
     gchar* toolbar_items;
     gboolean close_buttons_on_tabs;
     KatzeItem* item;
+    gchar* available_actions;
 
     g_object_get (browser->settings,
                   "remember-last-window-size", &remember_last_window_size,
@@ -6769,6 +6770,7 @@
                   "toolbar-items", &toolbar_items,
                   "close-buttons-on-tabs", &close_buttons_on_tabs,
                   "maximum-history-age", &browser->maximum_history_age,
+                  "available-actions", &available_actions,
                   NULL);
 
     #ifdef HAVE_GRANITE
@@ -6846,6 +6848,20 @@
     _action_set_active (browser, "Statusbar", browser->show_statusbar);
 
     g_free (toolbar_items);
+
+    if (available_actions && *available_actions)
+    {
+        guint i;
+        for (i = 0; i < G_N_ELEMENTS (entries); i++)
+            if (!strstr (available_actions, entries[i].name))
+                gtk_action_set_visible (_action_by_name (browser, entries[i].name), FALSE);
+        for (i = 0; i < G_N_ELEMENTS (toggle_entries); i++)
+            if (!strstr (available_actions, toggle_entries[i].name))
+                gtk_action_set_visible (_action_by_name (browser, toggle_entries[i].name), FALSE);
+        for (i = 0; i < G_N_ELEMENTS (encoding_entries); i++)
+            if (!strstr (available_actions, encoding_entries[i].name))
+                gtk_action_set_visible (_action_by_name (browser, encoding_entries[i].name), FALSE);
+    }
 }
 
 static void

=== modified file 'midori/midori-settings.vala'
--- midori/midori-settings.vala	2013-04-11 20:33:43 +0000
+++ midori/midori-settings.vala	2013-05-23 00:01:27 +0000
@@ -64,6 +64,9 @@
 
         /* Since: 0.4.8 */
         public uint inactivity_reset { get; set; default = 0; }
+        /* The comma-separated list of visible actions if set
+           Since: 0.5.3 */
+        public string? available_actions { get; set; default = null; }
 
         GLib.Regex? block_uris_regex = null;
         /* Since: 0.4.8 */