*** empty log message ***

1 files changed, 4 insertions, 182 deletions

diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index e7d789d57..a5027bdfc 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -20,6 +20,7 @@
 #define EPHY_EMBED_SHELL_H
 
 #include "ephy-embed.h"
+#include "ephy-embed-single.h"
 #include "ephy-favicon-cache.h"
 #include "ephy-history.h"
 #include "downloader-view.h"
@@ -44,87 +45,6 @@ typedef struct EphyEmbedShellPrivate EphyEmbedShellPrivate;
 
 extern EphyEmbedShell *embed_shell;
 
-/**
- * FilePickerMode: What mode FilePicker should run in
- */
-
-typedef enum
-{
-        modeOpen = 0,
-        modeSave = 1,
-        modeGetFolder =2
-} FilePickerMode;
-
-typedef struct
-{
-        /* description of the file format */
-        gchar *description;
-        /* tipical sufixes, NULL terminated */
-        gchar **extensions;
-} FileFormat;
-
-/**
- * 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;
-
-typedef struct
-{
-	const char *name;
-	const char *title;
-} CharsetInfo;
-
-/**
- * PasswordType: To distinguish actual passwords from blocked password sites
- */
-typedef enum
-{
-        PASSWORD_PASSWORD,
-        PASSWORD_REJECT
-} PasswordType;
-
-typedef enum
-{
-	COOKIES_PERMISSION,
-	IMAGES_PERMISSION
-} PermissionType;
-
-typedef enum
-{
-	DISK_CACHE = 2,
-	MEMORY_CACHE = 1
-} CacheType;
-
-typedef enum
-{
-	CACHE_CLEAR_CAP = 1 << 0,
-	OFFLINE_CAP = 1 << 1,
-	PROXY_AUTOCONF_CAP = 1 << 2,
-	JAVA_CONSOLE_CAP = 1 << 3,
-	JS_CONSOLE_CAP = 1 << 4,
-	CHARSETS_CAP = 1 << 5,
-	COOKIES_CAP = 1 << 7,
-	PASSWORDS_CAP = 1 << 8,
-	FILEPICKER_CAP = 1 << 9
-} EmbedShellCapabilities;
-
 struct EphyEmbedShell
 {
 	GObject parent;
@@ -144,49 +64,8 @@ struct EphyEmbedShellClass
 						 char *param);
 
 	/* Methods */
-
-	void		(* get_capabilities)    (EphyEmbedShell *shell,
-						 EmbedShellCapabilities *caps);
-	EphyHistory   * (* get_global_history)  (EphyEmbedShell *shell);
-	DownloaderView* (* get_downloader_view) (EphyEmbedShell *shell);
-	gresult         (* clear_cache)         (EphyEmbedShell *shell,
-						 CacheType type);
-	gresult         (* set_offline_mode)    (EphyEmbedShell *shell,
-						 gboolean offline);
-	gresult         (* load_proxy_autoconf) (EphyEmbedShell *shell,
-					         const char* url);
-	gresult         (* show_java_console)   (EphyEmbedShell *shell);
-	gresult         (* show_js_console)     (EphyEmbedShell *shell);
-	gresult		(* get_charset_groups)  (EphyEmbedShell *shell,
-						 GList **groups);
-	gresult         (* get_charset_titles)  (EphyEmbedShell *shell,
-						 const char *group,
-						 GList **charsets);
-	gresult		(* get_font_list)	(EphyEmbedShell *shell,
-						 const char *langGroup,
-						 const char *fontType,
-						 GList **fontList,
-						 char **default_font);
-	gresult         (* list_cookies)        (EphyEmbedShell *shell,
-						 GList **cokies);
-	gresult         (* remove_cookies)      (EphyEmbedShell *shell,
-						 GList *cookies);
-	gresult         (* list_passwords)      (EphyEmbedShell *shell,
-						 PasswordType type,
-						 GList **passwords);
-	gresult         (* remove_passwords)    (EphyEmbedShell *shell,
-						 GList *passwords,
-						 PasswordType type);
-	gresult         (* show_file_picker)    (EphyEmbedShell *shell,
-						 GtkWidget *parentWidget,
-						 const char* title,
-						 const char* directory,
-						 const char* file,
-						 FilePickerMode mode,
-						 char **ret_fullpath,
-						 gboolean *ret_save_content,
-						 FileFormat *file_formats,
-						 gint *ret_file_format);
+	EphyHistory    * (* get_global_history)  (EphyEmbedShell *shell);
+	DownloaderView * (* get_downloader_view) (EphyEmbedShell *shell);
 };
 
 GType             ephy_embed_shell_get_type            (void);
@@ -207,68 +86,11 @@ EphyEmbed        *ephy_embed_shell_get_active_embed    (EphyEmbedShell *ges);
 
 GList            *ephy_embed_shell_get_embeds          (EphyEmbedShell *ges);
 
-void              ephy_embed_shell_get_capabilities    (EphyEmbedShell *shell,
-							EmbedShellCapabilities *caps);
-
 EphyHistory      *ephy_embed_shell_get_global_history  (EphyEmbedShell *shell);
 
 DownloaderView   *ephy_embed_shell_get_downloader_view (EphyEmbedShell *shell);
 
-gresult           ephy_embed_shell_clear_cache         (EphyEmbedShell *shell,
-							CacheType type);
-
-gresult           ephy_embed_shell_set_offline_mode    (EphyEmbedShell *shell,
-							gboolean offline);
-
-gresult           ephy_embed_shell_load_proxy_autoconf (EphyEmbedShell *shell,
-							const char* url);
-
-/* Charsets */
-gresult		  ephy_embed_shell_get_charset_groups  (EphyEmbedShell *shell,
-							GList **groups);
-
-gresult           ephy_embed_shell_get_charset_titles  (EphyEmbedShell *shell,
-							const char *group,
-							GList **charsets);
-
-gresult           ephy_embed_shell_get_font_list       (EphyEmbedShell *shell,
-							const char *langGroup,
-							const char *fontType,
-							GList **fontList,
-							char **default_font);
-
-/* Cookies */
-gresult           ephy_embed_shell_list_cookies        (EphyEmbedShell *shell,
-							GList **cookies);
-
-gresult           ephy_embed_shell_remove_cookies      (EphyEmbedShell *shell,
-							GList *cookies);
-
-gresult		  ephy_embed_shell_free_cookies        (EphyEmbedShell *shell,
-							GList *cookies);
-
-/* Passwords */
-gresult           ephy_embed_shell_list_passwords      (EphyEmbedShell *shell,
-							PasswordType type,
-							GList **passwords);
-
-gresult		  ephy_embed_shell_free_passwords      (EphyEmbedShell *shell,
-							GList *passwords);
-
-gresult           ephy_embed_shell_remove_passwords    (EphyEmbedShell *shell,
-							GList *passwords,
-							PasswordType type);
-
-gresult           ephy_embed_shell_show_file_picker    (EphyEmbedShell *shell,
-							GtkWidget *parentWidget,
-							const char *title,
-							const char *directory,
-							const char *file,
-							FilePickerMode mode,
-							char **ret_fullpath,
-							gboolean *ret_save_content,
-							FileFormat *file_formats,
-							int *ret_file_format);
+EphyEmbedSingle  *ephy_embed_shell_get_embed_single    (EphyEmbedShell *shell);
 
 G_END_DECLS