[webkit-changes] [108998] releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk

[kov]

Title: [108998] releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk

Revision

108998

Author

k...@webkit.org

Date

2012-02-27 09:01:53 -0800 (Mon, 27 Feb 2012)

Log Message

Patch from Vincent Untz <vu...@gnome.org> to fix gtk2 build

Modified Paths

• releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog
• releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/tests/testwebview.c

Diff

Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog (108997 => 108998)

--- releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog	2012-02-27 16:58:09 UTC (rev 108997)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog	2012-02-27 17:01:53 UTC (rev 108998)
@@ -1,3 +1,9 @@
+2012-02-27  Vincent Untz  <vu...@gnome.org>
+
+        Build fix for building with GTK+ 2.x.
+
+        * tests/testwebview.c:
+
 2012-02-22  Martin Robinson  <mrobin...@igalia.com>
 
         Update the NEWS file in preparation for the 1.7.90 release.

Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/tests/testwebview.c (108997 => 108998)

--- releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/tests/testwebview.c	2012-02-27 16:58:09 UTC (rev 108997)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/tests/testwebview.c	2012-02-27 17:01:53 UTC (rev 108998)
@@ -389,7 +389,12 @@
     GtkWidget *window = gtk_offscreen_window_new();
     GtkWidget *webView = webkit_web_view_new();
     GtkWidget *entry = gtk_entry_new();
+
+#ifdef GTK_API_VERSION_2
+    GtkWidget *box = gtk_hbox_new(FALSE, 0);
+#else
     GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+#endif
 
     gtk_container_add(GTK_CONTAINER(box), webView);
     gtk_container_add(GTK_CONTAINER(box), entry);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes