[Xfce4-commits] <midori:master> Dissolve application preferences onto other pages
Christian Dywan
noreply at xfce.org
Thu Apr 14 03:46:03 CEST 2011
Updating branch refs/heads/master
to f01c4a472a7616b434580e03513364123c063a9a (commit)
from 9ab1349c546b4a7257196e953ebfdc6468467e71 (commit)
commit f01c4a472a7616b434580e03513364123c063a9a
Author: Christian Dywan <christian at twotoasts.de>
Date: Thu Apr 14 03:28:24 2011 +0200
Dissolve application preferences onto other pages
midori/midori-preferences.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index df35561..0a68de2 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"));
More information about the Xfce4-commits
mailing list