Title: [89255] trunk/Tools
- Revision
- 89255
- Author
- [email protected]
- Date
- 2011-06-20 10:35:31 -0700 (Mon, 20 Jun 2011)
Log Message
2011-06-20 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix WebKit2 GTK build after r89249.
* GtkLauncher/main.c:
(main):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89254 => 89255)
--- trunk/Tools/ChangeLog 2011-06-20 17:18:47 UTC (rev 89254)
+++ trunk/Tools/ChangeLog 2011-06-20 17:35:31 UTC (rev 89255)
@@ -1,3 +1,10 @@
+2011-06-20 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix WebKit2 GTK build after r89249.
+
+ * GtkLauncher/main.c:
+ (main):
+
2011-06-20 Pavel Feldman <[email protected]>
Reviewed by Yury Semikhatsky.
Modified: trunk/Tools/GtkLauncher/main.c (89254 => 89255)
--- trunk/Tools/GtkLauncher/main.c 2011-06-20 17:18:47 UTC (rev 89254)
+++ trunk/Tools/GtkLauncher/main.c 2011-06-20 17:35:31 UTC (rev 89255)
@@ -239,6 +239,7 @@
return fileURL;
}
+#ifndef WEBKIT2
gboolean parseOptionEntryCallback(const gchar *optionNameFull, const gchar *value, gpointer data, GError **error)
{
WebKitWebSettings *webkitSettings = (WebKitWebSettings *)data;
@@ -368,6 +369,8 @@
g_array_free(optionEntriesArray, TRUE);
return TRUE;
}
+#endif
+
int main(int argc, char* argv[])
{
WebKitWebView *webView;
@@ -392,8 +395,10 @@
main_window = createWindow(&webView);
+#ifndef WEBKIT2
if (!parseAdditionalOptions(webView, argc, argv))
return 1;
+#endif
gchar *uri =(gchar*)(argc > 1 ? argv[1] : "http://www.google.com/");
gchar *fileURL = filenameToURL(uri);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
