[Xfce4-commits] <midori:master> Respect hidden tabs in granite build

[Christian Dywan]

Updating branch refs/heads/master
         to 9efda4447d34a07e91e43c07eb6e5ff43de63572 (commit)
       from b33b3c809f397b5cbe55ac856988eadbeeb4acd3 (commit)

commit 9efda4447d34a07e91e43c07eb6e5ff43de63572
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Oct 18 22:56:29 2012 +0200

    Respect hidden tabs in granite build
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1034879

 midori/main.c           |    2 +-
 midori/midori-browser.c |   12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 45d2daa..209ae1d 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2151,7 +2151,6 @@ main (int    argc,
             g_object_set (settings,
                           "show-menubar", FALSE,
                           "show-navigationbar", FALSE,
-                          "always-show-tabbar", FALSE,
                           "toolbar-items", "Back,Forward,ReloadStop,Location,Homepage",
                           "show-statusbar", FALSE,
                           "enable-developer-extras", FALSE,
@@ -2163,6 +2162,7 @@ main (int    argc,
                       NULL);
         midori_browser_set_action_visible (browser, "Panel", FALSE);
         g_object_set (browser, "settings", settings, NULL);
+        g_object_set (browser, "show-tabs", FALSE, NULL);
         midori_startup_timer ("Setup config: \t%f");
         g_object_unref (settings);
         g_signal_connect (browser, "quit",
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 28aca95..b7bddc5 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -264,17 +264,15 @@ _toggle_tabbar_smartly (MidoriBrowser* browser,
                         gboolean       ignore_fullscreen)
 {
     gboolean has_tabs = midori_browser_get_n_pages (browser) > 1;
-#ifdef HAVE_GRANITE
     gboolean show_tabs = !midori_browser_is_fullscreen (browser) || ignore_fullscreen;
+    if (!browser->show_tabs)
+        show_tabs = FALSE;
+#ifdef HAVE_GRANITE
     granite_widgets_dynamic_notebook_set_show_tabs (
         GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), show_tabs);
 #else
-    gboolean show_tabs =
-        browser->show_tabs
-     && (!midori_browser_is_fullscreen (browser) || ignore_fullscreen)
-     && (has_tabs
-      || katze_object_get_boolean (browser->settings, "always-show-tabbar"));
-
+    if (!(has_tabs || katze_object_get_boolean (browser->settings, "always-show-tabbar")))
+        show_tabs = FALSE;
     gtk_notebook_set_show_tabs (GTK_NOTEBOOK (browser->notebook), show_tabs);
     gtk_notebook_set_show_border (GTK_NOTEBOOK (browser->notebook), show_tabs);
 #endif