Don't show the progressbar if the location shows progress

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8508bd2a6bd7f5f910d8601e9e8ccbe89c4977ea..ff1c6c469e176e2a89ec41ebb90a875ac3701127 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -287,7 +287,8 @@ _midori_browser_update_interface (MidoriBrowser* browser)
         g_object_set (action,
                       "stock-id", GTK_STOCK_STOP,
                       "tooltip", _("Stop loading the current page"), NULL);
-        gtk_widget_show (browser->progressbar);
+        if (!browser->progress_in_location || !GTK_WIDGET_VISIBLE (browser->navigationbar))
+            gtk_widget_show (browser->progressbar);
         if (!GTK_WIDGET_VISIBLE (browser->statusbar) &&
             !GTK_WIDGET_VISIBLE (browser->navigationbar) &&
             browser->progress_in_location)