Hide application preferences on Hildon and preset text editor

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 04b9539116fd787f196835ca80aabdc33c699ce4..2a8256e5565d1f77cf04c8012790e495d270c04b 100644 (file)
--- 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 83e078a257e45d5273f9f95729ccd1b7d0fc2167..5e473b2c27cbcafec34aa18d5eb556da36598f7d 100644 (file)
--- 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,