[Xfce4-commits] <midori:master> Remove 'locked' browser hack and rely on actions

[Christian Dywan]

Updating branch refs/heads/master
         to bcde0df374da64fd59d7436e08986a4a2e67be10 (commit)
       from 1e12cb208b7b5f32ec240205aed73312811747aa (commit)

commit bcde0df374da64fd59d7436e08986a4a2e67be10
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Oct 24 19:21:41 2010 +0200

    Remove 'locked' browser hack and rely on actions

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

diff --git a/midori/main.c b/midori/main.c
index 7a98adf..2815ee1 100644
--- 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 758d65f..8bba238 100644
--- 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"));