[Xfce4-commits] <midori:master> --plain WebKit2 doesn't need a GtkScrolledWindow

[Christian Dywan]

Updating branch refs/heads/master
         to 09e0422ead571f748667dc9ca47ad1c1785a832e (commit)
       from 5e6ec95820adc00fe2c4b7168b146e902c7b46be (commit)

commit 09e0422ead571f748667dc9ca47ad1c1785a832e
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Mon Feb 25 18:33:09 2013 +0100

    --plain WebKit2 doesn't need a GtkScrolledWindow

 midori/main.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 3a00f67..4656378 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -271,14 +271,20 @@ main (int    argc,
     if (plain)
     {
         GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+#ifndef HAVE_WEBKIT2
         GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL);
+#endif
         GtkWidget* web_view = webkit_web_view_new ();
         gchar* uri = sokoke_prepare_uri (
             (uris != NULL && uris[0]) ? uris[0] : "http://www.example.com");
         katze_window_set_sensible_default_size (GTK_WINDOW (window));
 
+#ifndef HAVE_WEBKIT2
         gtk_container_add (GTK_CONTAINER (window), scrolled);
         gtk_container_add (GTK_CONTAINER (scrolled), web_view);
+#else
+        gtk_container_add (GTK_CONTAINER (window), web_view);
+#endif
         g_signal_connect (window, "delete-event",
             G_CALLBACK (gtk_main_quit), window);
         gtk_widget_show_all (window);