From: Christian Dywan <christian@twotoasts.de>
Date: Mon, 4 Apr 2011 19:21:27 +0000 (+0200)
Subject: Don't show toolbar preferences if running a DE
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa401634ed40d7d5bc50efe60ca503d476842720;p=midori

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
---

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 4837e815..5d3cfdd0 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");