[Xfce4-commits] <midori:master> Move around preferences so Open panels in Windows is always shown

[Christian Dywan]

Updating branch refs/heads/master
         to 9cf6f6a3cc37bd81afa42c8c98399b1ff5a127e0 (commit)
       from de4eede5cc81accf5fdfabb0f755c7c0a34b3abc (commit)

commit 9cf6f6a3cc37bd81afa42c8c98399b1ff5a127e0
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Jan 9 23:49:25 2010 +0100

    Move around preferences so Open panels in Windows is always shown

 midori/midori-preferences.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 82c5241..3ee80fc 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -389,7 +389,11 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
         GTK_WIDGET (parent) : GTK_WIDGET (preferences)))
         button = katze_property_proxy (settings, "kinetic-scrolling", NULL);
     else
-        button = katze_property_proxy (settings, "open-panels-in-windows", NULL);
+    {
+        button = katze_property_proxy (settings, "enforce-96-dpi", NULL);
+        gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 dots per inch"));
+        gtk_widget_set_tooltip_text (button, _("Enforce a video dot density of 96 DPI"));
+    }
     #else
     button = katze_property_proxy (settings, "middle-click-opens-selection", NULL);
     #endif
@@ -397,19 +401,15 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     #if !HAVE_HILDON
     button = katze_property_proxy (settings, "enable-scripts", NULL);
     INDENTED_ADD (button);
-    button = katze_property_proxy (settings, "enable-plugins", NULL);
+    button = katze_property_proxy (settings, "open-panels-in-windows", NULL);
     SPANNED_ADD (button);
-    #endif
-    button = katze_property_proxy (settings, "zoom-text-and-images", NULL);
+    button = katze_property_proxy (settings, "enable-plugins", NULL);
     INDENTED_ADD (button);
+    #endif
     button = katze_property_proxy (settings, "find-while-typing", NULL);
     SPANNED_ADD (button);
-    #if !HAVE_HILDON
-    button = katze_property_proxy (settings, "enforce-96-dpi", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 dots per inch"));
-    gtk_widget_set_tooltip_text (button, _("Enforce a video dot density of 96 DPI"));
+    button = katze_property_proxy (settings, "zoom-text-and-images", NULL);
     INDENTED_ADD (button);
-    #endif
     #if WEBKIT_CHECK_VERSION (1, 1, 6)
     FRAME_NEW (_("Spell Checking"));
     /* FIXME: Provide a nice dictionary selection */