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

Only show bookmarkbar if we have bookmarks at all

Browse source
This commit is contained in:
Christian Dywan 2010-10-31 21:27:22 +01:00
parent 560ad66d48
commit f9559b7d27
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/midori-browser.c
View file

@ -945,7 +945,8 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
} }
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
if (!gtk_widget_get_visible (browser->bookmarkbar)) if (!gtk_widget_get_visible (browser->bookmarkbar)
&& browser->bookmarks != NULL)
_action_set_active (browser, "Bookmarkbar", TRUE); _action_set_active (browser, "Bookmarkbar", TRUE);
g_free (selected); g_free (selected);
return_status = TRUE; return_status = TRUE;
@ -6198,7 +6199,8 @@ _midori_browser_update_settings (MidoriBrowser* browser)
_action_set_active (browser, "Menubar", show_menubar); _action_set_active (browser, "Menubar", show_menubar);
_action_set_active (browser, "Navigationbar", browser->show_navigationbar); _action_set_active (browser, "Navigationbar", browser->show_navigationbar);
_action_set_active (browser, "Bookmarkbar", show_bookmarkbar); _action_set_active (browser, "Bookmarkbar", show_bookmarkbar
&& browser->bookmarks != NULL);
_action_set_active (browser, "Panel", show_panel); _action_set_active (browser, "Panel", show_panel);
#if WEBKIT_CHECK_VERSION (1, 1, 3) #if WEBKIT_CHECK_VERSION (1, 1, 3)
_action_set_active (browser, "Transferbar", show_transferbar); _action_set_active (browser, "Transferbar", show_transferbar);