From: Christian Dywan <christian@twotoasts.de>
Date: Tue, 24 Nov 2009 22:57:40 +0000 (+0100)
Subject: Do not hardcode any default settings for Hildon
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e65606fd068be896c73684357c42d107e8f8a1a2;p=midori

Do not hardcode any default settings for Hildon

The proper way is to provide a customized config file.
---

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 807a0ee8..858fca25 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -706,11 +706,7 @@ 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,
@@ -758,11 +754,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      _("Open new pages in:"),
                                      _("Where to open new pages"),
                                      MIDORI_TYPE_NEW_PAGE,
-                                     #if HAVE_HILDON
-                                     MIDORI_NEW_PAGE_WINDOW,
-                                     #else
                                      MIDORI_NEW_PAGE_TAB,
-                                     #endif
                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
     g_object_class_install_property (gobject_class,
@@ -772,11 +764,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
                                      _("Open external pages in:"),
                                      _("Where to open externally opened pages"),
                                      MIDORI_TYPE_NEW_PAGE,
-                                     #if HAVE_HILDON
-                                     MIDORI_NEW_PAGE_WINDOW,
-                                     #else
                                      MIDORI_NEW_PAGE_TAB,
-                                     #endif
                                      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
     g_object_class_install_property (gobject_class,