From f01c4a472a7616b434580e03513364123c063a9a Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 14 Apr 2011 03:28:24 +0200 Subject: [PATCH] Dissolve application preferences onto other pages --- midori/midori-preferences.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index df35561d..0a68de20 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -462,19 +462,11 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (button); button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL); SPANNED_ADD (button); - #if !HAVE_HILDON - /* Page "Applications" */ - PAGE_NEW (GTK_STOCK_CONVERT, _("Applications")); - FRAME_NEW (_("External applications")); label = katze_property_label (settings, "text-editor"); INDENTED_ADD (label); entry = katze_property_proxy (settings, "text-editor", "application-text/plain"); SPANNED_ADD (entry); - label = katze_property_label (settings, "news-aggregator"); - INDENTED_ADD (label); - entry = katze_property_proxy (settings, "news-aggregator", "application-News"); - SPANNED_ADD (entry); #endif /* Page "Network" */ @@ -497,6 +489,12 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (label); button = katze_property_proxy (settings, "identify-as", "custom-user-agent"); SPANNED_ADD (button); + #if !HAVE_HILDON + label = katze_property_label (settings, "news-aggregator"); + INDENTED_ADD (label); + entry = katze_property_proxy (settings, "news-aggregator", "application-News"); + SPANNED_ADD (entry); + #endif /* Page "Privacy" */ PAGE_NEW (GTK_STOCK_INDEX, _("Privacy")); -- 2.39.5