[Xfce4-commits] <midori:master> Don't show toolbar preferences if running a DE

[Christian Dywan]

Updating branch refs/heads/master
         to aa401634ed40d7d5bc50efe60ca503d476842720 (commit)
       from d1d5ea9b7702ab49082f4dcfc342037e2e6ad674 (commit)

commit aa401634ed40d7d5bc50efe60ca503d476842720
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Apr 4 21:21:27 2011 +0200

    Don't show toolbar preferences if running a DE
    
    Let's assume that modern desktops have a tool to adapt the
    toolbar style.
    
    Fixes: https://bugs.launchpad.net/midori/+bug/711435

 midori/midori-preferences.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 4837e81..5d3cfdd 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -440,11 +440,14 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
 
     /* Page "Interface" */
     PAGE_NEW (GTK_STOCK_CONVERT, _("Interface"));
-    FRAME_NEW (_("Navigationbar"));
     #if !HAVE_HILDON
-    INDENTED_ADD (katze_property_label (settings, "toolbar-style"));
-    button = katze_property_proxy (settings, "toolbar-style", NULL);
-    SPANNED_ADD (button);
+    if (!g_getenv ("DESKTOP_SESSION"))
+    {
+        FRAME_NEW (_("Navigationbar"));
+        INDENTED_ADD (katze_property_label (settings, "toolbar-style"));
+        button = katze_property_proxy (settings, "toolbar-style", NULL);
+        SPANNED_ADD (button);
+    }
     #endif
     FRAME_NEW (_("Browsing"));
     label = katze_property_label (settings, "open-new-pages-in");