diff options
| author | Jan Michael C. Alonzo <jmalonzo@src.gnome.org> | 2007-11-12 20:37:41 +0800 |
|---|---|---|
| committer | Jan Michael C. Alonzo <jmalonzo@src.gnome.org> | 2007-11-12 20:37:41 +0800 |
| commit | 39fb4a9ef1624004a7df24a79a403fa0d36dfd3c (patch) | |
| tree | 71c00956c227ebc96f9cdc13ea073add477dfa78 /embed | |
| parent | 233e0a3956148836b879560954fb6dc22af72d27 (diff) | |
| download | gsoc2013-epiphany-39fb4a9ef1624004a7df24a79a403fa0d36dfd3c.tar gsoc2013-epiphany-39fb4a9ef1624004a7df24a79a403fa0d36dfd3c.tar.gz gsoc2013-epiphany-39fb4a9ef1624004a7df24a79a403fa0d36dfd3c.tar.bz2 gsoc2013-epiphany-39fb4a9ef1624004a7df24a79a403fa0d36dfd3c.tar.lz gsoc2013-epiphany-39fb4a9ef1624004a7df24a79a403fa0d36dfd3c.tar.xz gsoc2013-epiphany-39fb4a9ef1624004a7df24a79a403fa0d36dfd3c.tar.zst gsoc2013-epiphany-39fb4a9ef1624004a7df24a79a403fa0d36dfd3c.zip | |
Call webkit_init in engine initialization to avoid crashes. (Bug #496114)
svn path=/trunk/; revision=7674
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/webkit/webkit-embed-single.cpp | 4 | ||||
| -rw-r--r-- | embed/webkit/webkit-embed.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/embed/webkit/webkit-embed-single.cpp b/embed/webkit/webkit-embed-single.cpp index a77e6d5d0..e1d3e2b01 100644 --- a/embed/webkit/webkit-embed-single.cpp +++ b/embed/webkit/webkit-embed-single.cpp @@ -23,6 +23,8 @@ #include <glib/gi18n.h> #include <libgnomevfs/gnome-vfs-utils.h> +#include <webkitgtkglobal.h> + #include "webkit-embed-single.h" #include "ephy-embed-single.h" #include "ephy-cookie-manager.h" @@ -211,6 +213,8 @@ impl_permission_manager_test (EphyPermissionManager *manager, static gboolean impl_init (EphyEmbedSingle *esingle) { + webkit_init(); + return TRUE; } diff --git a/embed/webkit/webkit-embed.cpp b/embed/webkit/webkit-embed.cpp index cbd9bb8ed..742fe99c3 100644 --- a/embed/webkit/webkit-embed.cpp +++ b/embed/webkit/webkit-embed.cpp @@ -31,7 +31,6 @@ #include <webkitgtkframe.h> #include <webkitgtkpage.h> -#include <webkitgtkglobal.h> #include <string.h> #include "webkit-embed.h" @@ -205,7 +204,6 @@ webkit_embed_init (WebKitEmbed *embed) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - webkit_init (); page = WEBKIT_PAGE (webkit_page_new ()); embed->priv->page = page; gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (page)); |