1 files changed, 5 insertions, 85 deletions

diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index a30eb4194..dac415cc1 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -21,10 +21,6 @@
 #ifndef EPHY_EMBED_SINGLE_H
 #define EPHY_EMBED_SINGLE_H
 
-#include "ephy-embed.h"
-#include "ephy-history.h"
-#include "ephy-langs.h"
-
 #include <glib-object.h>
 #include <glib.h>
 
@@ -35,60 +31,14 @@ G_BEGIN_DECLS
 #define EPHY_EMBED_SINGLE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleClass))
 #define EPHY_IS_EMBED_SINGLE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_SINGLE))
 #define EPHY_IS_EMBED_SINGLE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_SINGLE))
-#define EPHY_EMBED_SINGLE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleClass))
-
-typedef struct EphyEmbedSingleClass EphyEmbedSingleClass;
-typedef struct EphyEmbedSingle EphyEmbedSingle;
-typedef struct EphyEmbedSinglePrivate EphyEmbedSinglePrivate;
+#define EPHY_EMBED_SINGLE_GET_CLASS(i)	(G_TYPE_INSTANCE_GET_INTERFACE ((i), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleClass))
 
-/**
- * Cookie: the type of cookies
- */
-typedef struct
-{
-	gchar *domain;
-	gchar *name;
-	gchar *value;
-	gchar *path;
-	gchar *secure;
-	gchar *expire;
-} CookieInfo;
-
-/**
- * Password: a password manager entry
- */
-typedef struct
-{
-	gchar *host;
-	gchar *username;
-} PasswordInfo;
-
-/**
- * PasswordType: To distinguish actual passwords from blocked password sites
- */
-typedef enum
-{
-	PASSWORD_PASSWORD,
-	PASSWORD_REJECT
-} PasswordType;
-
-typedef enum
-{
-	COOKIES_PERMISSION,
-	IMAGES_PERMISSION
-} PermissionType;
-
-struct EphyEmbedSingle
-{
-	GObject parent;
-
-	/*< private >*/
-	EphyEmbedSinglePrivate *priv;
-};
+typedef struct EphyEmbedSingleClass	EphyEmbedSingleClass;
+typedef struct EphyEmbedSingle		EphyEmbedSingle;
 
 struct EphyEmbedSingleClass
 {
-	GObjectClass parent_class;
+	GTypeInterface base_iface;
 
 	/* Signals */
 
@@ -103,18 +53,8 @@ struct EphyEmbedSingleClass
 					 gboolean offline);
 	void	(* load_proxy_autoconf) (EphyEmbedSingle *shell,
 					 const char* url);
-	void	(* show_java_console)   (EphyEmbedSingle *shell);
-	void	(* show_js_console)     (EphyEmbedSingle *shell);
 	GList *	(* get_font_list)	(EphyEmbedSingle *shell,
 					 const char *langGroup);
-	GList *	(* list_cookies)        (EphyEmbedSingle *shell);
-	void	(* remove_cookies)      (EphyEmbedSingle *shell,
-					 GList *cookies);
-	GList *	(* list_passwords)      (EphyEmbedSingle *shell,
-					 PasswordType type);
-	void	(* remove_passwords)    (EphyEmbedSingle *shell,
-					 GList *passwords,
-					 PasswordType type);
 };
 
 GType	ephy_embed_single_get_type		(void);
@@ -125,31 +65,11 @@ void	ephy_embed_single_set_offline_mode	(EphyEmbedSingle *shell,
 						 gboolean offline);
 
 void	ephy_embed_single_load_proxy_autoconf	(EphyEmbedSingle *shell,
-						const char* url);
+						 const char* url);
 
 GList  *ephy_embed_single_get_font_list		(EphyEmbedSingle *shell,
 						 const char *langGroup);
 
-/* Cookies */
-GList  *ephy_embed_single_list_cookies		(EphyEmbedSingle *shell);
-
-void	ephy_embed_single_remove_cookies	(EphyEmbedSingle *shell,
-						 GList *cookies);
-
-void	ephy_embed_single_free_cookies		(EphyEmbedSingle *shell,
-						 GList *cookies);
-
-/* Passwords */
-GList  *ephy_embed_single_list_passwords	(EphyEmbedSingle *shell,
-						 PasswordType type);
-
-void	ephy_embed_single_free_passwords	(EphyEmbedSingle *shell,
-						 GList *passwords);
-
-void	ephy_embed_single_remove_passwords	(EphyEmbedSingle *shell,
-						 GList *passwords,
-						 PasswordType type);
-
 G_END_DECLS
 
 #endif