debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove 'locked' browser hack and rely on actions

Browse source
This commit is contained in:
Christian Dywan 2010-10-24 19:21:41 +02:00
parent 1e12cb208b
commit bcde0df374
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
midori/main.c
View file

@ -1857,6 +1857,7 @@ main (int argc,
"show-statusbar", FALSE, "show-statusbar", FALSE,
"enable-developer-extras", FALSE, "enable-developer-extras", FALSE,
NULL); NULL);
midori_browser_set_action_visible (browser, "Menubar", FALSE);
} }
g_object_set (settings, "show-panel", FALSE, NULL); g_object_set (settings, "show-panel", FALSE, NULL);
midori_browser_set_action_visible (browser, "Bookmarks", FALSE); midori_browser_set_action_visible (browser, "Bookmarks", FALSE);
@ -1869,7 +1870,6 @@ main (int argc,
g_signal_connect (browser, "notify::load-status", g_signal_connect (browser, "notify::load-status",
G_CALLBACK (midori_web_app_browser_notify_load_status_cb), NULL); G_CALLBACK (midori_web_app_browser_notify_load_status_cb), NULL);
midori_browser_add_uri (browser, webapp); midori_browser_add_uri (browser, webapp);
g_object_set_data (G_OBJECT (browser), "locked", (void*)1);
g_signal_connect (browser, "quit", g_signal_connect (browser, "quit",
G_CALLBACK (gtk_main_quit), NULL); G_CALLBACK (gtk_main_quit), NULL);
g_signal_connect (browser, "destroy", g_signal_connect (browser, "destroy",

4
midori/midori-browser.c
View file

@ -2601,10 +2601,6 @@ midori_browser_toolbar_popup_context_menu_cb (GtkWidget* widget,
GtkWidget* menu; GtkWidget* menu;
GtkWidget* menuitem; GtkWidget* menuitem;
/* Unsupported trick used for web app mode */
if (g_object_get_data (G_OBJECT (browser), "locked"))
return FALSE;
menu = gtk_menu_new (); menu = gtk_menu_new ();
menuitem = sokoke_action_create_popup_menu_item ( menuitem = sokoke_action_create_popup_menu_item (
_action_by_name (browser, "Menubar")); _action_by_name (browser, "Menubar"));