[Xfce4-commits] <midori:master> Hide application preferences on Hildon and preset text editor

[Christian Dywan]

Updating branch refs/heads/master
         to 4b633b60067219a7ee565b93461e7909dc569d8d (commit)
       from 66079c987b5373a43bce7241451820e477e56e47 (commit)

commit 4b633b60067219a7ee565b93461e7909dc569d8d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Oct 26 00:27:14 2009 +0100

    Hide application preferences on Hildon and preset text editor

 midori/midori-preferences.c |    2 ++
 midori/midori-websettings.c |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 04b9539..2a8256e 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 83e078a..5e473b2 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,