From: Christian Dywan <christian@twotoasts.de>
Date: Sun, 25 Oct 2009 23:27:14 +0000 (+0100)
Subject: Hide application preferences on Hildon and preset text editor
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b633b60067219a7ee565b93461e7909dc569d8d;p=midori

Hide application preferences on Hildon and preset text editor
---

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 04b95391..2a8256e5 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -452,6 +452,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     button = katze_property_proxy (settings, "close-buttons-on-tabs", NULL);
     SPANNED_ADD (button);
 
+    #if !HAVE_HILDON
     /* Page "Applications" */
     PAGE_NEW (GTK_STOCK_CONVERT, _("Applications"));
     FRAME_NEW (_("External applications"));
@@ -467,6 +468,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     INDENTED_ADD (label);
     entry = katze_property_proxy (settings, "news-aggregator", "application-Network");
     SPANNED_ADD (entry);
+    #endif
 
     /* Page "Network" */
     PAGE_NEW (GTK_STOCK_NETWORK, _("Network"));
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 83e078a2..5e473b2c 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -701,7 +701,11 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      "news-aggregator",
                                      _("News Aggregator"),
                                      _("An external news aggregator"),
+                                     #if HAVE_HILDON
+                                     "osso_notes",
+                                     #else
                                      NULL,
+                                     #endif
                                      flags));
 
     g_object_class_install_property (gobject_class,