[Xfce4-commits] <midori:master> Show kinetic scrolling option regardless of Hildon

[Christian Dywan]

Updating branch refs/heads/master
         to 6c95ea19dbba0b939ff9fff45b155e773d93f382 (commit)
       from f33644ed5b333dda081b1aeee86b0742518fa553 (commit)

commit 6c95ea19dbba0b939ff9fff45b155e773d93f382
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Jul 20 23:10:50 2011 +0200

    Show kinetic scrolling option regardless of Hildon

 midori/midori-preferences.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 93e5fe3..5cba2c9 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -368,16 +368,12 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups"));
     gtk_widget_set_tooltip_text (button, _("Whether scripts are allowed to open popup windows automatically"));
     SPANNED_ADD (button);
-    button = NULL;
-    #if HAVE_HILDON
     if (katze_widget_has_touchscreen_mode (parent ?
         GTK_WIDGET (parent) : GTK_WIDGET (preferences)))
         button = katze_property_proxy (settings, "kinetic-scrolling", NULL);
-    #else
-    button = katze_property_proxy (settings, "middle-click-opens-selection", NULL);
-    #endif
-    if (button != NULL)
-        INDENTED_ADD (button);
+    else
+        button = katze_property_proxy (settings, "middle-click-opens-selection", NULL);
+    INDENTED_ADD (button);
     FRAME_NEW (NULL);
     button = katze_property_label (settings, "preferred-languages");
     INDENTED_ADD (button);