Fold WebKitEmbedPrefs into EphyEmbedPrefs.

7 files changed, 46 insertions, 48 deletions

diff --git a/embed/Makefile.am b/embed/Makefile.am
index 03281c2a3..105efb748 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -56,9 +56,8 @@ libephyembed_la_SOURCES = \
 	ephy-history.c			\
 	ephy-password-manager.c		\
 	ephy-permission-manager.c	\
+	ephy-embed-prefs.c		\
 	ephy-web-view.c			\
-	webkit-embed-prefs.c            \
-	webkit-embed-prefs.h            \
 	$(INST_H_FILES)			\
 	$(NOINST_H_FILES)
 
diff --git a/embed/webkit-embed-prefs.c b/embed/ephy-embed-prefs.c
index bcddd9523..df1c79bef 100644
--- a/embed/webkit-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -22,7 +22,6 @@
 #include <glib.h>
 #include <webkit/webkit.h>
 
-#include "webkit-embed-prefs.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-embed-prefs.h"
 #include "ephy-embed-utils.h"
@@ -195,14 +194,14 @@ static const PrefData webkit_pref_entries[] =
   };
 
 static void
-webkit_embed_prefs_apply (EphyEmbed *embed, WebKitWebSettings *settings)
+ephy_embed_prefs_apply (EphyEmbed *embed, WebKitWebSettings *settings)
 {
   webkit_web_view_set_settings (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed),
                                 settings);
 }
 
 void
-webkit_embed_prefs_init (void)
+ephy_embed_prefs_init (void)
 {
   int i;
 
@@ -222,7 +221,7 @@ webkit_embed_prefs_init (void)
 }
 
 void
-webkit_embed_prefs_shutdown (void)
+ephy_embed_prefs_shutdown (void)
 {
   int i;
 
@@ -234,8 +233,8 @@ webkit_embed_prefs_shutdown (void)
 }
 
 void
-webkit_embed_prefs_add_embed (EphyEmbed *embed)
+ephy_embed_prefs_add_embed (EphyEmbed *embed)
 {
-  webkit_embed_prefs_apply (embed, settings);
+  ephy_embed_prefs_apply (embed, settings);
 }
 
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index 3bfc0342c..680ea8cf2 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -1,3 +1,28 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
+/*  Copyright © 2008 Xan Lopez <xan@gnome.org>
+ *  Copyright © 2009 Igalia S.L.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef __EPHY_EMBED_PREFS_H__
+#define __EPHY_EMBED_PREFS_H__
+
+#include "ephy-embed.h"
+
 #define CONF_NETWORK_CACHE_SIZE "/apps/epiphany/web/cache_size"
 #define CONF_RENDERING_FONT "/apps/epiphany/web/font"
 #define CONF_RENDERING_FONT_MIN_SIZE "/apps/epiphany/web/minimum_font_size"
@@ -44,3 +69,13 @@
 #endif
 
 #define USER_STYLESHEET_FILENAME	"user-stylesheet.css"
+
+G_BEGIN_DECLS
+
+void ephy_embed_prefs_init         (void);
+void ephy_embed_prefs_shutdown     (void);
+void ephy_embed_prefs_add_embed    (EphyEmbed *embed);
+
+G_END_DECLS
+
+#endif /* __EPHY_EMBED_PREFS_H__ */
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index d3b092396..b32fd49fe 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -48,9 +48,8 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "webkit-embed-prefs.h"
+#include "ephy-embed-prefs.h"
 #include "ephy-embed.h"
-#include "ephy-base-embed.h"
 
 static void     ephy_embed_class_init (EphyEmbedClass *klass);
 static void     ephy_embed_init       (EphyEmbed *gs);
@@ -804,7 +803,7 @@ ephy_embed_init (EphyEmbed *embed)
                     embed->priv->inspector_window,
                     NULL);
 
-  webkit_embed_prefs_add_embed (embed);
+  ephy_embed_prefs_add_embed (embed);
 
   embed->priv->history = EPHY_HISTORY (ephy_embed_shell_get_global_history (ephy_embed_shell_get_default ()));
 }
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 3f1c40179..9664ec1d9 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -28,7 +28,6 @@
 #include <webkit/webkit.h>
 
 #include "eel-gconf-extensions.h"
-#include "ephy-base-embed.h"
 #include "ephy-debug.h"
 #include "ephy-embed.h"
 #include "ephy-embed-container.h"
diff --git a/embed/webkit-embed-prefs.h b/embed/webkit-embed-prefs.h
deleted file mode 100644
index 37f109bb3..000000000
--- a/embed/webkit-embed-prefs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-/*  Copyright © 2008 Xan Lopez <xan@gnome.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef __WEBKIT_EMBED_PREFS_H__
-#define __WEBKIT_EMBED_PREFS_H__
-
-#include "ephy-embed.h"
-
-G_BEGIN_DECLS
-
-void webkit_embed_prefs_init         (void);
-void webkit_embed_prefs_shutdown     (void);
-void webkit_embed_prefs_add_embed    (EphyEmbed *embed);
-
-G_END_DECLS
-
-#endif /* __WEBKIT_EMBED_PREFS_H__ */
diff --git a/embed/webkit/webkit-embed-single.c b/embed/webkit/webkit-embed-single.c
index 8fcf631ee..af6cbc6e2 100644
--- a/embed/webkit/webkit-embed-single.c
+++ b/embed/webkit/webkit-embed-single.c
@@ -23,7 +23,7 @@
 #include <libsoup/soup-gnome.h>
 
 #include "webkit-embed-single.h"
-#include "webkit-embed-prefs.h"
+#include "ephy-embed-prefs.h"
 #include "ephy-embed-single.h"
 #include "ephy-file-helpers.h"
 #include "ephy-password-manager.h"
@@ -89,7 +89,7 @@ webkit_embed_single_init (WebKitEmbedSingle *wes)
 static void
 webkit_embed_single_finalize (GObject *object)
 {
-  webkit_embed_prefs_shutdown ();
+  ephy_embed_prefs_shutdown ();
 
   G_OBJECT_CLASS (webkit_embed_single_parent_class)->finalize (object);
 }
@@ -188,7 +188,7 @@ impl_init (EphyEmbedSingle *esingle)
   SoupCookieJar *jar;
   char *filename;
 
-  webkit_embed_prefs_init ();
+  ephy_embed_prefs_init ();
 
   session = webkit_get_default_session ();