Remove 'locked' browser hack and rely on actions

diff --git a/midori/main.c b/midori/main.c
index 7a98adf0adf2179e0e7b12bdf980d0c693e7114f..2815ee1c30e2197a7bc308a6b2db975f96d9b71b 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -1857,6 +1857,7 @@ main (int    argc,
                           "show-statusbar", FALSE,
                           "enable-developer-extras", FALSE,
                           NULL);
+            midori_browser_set_action_visible (browser, "Menubar", FALSE);
         }
         g_object_set (settings, "show-panel", FALSE, NULL);
         midori_browser_set_action_visible (browser, "Bookmarks", FALSE);
@@ -1869,7 +1870,6 @@ main (int    argc,
         g_signal_connect (browser, "notify::load-status",
             G_CALLBACK (midori_web_app_browser_notify_load_status_cb), NULL);
         midori_browser_add_uri (browser, webapp);
-        g_object_set_data (G_OBJECT (browser), "locked", (void*)1);
         g_signal_connect (browser, "quit",
             G_CALLBACK (gtk_main_quit), NULL);
         g_signal_connect (browser, "destroy",

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 758d65f59a6e6ed02a282b209e7b5c1152307544..8bba238cfa7fa48c6c122d91da4c6b501d6f36b4 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2601,10 +2601,6 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget*     widget,
     GtkWidget* menu;
     GtkWidget* menuitem;
 
-    /* Unsupported trick used for web app mode */
-    if (g_object_get_data (G_OBJECT (browser), "locked"))
-        return FALSE;
-
     menu = gtk_menu_new ();
     menuitem = sokoke_action_create_popup_menu_item (
         _action_by_name (browser, "Menubar"));