[epiphany] Make it build with current WebKit master

[Carlos Garcia Campos <carlosgc src gnome org>]

commit ef5f4dfb87d544c3c3b92ebbfbb73f1fa8ca3cc4
Author: Carlos Garcia Campos <cgarcia igalia com>
Date:   Tue Jul 29 17:01:27 2014 +0200

    Make it build with current WebKit master
    
    WebKitWebViewGroup has been removed .

 embed/ephy-embed-prefs.c |   21 +++++++++++++++++----
 embed/ephy-embed-prefs.h |    2 +-
 embed/ephy-embed-shell.c |    2 +-
 embed/ephy-web-view.c    |   10 ++++++++--
 4 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index 2f39be2..77575fb 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -43,7 +43,9 @@ typedef struct
 #define ENABLE_SCRIPTS_SETTING "enable-javascript"
 #define DEFAULT_ENCODING_SETTING "default-charset"
 static WebKitSettings *webkit_settings = NULL;
+#if !WEBKIT_CHECK_VERSION(2, 5, 0)
 static WebKitWebViewGroup *web_view_group = NULL;
+#endif
 
 static void
 user_style_sheet_output_stream_splice_cb (GOutputStream *output_stream,
@@ -544,15 +546,22 @@ ephy_embed_prefs_init (gpointer user_data)
 {
   int i;
 
+#if WEBKIT_CHECK_VERSION(2, 5, 0)
+  webkit_settings = webkit_settings_new_with_settings ("enable-developer-extras", TRUE,
+                                                       "enable-fullscreen", TRUE,
+                                                       "enable-site-specific-quirks", TRUE,
+                                                       "enable-dns-prefetching", TRUE,
+                                                       NULL);
+#else
   web_view_group = webkit_web_view_group_new ("Ephy WebView Group");
   webkit_settings = webkit_web_view_group_get_settings (web_view_group);
-
   g_object_set (webkit_settings,
                 "enable-developer-extras", TRUE,
                 "enable-fullscreen", TRUE,
                 "enable-site-specific-quirks", TRUE,
                 "enable-dns-prefetching", TRUE,
                 NULL);
+#endif
 
   for (i = 0; i < G_N_ELEMENTS (webkit_pref_entries); i++) {
     GSettings *settings;
@@ -607,12 +616,16 @@ ephy_embed_prefs_init (gpointer user_data)
                    EPHY_PREFS_ENABLE_SMOOTH_SCROLLING,
                    webkit_settings, "enable-smooth-scrolling",
                    G_SETTINGS_BIND_GET);
-
+#if WEBKIT_CHECK_VERSION(2, 5, 0)
+  return webkit_settings;
+#else
   return web_view_group;
+#endif
 }
 
-WebKitWebViewGroup *
-ephy_embed_prefs_get_web_view_group (void)
+/* FIXME: Use WebKitSettings * when we bump WebKitGTK requirements */
+GObject *
+ephy_embed_prefs_get_settings (void)
 {
   static GOnce once_init = G_ONCE_INIT;
 
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index e7d47ae..037d905 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -34,7 +34,7 @@
 
 G_BEGIN_DECLS
 
-WebKitWebViewGroup *ephy_embed_prefs_get_web_view_group (void);
+GObject *ephy_embed_prefs_get_settings (void);
 void ephy_embed_prefs_set_cookie_accept_policy          (WebKitCookieManager *cookie_manager,
                                                          const char          *settings_policy);
 
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 9cf764f..f4e9e5d 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -652,7 +652,7 @@ ephy_embed_shell_shutdown (GApplication* application)
 
   g_list_foreach (priv->web_extensions, (GFunc)ephy_embed_shell_unwatch_web_extension, application);
 
-  g_object_unref (ephy_embed_prefs_get_web_view_group ());
+  g_object_unref (ephy_embed_prefs_get_settings ());
   ephy_embed_utils_shutdown ();
 }
 
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index d3b7f05..d74e649 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1992,8 +1992,10 @@ ephy_web_view_new (void)
   return g_object_new (EPHY_TYPE_WEB_VIEW,
 #if WEBKIT_CHECK_VERSION(2, 5, 0)
                        "user-content-manager", ephy_embed_shell_get_user_content_manager 
(ephy_embed_shell_get_default ()),
+                       "settings", ephy_embed_prefs_get_settings (),
+#else
+                       "group", ephy_embed_prefs_get_settings (),
 #endif
-                       "group", ephy_embed_prefs_get_web_view_group (),
                        NULL);
 }
 
@@ -2002,7 +2004,11 @@ ephy_web_view_new_with_related_view (WebKitWebView *related_view)
 {
   return g_object_new (EPHY_TYPE_WEB_VIEW,
                        "related-view", related_view,
-                       "group", ephy_embed_prefs_get_web_view_group (),
+#if WEBKIT_CHECK_VERSION(2, 5, 0)
+                       "settings", ephy_embed_prefs_get_settings (),
+#else
+                       "group", ephy_embed_prefs_get_settings (),
+#endif
                        NULL);
 }