From f9559b7d27b72cb4396026c533c3c2338e2afb7a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 31 Oct 2010 21:27:22 +0100 Subject: [PATCH] Only show bookmarkbar if we have bookmarks at all --- midori/midori-browser.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 503f42b4..62318de1 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -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_widget_get_visible (browser->bookmarkbar)) + if (!gtk_widget_get_visible (browser->bookmarkbar) + && browser->bookmarks != NULL) _action_set_active (browser, "Bookmarkbar", TRUE); g_free (selected); return_status = TRUE; @@ -6198,7 +6199,8 @@ _midori_browser_update_settings (MidoriBrowser* browser) _action_set_active (browser, "Menubar", show_menubar); _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); #if WEBKIT_CHECK_VERSION (1, 1, 3) _action_set_active (browser, "Transferbar", show_transferbar);