From 768eae4a4874a7fe0eada98423f61d84f6416bde Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 5 Feb 2003 20:28:09 +0000 Subject: *** empty log message *** --- embed/Makefile.am | 2 + embed/ephy-embed-event.h | 1 - embed/ephy-embed-shell.c | 196 +----- embed/ephy-embed-shell.h | 186 +----- embed/ephy-embed-utils.c | 28 +- embed/ephy-embed.c | 6 +- embed/ephy-embed.h | 2 +- embed/mozilla/ContentHandler.h | 2 +- embed/mozilla/EventContext.cpp | 4 - embed/mozilla/GlobalHistory.cpp | 2 +- embed/mozilla/Makefile.am | 13 +- embed/mozilla/MozRegisterComponents.cpp | 24 - embed/mozilla/PromptService.cpp | 1 + embed/mozilla/mozilla-embed-shell.cpp | 1000 ------------------------------- embed/mozilla/mozilla-embed-shell.h | 55 -- embed/mozilla/mozilla-embed-single.cpp | 958 +++++++++++++++++++++++++++++ embed/mozilla/mozilla-embed-single.h | 53 ++ embed/mozilla/mozilla-notifiers.cpp | 19 +- embed/mozilla/mozilla-notifiers.h | 4 +- embed/mozilla/mozilla-prefs.cpp | 55 +- embed/mozilla/mozilla-prefs.h | 10 +- src/appearance-prefs.c | 10 +- src/ephy-encoding-menu.c | 12 +- src/ephy-nautilus-view.c | 4 + src/ephy-shell.c | 13 +- src/ephy-tab.c | 9 +- src/general-prefs.c | 17 +- src/pdm-dialog.c | 40 +- src/prefs-dialog.c | 16 +- src/window-commands.c | 8 +- 30 files changed, 1205 insertions(+), 1545 deletions(-) delete mode 100644 embed/mozilla/mozilla-embed-shell.cpp delete mode 100644 embed/mozilla/mozilla-embed-shell.h create mode 100644 embed/mozilla/mozilla-embed-single.cpp create mode 100644 embed/mozilla/mozilla-embed-single.h diff --git a/embed/Makefile.am b/embed/Makefile.am index 4a1568ec9..96d440d4f 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -34,6 +34,8 @@ libephyembed_la_SOURCES = \ ephy-embed-popup-control.c \ ephy-embed-popup-control.h \ ephy-embed-prefs.h \ + ephy-embed-single.c \ + ephy-embed-single.h \ ephy-embed-shell.c \ ephy-embed-shell.h \ ephy-embed-types.h \ diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h index 69b3818a4..3c5f3cca4 100644 --- a/embed/ephy-embed-event.h +++ b/embed/ephy-embed-event.h @@ -59,7 +59,6 @@ struct EphyEmbedEvent guint modifier; guint mouse_button; guint context; - guint timestamp; guint mouse_x, mouse_y; }; diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index e4ca5bb73..3569590fa 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -21,7 +21,7 @@ #include "ephy-embed-shell.h" #include "ephy-marshal.h" #include "ephy-favicon-cache.h" -#include "mozilla-embed-shell.h" +#include "mozilla-embed-single.h" #include "ephy-debug.h" #include @@ -39,6 +39,7 @@ struct EphyEmbedShellPrivate DownloaderView *downloader_view; GList *embeds; EphyFaviconCache *favicon_cache; + EphyEmbedSingle *embed_single; }; static void @@ -58,12 +59,6 @@ static guint ephy_embed_shell_signals[LAST_SIGNAL] = { 0 }; EphyEmbedShell *embed_shell; -GType -ephy_embed_shell_get_impl (void) -{ - return MOZILLA_EMBED_SHELL_TYPE; -} - GType ephy_embed_shell_get_type (void) { @@ -130,7 +125,6 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass) static void ephy_embed_shell_init (EphyEmbedShell *ges) { - /* Singleton, globally accessible */ embed_shell = ges; @@ -176,6 +170,12 @@ ephy_embed_shell_finalize (GObject *object) g_object_unref (G_OBJECT (ges->priv->favicon_cache)); } + LOG ("Unref embed single") + if (ges->priv->embed_single) + { + g_object_unref (G_OBJECT (ges->priv->embed_single)); + } + g_free (ges->priv); G_OBJECT_CLASS (parent_class)->finalize (object); @@ -187,7 +187,7 @@ ephy_embed_shell_new (const char *type) if (strcmp (type, "mozilla") == 0) { return EPHY_EMBED_SHELL (g_object_new - (MOZILLA_EMBED_SHELL_TYPE, NULL)); + (EPHY_EMBED_SHELL_TYPE, NULL)); } g_assert_not_reached (); @@ -243,14 +243,6 @@ ephy_embed_shell_get_embeds (EphyEmbedShell *ges) return ges->priv->embeds; } -void -ephy_embed_shell_get_capabilities (EphyEmbedShell *shell, - EmbedShellCapabilities *caps) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->get_capabilities (shell, caps); -} - EphyHistory * ephy_embed_shell_get_global_history (EphyEmbedShell *shell) { @@ -265,128 +257,15 @@ ephy_embed_shell_get_downloader_view (EphyEmbedShell *shell) return klass->get_downloader_view (shell); } -gresult -ephy_embed_shell_clear_cache (EphyEmbedShell *shell, - CacheType type) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->clear_cache (shell, type); -} - -gresult -ephy_embed_shell_set_offline_mode (EphyEmbedShell *shell, - gboolean offline) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->set_offline_mode (shell, offline); -} - -gresult -ephy_embed_shell_load_proxy_autoconf (EphyEmbedShell *shell, - const char* url) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->load_proxy_autoconf (shell, url); -} - -gresult -ephy_embed_shell_get_charset_titles (EphyEmbedShell *shell, - const char *group, - GList **charsets) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->get_charset_titles (shell, group, charsets); -} - -gresult -ephy_embed_shell_get_charset_groups (EphyEmbedShell *shell, - GList **groups) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->get_charset_groups (shell, groups); -} - -gresult -ephy_embed_shell_get_font_list (EphyEmbedShell *shell, - const char *langGroup, - const char *fontType, - GList **fontList, - char **default_font) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->get_font_list (shell, langGroup, fontType, fontList, - default_font); -} - -gresult -ephy_embed_shell_list_cookies (EphyEmbedShell *shell, - GList **cookies) +EphyEmbedSingle * +ephy_embed_shell_get_embed_single (EphyEmbedShell *shell) { - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->list_cookies (shell, cookies); -} - -gresult -ephy_embed_shell_remove_cookies (EphyEmbedShell *shell, - GList *cookies) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->remove_cookies (shell, cookies); -} - -gresult -ephy_embed_shell_list_passwords (EphyEmbedShell *shell, - PasswordType type, - GList **passwords) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->list_passwords (shell, type, passwords); -} + if (!shell->priv->embed_single) + { + shell->priv->embed_single = ephy_embed_single_new ("mozilla"); + } -gresult -ephy_embed_shell_remove_passwords (EphyEmbedShell *shell, - GList *passwords, - PasswordType type) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->remove_passwords (shell, passwords, type); -} - -/** - * show_file_picker: Shows a file picker. Can be configured to select a - * file or a directory. - * @parentWidget: Parent Widget for file picker. - * @title: Title for file picker. - * @directory: Initial directory to start in. - * @file: Initial filename to show in filepicker. - * @mode: Mode to run filepicker in (modeOpen, modeSave, modeGetFolder) - * @ret_fullpath: On a successful return, will hold the full path to selected - * file or directory. - * @file_formats: an array of FileFormat structures to fill the format chooser - * optionmenu. NULL if not needed. The last item must have - * description == NULL. - * @ret_file_format: where to store the index of the format selected (can be - * NULL) - * returns: TRUE for success, FALSE for failure. - */ - -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) -{ - EphyEmbedShellClass *klass = EPHY_EMBED_SHELL_GET_CLASS (shell); - return klass->show_file_picker (shell, parentWidget, title, - directory, file, mode, - ret_fullpath, ret_save_content, - file_formats, ret_file_format); + return shell->priv->embed_single; } static EphyHistory * @@ -414,46 +293,3 @@ impl_get_downloader_view (EphyEmbedShell *shell) return shell->priv->downloader_view; } -gresult -ephy_embed_shell_free_cookies (EphyEmbedShell *shell, - GList *cookies) -{ - GList *l; - - for (l = cookies; l != NULL; l = l->next) - { - CookieInfo *info = (CookieInfo *)l->data; - - g_free (info->domain); - g_free (info->name); - g_free (info->value); - g_free (info->path); - g_free (info->secure); - g_free (info->expire); - g_free (info); - } - - g_list_free (cookies); - - return G_OK; -} - -gresult -ephy_embed_shell_free_passwords (EphyEmbedShell *shell, - GList *passwords) -{ - GList *l; - - for (l = passwords; l != NULL; l = l->next) - { - PasswordInfo *info = (PasswordInfo *)l->data; - g_free (info->host); - g_free (info->username); - g_free (info); - } - - g_list_free (passwords); - - return G_OK; -} - 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 diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c index 8a8e116f7..29b06bee3 100644 --- a/embed/ephy-embed-utils.c +++ b/embed/ephy-embed-utils.c @@ -58,6 +58,10 @@ ephy_embed_utils_save (GtkWidget *window, EphyEmbed *embed; EmbedPersistFlags flags; gboolean content; + EphyEmbedSingle *single; + + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (embed_shell)); g_object_ref (G_OBJECT(persist)); @@ -123,12 +127,12 @@ ephy_embed_utils_save (GtkWidget *window, if (ask_dest) { /* show the file picker */ - ret = ephy_embed_shell_show_file_picker - (embed_shell, window, - _("Select the destination filename"), - dirName, fileName, modeSave, &retPath, - ask_content ? &content : NULL, - NULL, NULL); + ret = ephy_embed_single_show_file_picker + (single, window, + _("Select the destination filename"), + dirName, fileName, modeSave, &retPath, + ask_content ? &content : NULL, + NULL, NULL); } if (ret == G_OK) @@ -232,11 +236,15 @@ ephy_embed_utils_build_charsets_submenu (BonoboUIComponent *ui_component, GList *verbs = NULL; int group_index = 0; int charset_index = 0; + EphyEmbedSingle *single; + + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (embed_shell)); START_PROFILER ("Charsets menu") g_return_if_fail (IS_EPHY_EMBED_SHELL (embed_shell)); - g_return_if_fail (ephy_embed_shell_get_charset_groups (embed_shell, &groups) == G_OK); + g_return_if_fail (ephy_embed_single_get_charset_groups (single, &groups) == G_OK); xml_string = g_string_new (NULL); g_string_append (xml_string, ""); @@ -248,9 +256,9 @@ ephy_embed_utils_build_charsets_submenu (BonoboUIComponent *ui_component, build_group (xml_string, group, group_index); - ephy_embed_shell_get_charset_titles (embed_shell, - group, - &charsets); + ephy_embed_single_get_charset_titles (single, + group, + &charsets); for (cl = charsets; cl != NULL; cl = cl->next) { diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 6c8b98aaa..6c6406d9c 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -22,9 +22,9 @@ #include "ephy-marshal.h" #include "ephy-embed.h" +#include "mozilla-embed-single.h" #include "mozilla-embed.h" -#include "mozilla-embed-shell.h" enum { @@ -254,9 +254,9 @@ ephy_embed_base_init (gpointer g_class) } EphyEmbed * -ephy_embed_new (GObject *shell) +ephy_embed_new (GObject *single) { - if (IS_MOZILLA_EMBED_SHELL (shell)) + if (IS_MOZILLA_EMBED_SINGLE (single)) { return EPHY_EMBED (g_object_new (MOZILLA_EMBED_TYPE, NULL)); diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h index d35a03ebf..73671ccbd 100644 --- a/embed/ephy-embed.h +++ b/embed/ephy-embed.h @@ -280,7 +280,7 @@ GType ephy_embed_get_type (void); /* Base */ -EphyEmbed *ephy_embed_new (GObject *shell); +EphyEmbed *ephy_embed_new (GObject *single); void ephy_embed_get_capabilities (EphyEmbed *embed, EmbedCapabilities *caps); diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h index 6ae61f657..4a6d816d7 100644 --- a/embed/mozilla/ContentHandler.h +++ b/embed/mozilla/ContentHandler.h @@ -19,7 +19,7 @@ #ifndef __ContentHandler_h #define __ContentHandler_h -#include "mozilla-embed-shell.h" +#include "ephy-embed-shell.h" #include #include "nsIHelperAppLauncherDialog.h" diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp index 9d4e312b6..78a01e451 100644 --- a/embed/mozilla/EventContext.cpp +++ b/embed/mozilla/EventContext.cpp @@ -525,16 +525,12 @@ nsresult EventContext::GetCSSBackground (nsIDOMNode *node, nsAutoString& url) nsresult EventContext::GetMouseEventInfo (EphyEmbedEvent *info) { nsresult result; - DOMTimeStamp ts; nsIDOMMouseEvent *aMouseEvent = (nsIDOMMouseEvent*)mEvent; aMouseEvent->GetButton ((PRUint16*)&info->mouse_button); aMouseEvent->GetScreenX ((PRInt32*)&info->mouse_x); aMouseEvent->GetScreenY ((PRInt32*)&info->mouse_y); - aMouseEvent->GetTimeStamp(&ts); - info->timestamp = ts; - /* be sure we are not clicking on the scroolbars */ nsCOMPtr nsEvent = do_QueryInterface(aMouseEvent, &result); diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp index 054b7a5df..8507ad7e9 100644 --- a/embed/mozilla/GlobalHistory.cpp +++ b/embed/mozilla/GlobalHistory.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "mozilla-embed-shell.h" +#include "ephy-embed-shell.h" #include "nsCOMPtr.h" #include "nsISupportsArray.h" diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index dd24d6c1e..34db7859e 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -61,6 +61,8 @@ libephymozillaembed_la_SOURCES = \ BaseProtocolContentHandler.h \ ContentHandler.cpp \ ContentHandler.h \ + EphyEventListener.cpp \ + EphyEventListener.h \ EphyWrapper.cpp \ EphyWrapper.h \ EventContext.cpp \ @@ -91,14 +93,12 @@ libephymozillaembed_la_SOURCES = \ ProgressListener.h \ StartHereProtocolHandler.cpp \ StartHereProtocolHandler.h \ - EphyEventListener.cpp \ - EphyEventListener.h \ mozilla-embed.cpp \ mozilla-embed.h \ mozilla-embed-persist.cpp \ mozilla-embed-persist.h \ - mozilla-embed-shell.cpp \ - mozilla-embed-shell.h \ + mozilla-embed-single.cpp \ + mozilla-embed-single.h \ mozilla-i18n.c \ mozilla-i18n.h \ mozilla-notifiers.cpp \ @@ -107,3 +107,8 @@ libephymozillaembed_la_SOURCES = \ mozilla-prefs.h \ nsUnicharUtils.cpp \ nsUnicharUtils.h + +mozilla_DATA = default-prefs.js +mozilladir = $(pkgdatadir) + +EXTRA_DIST = $(mozilla_DATA) diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp index 3c5e64be7..a8950fc70 100644 --- a/embed/mozilla/MozRegisterComponents.cpp +++ b/embed/mozilla/MozRegisterComponents.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include @@ -55,10 +54,6 @@ NS_METHOD RegisterFactory (nsresult (aFactoryFunc)(nsIFactory** aFactory), const nsCID & aClass, const char *aClassName, const char *aContractID, PRBool aReplace); -NS_METHOD RegisterComponent (const nsCID & aClass, const char *aClassName, - const char *aContractID, const char *aDLLPath, - PRBool aReplace); - //Annoying globals to track the mozilla ftp handler so it can be restored. static PRBool ftpRegistered = PR_FALSE; static nsCOMPtr nsFtpFactory; @@ -144,25 +139,6 @@ NS_METHOD RegisterFactory (nsresult (aFactoryFunc)(nsIFactory** aFactory), return rv; } -NS_METHOD RegisterComponent (const nsCID & aClass, const char *aClassName, - const char *aContractID, const char *aDLLPath, - PRBool aReplace) -{ - nsresult rv = NS_OK; - - nsCOMPtr dllFile; - rv = NS_NewLocalFile (NS_ConvertUTF8toUCS2(aDLLPath), PR_TRUE, getter_AddRefs (dllFile)); - if (NS_FAILED(rv)) return NS_ERROR_FAILURE; - - rv = nsComponentManager::RegisterComponentSpec (aClass, - aClassName, - aContractID, - dllFile, - aReplace, - PR_FALSE); - return rv; -} - /** * mozilla_register_FtpProtocolHandler: Register Ftp Protocol Handler */ diff --git a/embed/mozilla/PromptService.cpp b/embed/mozilla/PromptService.cpp index e6181ae32..6674bdd63 100644 --- a/embed/mozilla/PromptService.cpp +++ b/embed/mozilla/PromptService.cpp @@ -143,6 +143,7 @@ NS_IMETHODIMP CPromptService::AlertCheck (nsIDOMWindow *parent, set_title (dialog, dialogTitle); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_dialog_run (GTK_DIALOG (dialog)); get_check_button (check_button, checkValue); gtk_widget_destroy (dialog); diff --git a/embed/mozilla/mozilla-embed-shell.cpp b/embed/mozilla/mozilla-embed-shell.cpp deleted file mode 100644 index 58c692eb4..000000000 --- a/embed/mozilla/mozilla-embed-shell.cpp +++ /dev/null @@ -1,1000 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "glib.h" -#include "ephy-string.h" -#include "gtkmozembed.h" -#include "mozilla-embed-shell.h" -#include "mozilla-prefs.h" -#include "ephy-prefs.h" -#include "ephy-file-helpers.h" -#include "mozilla-notifiers.h" -#include "mozilla-i18n.h" -#include "eel-gconf-extensions.h" -#include "ephy-embed-prefs.h" -#include "MozRegisterComponents.h" -#include "FilePicker.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define MOZILLA_PROFILE_DIR "/mozilla" -#define MOZILLA_PROFILE_NAME "epiphany" -#define MOZILLA_PROFILE_FILE "prefs.js" - -static void -mozilla_embed_shell_class_init (MozillaEmbedShellClass *klass); -static void -mozilla_embed_shell_init (MozillaEmbedShell *ges); -static void -mozilla_embed_shell_finalize (GObject *object); - -static void -impl_get_capabilities (EphyEmbedShell *shell, - EmbedShellCapabilities *caps); -static gresult -impl_clear_cache (EphyEmbedShell *shell, - CacheType type); -static gresult -impl_set_offline_mode (EphyEmbedShell *shell, - gboolean offline); -static gresult -impl_load_proxy_autoconf (EphyEmbedShell *shell, - const char* url); -static gresult -impl_get_charset_titles (EphyEmbedShell *shell, - const char *group, - GList **charsets); -static gresult -impl_get_charset_groups (EphyEmbedShell *shell, - GList **groups); -static gresult -impl_get_font_list (EphyEmbedShell *shell, - const char *langGroup, - const char *fontType, - GList **fontList, - char **default_font); -static gresult -impl_list_cookies (EphyEmbedShell *shell, - GList **cookies); -static gresult -impl_remove_cookies (EphyEmbedShell *shell, - GList *cookies); -static gresult -impl_list_passwords (EphyEmbedShell *shell, - PasswordType type, - GList **passwords); -static gresult -impl_remove_passwords (EphyEmbedShell *shell, - GList *passwords, - PasswordType type); -static gresult -impl_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); - -static void mozilla_embed_shell_new_window_orphan_cb (GtkMozEmbedSingle *embed, - GtkMozEmbed **retval, - guint chrome_mask, - EphyEmbedShell *shell); - -struct MozillaEmbedShellPrivate -{ - GHashTable *charsets_hash; - GList *sorted_charsets_titles; -}; - -static NS_DEFINE_CID(kJVMManagerCID, NS_JVMMANAGER_CID); - -static GObjectClass *parent_class = NULL; - -GType -mozilla_embed_shell_get_type (void) -{ - static GType mozilla_embed_shell_type = 0; - - if (mozilla_embed_shell_type == 0) - { - static const GTypeInfo our_info = - { - sizeof (MozillaEmbedShellClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) mozilla_embed_shell_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (MozillaEmbedShell), - 0, /* n_preallocs */ - (GInstanceInitFunc) mozilla_embed_shell_init - }; - - mozilla_embed_shell_type = g_type_register_static (EPHY_EMBED_SHELL_TYPE, - "MozillaEmbedShell", - &our_info, (GTypeFlags)0); - } - - return mozilla_embed_shell_type; -} - -static void -mozilla_embed_shell_class_init (MozillaEmbedShellClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - EphyEmbedShellClass *shell_class; - - parent_class = (GObjectClass *) g_type_class_peek_parent (klass); - shell_class = EPHY_EMBED_SHELL_CLASS (klass); - - object_class->finalize = mozilla_embed_shell_finalize; - - shell_class->get_capabilities = impl_get_capabilities; - shell_class->clear_cache = impl_clear_cache; - shell_class->set_offline_mode = impl_set_offline_mode; - shell_class->load_proxy_autoconf = impl_load_proxy_autoconf; - shell_class->get_charset_titles = impl_get_charset_titles; - shell_class->get_charset_groups = impl_get_charset_groups; - shell_class->get_font_list = impl_get_font_list; - shell_class->list_cookies = impl_list_cookies; - shell_class->remove_cookies = impl_remove_cookies; - shell_class->list_passwords = impl_list_passwords; - shell_class->remove_passwords = impl_remove_passwords; - shell_class->show_file_picker = impl_show_file_picker; -} - -static void -mozilla_load_proxy_prefs (MozillaEmbedShell *shell) -{ - char *tmp; - int i, mozilla_mode = 0; - - /* Proxy mode */ - tmp = eel_gconf_get_string (CONF_NETWORK_PROXY_MODE); - g_return_if_fail (tmp != NULL); - - if (strcmp (tmp, "manual") == 0) - { - mozilla_mode = 1; - } - else if (strcmp (tmp, "auto") == 0) - { - mozilla_mode = 2; - } - - mozilla_prefs_set_int ("network.proxy.type", mozilla_mode); - g_free (tmp); - - /* Http proxy */ - tmp = eel_gconf_get_string (CONF_NETWORK_HTTP_PROXY); - g_return_if_fail (tmp != NULL); - mozilla_prefs_set_string ("network.proxy.http", tmp); - g_free (tmp); - - i = eel_gconf_get_integer (CONF_NETWORK_HTTP_PROXY_PORT); - mozilla_prefs_set_int ("network.proxy.http_port", i); - - /* Ftp proxy */ - tmp = eel_gconf_get_string (CONF_NETWORK_FTP_PROXY); - g_return_if_fail (tmp != NULL); - mozilla_prefs_set_string ("network.proxy.ftp", tmp); - g_free (tmp); - - i = eel_gconf_get_integer (CONF_NETWORK_FTP_PROXY_PORT); - mozilla_prefs_set_int ("network.proxy.ftp_port", i); - - /* Secure proxy */ - tmp = eel_gconf_get_string (CONF_NETWORK_SSL_PROXY); - g_return_if_fail (tmp != NULL); - mozilla_prefs_set_string ("network.proxy.ssl", tmp); - g_free (tmp); - - i = eel_gconf_get_integer (CONF_NETWORK_SSL_PROXY_PORT); - mozilla_prefs_set_int ("network.proxy.ssl_port", i); - - /* Socks proxy */ - tmp = eel_gconf_get_string (CONF_NETWORK_SOCKS_PROXY); - g_return_if_fail (tmp != NULL); - mozilla_prefs_set_string ("network.proxy.socks", tmp); - g_free (tmp); - - i = eel_gconf_get_integer (CONF_NETWORK_SOCKS_PROXY_PORT); - mozilla_prefs_set_int ("network.proxy.socks_port", i); - - /* Autoconfiguration */ - tmp = eel_gconf_get_string (CONF_NETWORK_PROXY_AUTO_URL); - g_return_if_fail (tmp != NULL); - ephy_embed_shell_load_proxy_autoconf - (EPHY_EMBED_SHELL (shell), tmp); - g_free (tmp); -} - -static void -mozilla_set_default_prefs (void) -{ - mozilla_prefs_set_boolean ("mozilla.widget.raise-on-setfocus", - FALSE); - mozilla_prefs_set_boolean ("browser.display.use_system_colors", - FALSE); - - /* set default search engine */ - mozilla_prefs_set_string ("keyword.URL",_("http://www.google.com/search?q=")); - mozilla_prefs_set_boolean ("keyword.enabled", TRUE); - mozilla_prefs_set_boolean ("security.checkloaduri", FALSE); - - /* while we have no UI */ - mozilla_prefs_set_boolean ("wallet.captureForms", FALSE); - - /* deactivate mailcap and mime.types support */ - mozilla_prefs_set_string ("helpers.global_mime_types_file", ""); - mozilla_prefs_set_string ("helpers.global_mailcap_file", ""); - mozilla_prefs_set_string ("helpers.private_mime_types_file", ""); - mozilla_prefs_set_string ("helpers.private_mailcap_file", ""); - - /* dont allow xpi installs from epiphany, there are crashes */ - mozilla_prefs_set_boolean ("xpinstall.enabled", FALSE); - - /* disable sucky XUL ftp view, have nice ns4-like html page instead */ - mozilla_prefs_set_boolean ("network.dir.generate_html", TRUE); - - /* set the right accept encoding flags */ - mozilla_prefs_set_string ("network.http.accept-encoding" , - "gzip, deflate, compress;q=0.9"); - - mozilla_prefs_save (); -} - -static void -mozilla_init_single (MozillaEmbedShell *mes) -{ - GtkMozEmbedSingle *single; - - /* get single */ - single = gtk_moz_embed_single_get (); - if (single == NULL) - { - g_warning ("Failed to get singleton embed object!\n"); - } - - /* allow creation of orphan windows */ - g_signal_connect (G_OBJECT (single), "new_window_orphan", - GTK_SIGNAL_FUNC (mozilla_embed_shell_new_window_orphan_cb), - mes); -} - -static void -mozilla_init_home (void) -{ - char *mozilla_five_home; - mozilla_five_home = g_strdup (g_getenv ("MOZILLA_FIVE_HOME")); - gtk_moz_embed_set_comp_path (mozilla_five_home); - g_free (mozilla_five_home); -} - -void -mozilla_init_profile (void) -{ - char *profile_path; - profile_path = g_build_filename (ephy_dot_dir (), - MOZILLA_PROFILE_DIR, - NULL); - gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME); - g_free (profile_path); -} - -static gboolean -is_new_build (void) -{ - gboolean new_build = FALSE; - char *mozprefs, *build_test; - - mozprefs = g_build_filename (ephy_dot_dir (), - MOZILLA_PROFILE_DIR, - MOZILLA_PROFILE_NAME, - MOZILLA_PROFILE_FILE, - NULL); - - /* no mozilla prefs ? or new epiphany build */ - build_test = eel_gconf_get_string ("/apps/epiphany/gconf_test"); - if (!g_file_test(mozprefs, G_FILE_TEST_EXISTS) || - build_test == NULL || - strncmp (build_test, __TIME__, 8) != 0) - { - new_build = TRUE; - eel_gconf_set_string ("/apps/epiphany/gconf_test", __TIME__); - } - - g_free (mozprefs); - g_free (build_test); - - return new_build; -} - -static void -mozilla_init_prefs (void) -{ - mozilla_set_default_prefs (); - mozilla_notifiers_set_defaults (); -} - -static gboolean -have_gnome_url_handler (const gchar *protocol) -{ - gchar *key, *cmd; - gboolean rv; - - key = g_strdup_printf ("/desktop/gnome/url-handlers/%s/command", - protocol); - cmd = eel_gconf_get_string (key); - g_free (key); - - rv = (cmd != NULL); - g_free (cmd); - - if (!rv) return rv; - - key = g_strdup_printf ("/desktop/gnome/url-handlers/%s/enabled", - protocol); - rv = eel_gconf_get_boolean (key); - g_free (key); - - return rv; -} - -static void -mozilla_register_external_protocols (void) -{ - /* FIXME register only when needed */ - if (have_gnome_url_handler ("ftp")) - { - mozilla_register_FtpProtocolHandler (); - } - else - { - mozilla_unregister_FtpProtocolHandler (); - } - - mozilla_register_MailtoProtocolHandler (); -} - -static void -mozilla_embed_shell_init (MozillaEmbedShell *mes) -{ - gboolean new_build; - - mes->priv = g_new0 (MozillaEmbedShellPrivate, 1); - - mes->priv->charsets_hash = NULL; - mes->priv->sorted_charsets_titles = NULL; - - new_build = is_new_build (); - - /* Pre initialization */ - mozilla_notifiers_init (mes); - mozilla_init_home (); - mozilla_init_profile (); - - /* Fire up the best */ - gtk_moz_embed_push_startup (); - - /* Post initialization */ - if (new_build) - { - mozilla_init_prefs (); - } - - mozilla_load_proxy_prefs (mes); - - mozilla_init_single (mes); - - mozilla_register_components (); - - mozilla_register_external_protocols (); - - /* FIXME alert if fails */ -} - -static void -mozilla_embed_shell_new_window_orphan_cb (GtkMozEmbedSingle *embed, - GtkMozEmbed **retval, - guint chrome_mask, - EphyEmbedShell *shell) -{ - /* FIXME conversion duped in mozilla_embed */ - EphyEmbed *new_embed; - int i; - EmbedChromeMask mask = EMBED_CHROME_OPENASPOPUP; - - struct - { - guint chromemask; - EmbedChromeMask embed_mask; - } - conversion_map [] = - { - { GTK_MOZ_EMBED_FLAG_DEFAULTCHROME, EMBED_CHROME_DEFAULT }, - { GTK_MOZ_EMBED_FLAG_MENUBARON, EMBED_CHROME_MENUBARON }, - { GTK_MOZ_EMBED_FLAG_TOOLBARON, EMBED_CHROME_TOOLBARON }, - { GTK_MOZ_EMBED_FLAG_STATUSBARON, EMBED_CHROME_STATUSBARON }, - { GTK_MOZ_EMBED_FLAG_WINDOWRAISED, EMBED_CHROME_WINDOWRAISED }, - { GTK_MOZ_EMBED_FLAG_WINDOWLOWERED, EMBED_CHROME_WINDOWLOWERED }, - { GTK_MOZ_EMBED_FLAG_CENTERSCREEN, EMBED_CHROME_CENTERSCREEN }, - { GTK_MOZ_EMBED_FLAG_OPENASDIALOG, EMBED_CHROME_OPENASDIALOG }, - { GTK_MOZ_EMBED_FLAG_OPENASCHROME, EMBED_CHROME_OPENASCHROME }, - { 0, EMBED_CHROME_NONE } - }; - - for (i = 0; conversion_map[i].chromemask != 0; i++) - { - if (chrome_mask & conversion_map[i].chromemask) - { - mask = (EmbedChromeMask) (mask | conversion_map[i].embed_mask); - } - } - - g_signal_emit_by_name (shell, "new_window_orphan", &new_embed, mask); - - g_assert (new_embed != NULL); - - *retval = GTK_MOZ_EMBED(EPHY_EMBED(new_embed)); -} - -static void -mozilla_embed_shell_finalize (GObject *object) -{ - MozillaEmbedShell *mes; - - /* Destroy EphyEmbedShell before because some - * services depend on xpcom */ - G_OBJECT_CLASS (parent_class)->finalize (object); - - g_return_if_fail (object != NULL); - g_return_if_fail (IS_MOZILLA_EMBED_SHELL (object)); - - mes = MOZILLA_EMBED_SHELL (object); - - g_return_if_fail (mes->priv != NULL); - - mozilla_notifiers_free (); - - mozilla_prefs_save (); - - gtk_moz_embed_pop_startup (); - - g_free (mes->priv); -} - -static void -impl_get_capabilities (EphyEmbedShell *shell, - EmbedShellCapabilities *caps) -{ - EmbedShellCapabilities mycaps; - - mycaps = (EmbedShellCapabilities) - (CACHE_CLEAR_CAP | - OFFLINE_CAP | - PROXY_AUTOCONF_CAP | - JAVA_CONSOLE_CAP | - JS_CONSOLE_CAP | - CHARSETS_CAP | - COOKIES_CAP | - PASSWORDS_CAP); - - *caps = mycaps; -} - -static gresult -impl_clear_cache (EphyEmbedShell *shell, - CacheType type) -{ - nsresult rv; - - nsCOMPtr CacheService = - do_GetService (NS_CACHESERVICE_CONTRACTID, &rv); - if (NS_FAILED(rv)) return G_FAILED; - - CacheService->EvictEntries((guint)type); - - return G_OK; -} - -static gresult -impl_set_offline_mode (EphyEmbedShell *shell, - gboolean offline) -{ - nsresult rv; - - nsCOMPtr io = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); - if (NS_FAILED(rv)) - return G_FAILED; - - rv = io->SetOffline(offline); - if (NS_SUCCEEDED(rv)) return G_FAILED; - - return G_OK; -} - -static gresult -impl_load_proxy_autoconf (EphyEmbedShell *shell, - const char* url) -{ - nsresult rv; - - nsCOMPtr pps = - do_GetService ("@mozilla.org/network/protocol-proxy-service;1", - &rv); - if (NS_FAILED(rv) || !pps) return G_FAILED; - - rv = pps->ConfigureFromPAC (url); - if (NS_FAILED(rv)) return G_FAILED; - - return G_OK; -} - -static gresult -fill_charsets_lists (MozillaEmbedShellPrivate *priv) -{ - nsresult rv; - char *tmp; - PRUint32 cscount; - PRUint32 translated_cscount = get_translated_cscount (); - char *charset_str, *charset_title_str; - - nsCOMPtr docCharsetAtom; - nsCOMPtr ccm2 = - do_GetService (NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); - if (!NS_SUCCEEDED(rv)) return G_FAILED; - - nsCOMPtr cs_list; - rv = ccm2->GetDecoderList (getter_AddRefs(cs_list)); - if (!NS_SUCCEEDED(rv)) return G_FAILED; - - rv = cs_list->Count(&cscount); - priv->charsets_hash = g_hash_table_new (g_str_hash, g_str_equal); - for (PRUint32 i = 0; i < cscount; i++) - { - nsCOMPtr cssupports = - (dont_AddRef)(cs_list->ElementAt(i)); - nsCOMPtr csatom ( do_QueryInterface(cssupports) ); - nsAutoString charset_ns, charset_title_ns; - - /* charset name */ - rv = csatom->ToString(charset_ns); - tmp = ToNewCString (charset_ns); - if (tmp == NULL || strlen (tmp) == 0) - { - continue; - } - charset_str = g_strdup (tmp); - nsMemory::Free (tmp); - tmp = nsnull; - - /* charset readable title */ - rv = ccm2->GetCharsetTitle2(csatom, &charset_title_ns); - tmp = ToNewCString (charset_title_ns); - if (tmp == NULL || - strlen (tmp) == 0) - { - if (tmp) nsMemory::Free (tmp); - charset_title_str = g_strdup (charset_str); - } - else - { - charset_title_str = g_strdup (tmp); - nsMemory::Free (tmp); - tmp = nsnull; - } - - for (PRUint32 j = 0; j < translated_cscount; j++) - { - if (g_ascii_strcasecmp ( - charset_str, - charset_trans_array[j].charset_name) == 0) - { - g_free (charset_title_str); - charset_title_str = (char *) - _(charset_trans_array[j].charset_title); - break; - } - } - - /* fill the hash and the sorted list */ - g_hash_table_insert (priv->charsets_hash, charset_title_str, charset_str); - priv->sorted_charsets_titles = - g_list_insert_sorted (priv->sorted_charsets_titles, - (gpointer)charset_title_str, - (GCompareFunc)g_ascii_strcasecmp); - } - - return G_OK; -} - -static void -ensure_charsets_tables (MozillaEmbedShell *shell) -{ - if (!shell->priv->charsets_hash) - { - fill_charsets_lists (shell->priv); - } -} - -static gresult -impl_get_charset_titles (EphyEmbedShell *shell, - const char *group, - GList **charsets) -{ - MozillaEmbedShell *mshell = MOZILLA_EMBED_SHELL(shell); - int count = get_translated_cscount (); - GList *l = NULL; - int j; - - ensure_charsets_tables (mshell); - g_return_val_if_fail (mshell->priv->charsets_hash != NULL, G_FAILED); - - for (j = 0; j < count; j++) - { - if (group == NULL || - strcmp (group, lgroups[charset_trans_array[j].lgroup]) == 0) - { - CharsetInfo *info; - info = g_new0 (CharsetInfo, 1); - info->name = charset_trans_array[j].charset_name; - info->title = charset_trans_array[j].charset_title; - l = g_list_append (l, info); - - /* FIXME check that the encoding exists in mozilla before - * adding it */ - } - } - - *charsets = l; - - return G_OK; -} - -static gresult -impl_get_charset_groups (EphyEmbedShell *shell, - GList **groups) -{ - GList *l = NULL; - int i; - - for (i = 0; lgroups[i] != NULL; i++) - { - l = g_list_append (l, (gpointer)lgroups[i]); - } - - *groups = l; - - return G_OK; -} - -static gresult -impl_get_font_list (EphyEmbedShell *shell, - const char *langGroup, - const char *fontType, - GList **fontList, - char **default_font) -{ - nsresult rv; - - nsCOMPtr mozFontList; - mozFontList = do_CreateInstance("@mozilla.org/gfx/fontlist;1", &rv); - if(NS_FAILED(rv)) return G_FAILED; - - nsCOMPtr fontEnum; - mozFontList->AvailableFonts(NS_ConvertUTF8toUCS2(langGroup).get(), - NS_ConvertUTF8toUCS2(fontType).get(), - getter_AddRefs(fontEnum)); - if(NS_FAILED(rv)) return G_FAILED; - - GList *l = NULL; - PRBool enumResult; - for(fontEnum->HasMoreElements(&enumResult) ; - enumResult == PR_TRUE; - fontEnum->HasMoreElements(&enumResult)) - { - nsCOMPtr fontName; - fontEnum->GetNext(getter_AddRefs(fontName)); - if(NS_FAILED(rv)) return G_FAILED; - - nsString fontString; - fontName->GetData(fontString); - - char *gFontString; - gFontString = g_strdup(NS_ConvertUCS2toUTF8(fontString).get()); - l = g_list_append(l, gFontString); - } - *fontList = l; - - if (default_font != NULL) - { - char key [255]; - - sprintf (key, "font.name.%s.%s", fontType, langGroup); - - *default_font = mozilla_prefs_get_string (key); - } - - return G_OK; -} - -static gresult -impl_list_cookies (EphyEmbedShell *shell, - GList **cookies) -{ - nsresult result; - - nsCOMPtr cookieManager = - do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID); - nsCOMPtr cookieEnumerator; - result = - cookieManager->GetEnumerator (getter_AddRefs(cookieEnumerator)); - if (NS_FAILED(result)) return G_FAILED; - - PRBool enumResult; - for (cookieEnumerator->HasMoreElements(&enumResult) ; - enumResult == PR_TRUE ; - cookieEnumerator->HasMoreElements(&enumResult)) - { - CookieInfo *c; - - nsCOMPtr nsCookie; - result = cookieEnumerator->GetNext (getter_AddRefs(nsCookie)); - if (NS_FAILED(result)) return G_FAILED; - - c = g_new0 (CookieInfo, 1); - - nsCAutoString transfer; - - nsCookie->GetHost (transfer); - c->domain = g_strdup (transfer.get()); - nsCookie->GetName (transfer); - c->name = g_strdup (transfer.get()); - nsCookie->GetValue (transfer); - c->value = g_strdup (transfer.get()); - nsCookie->GetPath (transfer); - c->path = g_strdup (transfer.get()); - - PRBool isSecure; - nsCookie->GetIsSecure (&isSecure); - if (isSecure == PR_TRUE) - c->secure = g_strdup (_("Yes")); - else - c->secure = g_strdup (_("No")); - - PRUint64 dateTime; - nsCookie->GetExpires (&dateTime); - if(dateTime == 0) - c->expire = g_strdup (_("End of current session")); - else - c->expire = g_strdup_printf ("%s",ctime((time_t*)&dateTime)); - - *cookies = g_list_prepend (*cookies, c); - } - - *cookies = g_list_reverse (*cookies); - - return G_OK; -} - -static gresult -impl_remove_cookies (EphyEmbedShell *shell, - GList *cookies) -{ - nsresult result; - GList *cl; - nsCOMPtr cookieManager = - do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID); - - for (cl = g_list_first(cookies) ; cl != NULL ; - cl = g_list_next (cl)) - { - CookieInfo *c = (CookieInfo *)cl->data; - - result = cookieManager->Remove (NS_LITERAL_CSTRING(c->domain), - NS_LITERAL_CSTRING(c->name), - NS_LITERAL_CSTRING(c->path), - PR_FALSE); - if (NS_FAILED(result)) return G_FAILED; - }; - - return G_OK; -} - -static gresult -impl_list_passwords (EphyEmbedShell *shell, - PasswordType type, - GList **passwords) -{ - nsresult result = NS_ERROR_FAILURE; - - nsCOMPtr passwordManager = - do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID); - nsCOMPtr passwordEnumerator; - if (type == PASSWORD_PASSWORD) - result = passwordManager->GetEnumerator - (getter_AddRefs(passwordEnumerator)); - else if (type == PASSWORD_REJECT) - result = passwordManager->GetRejectEnumerator - (getter_AddRefs(passwordEnumerator)); - if (NS_FAILED(result)) return G_FAILED; - - PRBool enumResult; - for (passwordEnumerator->HasMoreElements(&enumResult) ; - enumResult == PR_TRUE ; - passwordEnumerator->HasMoreElements(&enumResult)) - { - nsCOMPtr nsPassword; - result = passwordEnumerator->GetNext - (getter_AddRefs(nsPassword)); - if (NS_FAILED(result)) return G_FAILED; - - PasswordInfo *p = g_new0 (PasswordInfo, 1); - - nsCAutoString transfer; - nsPassword->GetHost (transfer); - p->host = g_strdup (transfer.get()); - - if (type == PASSWORD_PASSWORD) - { - nsAutoString unicodeName; - nsPassword->GetUser (unicodeName); - p->username = g_strdup(NS_ConvertUCS2toUTF8(unicodeName).get()); - } - - *passwords = g_list_prepend (*passwords, p); - } - - *passwords = g_list_reverse (*passwords); - - return G_OK; -} - -static gresult -impl_remove_passwords (EphyEmbedShell *shell, - GList *passwords, - PasswordType type) -{ - nsresult result = NS_ERROR_FAILURE; - nsCOMPtr passwordManager = - do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID); - - for (GList *l = g_list_first(passwords) ; l !=NULL ; - l = g_list_next(l)) - { - PasswordInfo *p = (PasswordInfo *)l->data; - if (type == PASSWORD_PASSWORD) - { - result = passwordManager->RemoveUser (NS_LITERAL_CSTRING(p->host), - NS_ConvertUTF8toUCS2(nsDependentCString(p->username))); - } - else if (type == PASSWORD_REJECT) - { - result = passwordManager->RemoveReject - (nsDependentCString(p->host)); - }; - - if (NS_FAILED(result)) return G_FAILED; - }; - - return G_OK; -} - -static gresult -impl_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) -{ - PRBool showContentCheck; - gchar *expanded_directory; - - if (ret_save_content == NULL) - showContentCheck = PR_FALSE; - else - showContentCheck = PR_TRUE; - - GFilePicker *filePicker = new GFilePicker (showContentCheck, - file_formats); - - /* FIXME sane path: expand tilde ... */ - expanded_directory = g_strdup (directory); - - /* make sure the directory exists, and use the home directory - * otherwise */ - if (!expanded_directory || - !g_file_test (expanded_directory, G_FILE_TEST_IS_DIR)) - { - if (expanded_directory) g_free (expanded_directory); - expanded_directory = g_strdup (g_get_home_dir()); - } - - nsCOMPtr dir = - do_CreateInstance (NS_LOCAL_FILE_CONTRACTID); - dir->InitWithNativePath (nsDependentCString(expanded_directory)); - g_free (expanded_directory); - - filePicker->InitWithGtkWidget (parentWidget, title, mode); - filePicker->SetDefaultString (NS_ConvertUTF8toUCS2(file).get()); - filePicker->SetDisplayDirectory (dir); - - PRInt16 retval; - filePicker->Show (&retval); - - if (ret_save_content != NULL) - { - if (retval == GFilePicker::returnOKSaveContent) - *ret_save_content = TRUE; - else - *ret_save_content = FALSE; - } - if (ret_file_format != NULL) - { - *ret_file_format = filePicker->mSelectedFileFormat; - } - - if (retval == nsIFilePicker::returnCancel) - { - delete filePicker; - return G_FAILED; - } - else - { - if (*ret_fullpath) - g_free (*ret_fullpath); - nsCOMPtr file; - filePicker->GetFile (getter_AddRefs(file)); - nsCAutoString tempFullPathStr; - file->GetNativePath (tempFullPathStr); - *ret_fullpath = g_strdup (tempFullPathStr.get()); - delete filePicker; - return G_OK; - } -} diff --git a/embed/mozilla/mozilla-embed-shell.h b/embed/mozilla/mozilla-embed-shell.h deleted file mode 100644 index daedb2948..000000000 --- a/embed/mozilla/mozilla-embed-shell.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef MOZILLA_EMBED_SHELL_H -#define MOZILLA_EMBED_SHELL_H - -#include "glib.h" -#include "ephy-embed-shell.h" -#include - -G_BEGIN_DECLS - -#define MOZILLA_EMBED_SHELL_TYPE (mozilla_embed_shell_get_type ()) -#define MOZILLA_EMBED_SHELL(obj) (GTK_CHECK_CAST ((obj), MOZILLA_EMBED_SHELL_TYPE, MozillaEmbedShell)) -#define MOZILLA_EMBED_SHELL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), MOZILLA_EMBED_SHELL_TYPE, MozillaEmbedShellClass)) -#define IS_MOZILLA_EMBED_SHELL(obj) (GTK_CHECK_TYPE ((obj), MOZILLA_EMBED_SHELL_TYPE)) -#define IS_MOZILLA_EMBED_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), MOZILLA_EMBED_SHELL)) -#define MOZILLA_EMBED_SHELL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZILLA_EMBED_SHELL_TYPE, MozillaEmbedShellClass)) - -typedef struct MozillaEmbedShell MozillaEmbedShell; -typedef struct MozillaEmbedShellPrivate MozillaEmbedShellPrivate; - -extern GObject *mozilla_js_console; - -struct MozillaEmbedShell -{ - EphyEmbedShell parent; - MozillaEmbedShellPrivate *priv; -}; - -struct MozillaEmbedShellClass -{ - EphyEmbedShellClass parent_class; -}; - -GType mozilla_embed_shell_get_type (void); - -G_END_DECLS - -#endif diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp new file mode 100644 index 000000000..fe1fbd1f0 --- /dev/null +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -0,0 +1,958 @@ +/* + * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "glib.h" +#include "ephy-string.h" +#include "gtkmozembed.h" +#include "mozilla-embed-single.h" +#include "mozilla-prefs.h" +#include "ephy-prefs.h" +#include "ephy-file-helpers.h" +#include "mozilla-notifiers.h" +#include "mozilla-i18n.h" +#include "eel-gconf-extensions.h" +#include "ephy-embed-prefs.h" +#include "MozRegisterComponents.h" +#include "FilePicker.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MOZILLA_PROFILE_DIR "/mozilla" +#define MOZILLA_PROFILE_NAME "epiphany" +#define MOZILLA_PROFILE_FILE "prefs.js" + +static void +mozilla_embed_single_class_init (MozillaEmbedSingleClass *klass); +static void +mozilla_embed_single_init (MozillaEmbedSingle *ges); +static void +mozilla_embed_single_finalize (GObject *object); + +static gresult +impl_clear_cache (EphyEmbedSingle *shell, + CacheType type); +static gresult +impl_set_offline_mode (EphyEmbedSingle *shell, + gboolean offline); +static gresult +impl_load_proxy_autoconf (EphyEmbedSingle *shell, + const char* url); +static gresult +impl_get_charset_titles (EphyEmbedSingle *shell, + const char *group, + GList **charsets); +static gresult +impl_get_charset_groups (EphyEmbedSingle *shell, + GList **groups); +static gresult +impl_get_font_list (EphyEmbedSingle *shell, + const char *langGroup, + const char *fontType, + GList **fontList, + char **default_font); +static gresult +impl_list_cookies (EphyEmbedSingle *shell, + GList **cookies); +static gresult +impl_remove_cookies (EphyEmbedSingle *shell, + GList *cookies); +static gresult +impl_list_passwords (EphyEmbedSingle *shell, + PasswordType type, + GList **passwords); +static gresult +impl_remove_passwords (EphyEmbedSingle *shell, + GList *passwords, + PasswordType type); +static gresult +impl_show_file_picker (EphyEmbedSingle *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); + +static void mozilla_embed_single_new_window_orphan_cb (GtkMozEmbedSingle *embed, + GtkMozEmbed **retval, + guint chrome_mask, + EphyEmbedSingle *shell); + +struct MozillaEmbedSinglePrivate +{ + char *user_prefs; + GHashTable *charsets_hash; + GList *sorted_charsets_titles; +}; + +static NS_DEFINE_CID(kJVMManagerCID, NS_JVMMANAGER_CID); + +static GObjectClass *parent_class = NULL; + +GType +mozilla_embed_single_get_type (void) +{ + static GType mozilla_embed_single_type = 0; + + if (mozilla_embed_single_type == 0) + { + static const GTypeInfo our_info = + { + sizeof (MozillaEmbedSingleClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) mozilla_embed_single_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (MozillaEmbedSingle), + 0, /* n_preallocs */ + (GInstanceInitFunc) mozilla_embed_single_init + }; + + mozilla_embed_single_type = g_type_register_static (EPHY_EMBED_SINGLE_TYPE, + "MozillaEmbedSingle", + &our_info, (GTypeFlags)0); + } + + return mozilla_embed_single_type; +} + +static void +mozilla_embed_single_class_init (MozillaEmbedSingleClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + EphyEmbedSingleClass *shell_class; + + parent_class = (GObjectClass *) g_type_class_peek_parent (klass); + shell_class = EPHY_EMBED_SINGLE_CLASS (klass); + + object_class->finalize = mozilla_embed_single_finalize; + + shell_class->clear_cache = impl_clear_cache; + shell_class->set_offline_mode = impl_set_offline_mode; + shell_class->load_proxy_autoconf = impl_load_proxy_autoconf; + shell_class->get_charset_titles = impl_get_charset_titles; + shell_class->get_charset_groups = impl_get_charset_groups; + shell_class->get_font_list = impl_get_font_list; + shell_class->list_cookies = impl_list_cookies; + shell_class->remove_cookies = impl_remove_cookies; + shell_class->list_passwords = impl_list_passwords; + shell_class->remove_passwords = impl_remove_passwords; + shell_class->show_file_picker = impl_show_file_picker; +} + +static void +mozilla_load_proxy_prefs (MozillaEmbedSingle *shell) +{ + char *tmp; + int i, mozilla_mode = 0; + + /* Proxy mode */ + tmp = eel_gconf_get_string (CONF_NETWORK_PROXY_MODE); + g_return_if_fail (tmp != NULL); + + if (strcmp (tmp, "manual") == 0) + { + mozilla_mode = 1; + } + else if (strcmp (tmp, "auto") == 0) + { + mozilla_mode = 2; + } + + mozilla_prefs_set_int ("network.proxy.type", mozilla_mode); + g_free (tmp); + + /* Http proxy */ + tmp = eel_gconf_get_string (CONF_NETWORK_HTTP_PROXY); + g_return_if_fail (tmp != NULL); + mozilla_prefs_set_string ("network.proxy.http", tmp); + g_free (tmp); + + i = eel_gconf_get_integer (CONF_NETWORK_HTTP_PROXY_PORT); + mozilla_prefs_set_int ("network.proxy.http_port", i); + + /* Ftp proxy */ + tmp = eel_gconf_get_string (CONF_NETWORK_FTP_PROXY); + g_return_if_fail (tmp != NULL); + mozilla_prefs_set_string ("network.proxy.ftp", tmp); + g_free (tmp); + + i = eel_gconf_get_integer (CONF_NETWORK_FTP_PROXY_PORT); + mozilla_prefs_set_int ("network.proxy.ftp_port", i); + + /* Secure proxy */ + tmp = eel_gconf_get_string (CONF_NETWORK_SSL_PROXY); + g_return_if_fail (tmp != NULL); + mozilla_prefs_set_string ("network.proxy.ssl", tmp); + g_free (tmp); + + i = eel_gconf_get_integer (CONF_NETWORK_SSL_PROXY_PORT); + mozilla_prefs_set_int ("network.proxy.ssl_port", i); + + /* Socks proxy */ + tmp = eel_gconf_get_string (CONF_NETWORK_SOCKS_PROXY); + g_return_if_fail (tmp != NULL); + mozilla_prefs_set_string ("network.proxy.socks", tmp); + g_free (tmp); + + i = eel_gconf_get_integer (CONF_NETWORK_SOCKS_PROXY_PORT); + mozilla_prefs_set_int ("network.proxy.socks_port", i); + + /* Autoconfiguration */ + tmp = eel_gconf_get_string (CONF_NETWORK_PROXY_AUTO_URL); + g_return_if_fail (tmp != NULL); + ephy_embed_single_load_proxy_autoconf + (EPHY_EMBED_SINGLE (shell), tmp); + g_free (tmp); +} + +static void +mozilla_set_default_prefs (MozillaEmbedSingle *mes) +{ + mozilla_prefs_load (ephy_file ("default-prefs.js")); + mozilla_prefs_save (mes->priv->user_prefs); +} + +static void +mozilla_init_single (MozillaEmbedSingle *mes) +{ + GtkMozEmbedSingle *single; + + /* get single */ + single = gtk_moz_embed_single_get (); + if (single == NULL) + { + g_warning ("Failed to get singleton embed object!\n"); + } + + /* allow creation of orphan windows */ + g_signal_connect (G_OBJECT (single), "new_window_orphan", + GTK_SIGNAL_FUNC (mozilla_embed_single_new_window_orphan_cb), + mes); +} + +static void +mozilla_init_home (void) +{ + char *mozilla_five_home; + mozilla_five_home = g_strdup (g_getenv ("MOZILLA_FIVE_HOME")); + gtk_moz_embed_set_comp_path (mozilla_five_home); + g_free (mozilla_five_home); +} + +void +mozilla_init_profile (void) +{ + char *profile_path; + profile_path = g_build_filename (ephy_dot_dir (), + MOZILLA_PROFILE_DIR, + NULL); + gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME); + g_free (profile_path); +} + +static gboolean +is_new_build (MozillaEmbedSingle *mes) +{ + gboolean new_build = FALSE; + char *build_test; + char *prefs_file; + + prefs_file = g_build_filename (ephy_dot_dir (), + MOZILLA_PROFILE_DIR, + MOZILLA_PROFILE_NAME, + MOZILLA_PROFILE_FILE, + NULL); + + /* no mozilla prefs ? or new epiphany build */ + build_test = eel_gconf_get_string ("/apps/epiphany/gconf_test"); + if (!g_file_test(mes->priv->user_prefs, G_FILE_TEST_EXISTS) || + build_test == NULL || + strncmp (build_test, __TIME__, 8) != 0) + { + new_build = TRUE; + eel_gconf_set_string ("/apps/epiphany/gconf_test", __TIME__); + } + + g_free (build_test); + + return new_build; +} + +static void +mozilla_init_prefs (MozillaEmbedSingle *mes) +{ + mozilla_set_default_prefs (mes); + mozilla_notifiers_set_defaults (); +} + +static gboolean +have_gnome_url_handler (const gchar *protocol) +{ + gchar *key, *cmd; + gboolean rv; + + key = g_strdup_printf ("/desktop/gnome/url-handlers/%s/command", + protocol); + cmd = eel_gconf_get_string (key); + g_free (key); + + rv = (cmd != NULL); + g_free (cmd); + + if (!rv) return rv; + + key = g_strdup_printf ("/desktop/gnome/url-handlers/%s/enabled", + protocol); + rv = eel_gconf_get_boolean (key); + g_free (key); + + return rv; +} + +static void +mozilla_register_external_protocols (void) +{ + /* FIXME register only when needed */ + if (have_gnome_url_handler ("ftp")) + { + mozilla_register_FtpProtocolHandler (); + } + else + { + mozilla_unregister_FtpProtocolHandler (); + } + + mozilla_register_MailtoProtocolHandler (); +} + +static void +mozilla_embed_single_init (MozillaEmbedSingle *mes) +{ + gboolean new_build; + + mes->priv = g_new0 (MozillaEmbedSinglePrivate, 1); + mes->priv->charsets_hash = NULL; + mes->priv->sorted_charsets_titles = NULL; + + mes->priv->user_prefs = + g_build_filename (ephy_dot_dir (), + MOZILLA_PROFILE_DIR, + MOZILLA_PROFILE_NAME, + MOZILLA_PROFILE_FILE, + NULL); + + new_build = is_new_build (mes); + + /* Pre initialization */ + mozilla_notifiers_init (EPHY_EMBED_SINGLE (mes)); + mozilla_init_home (); + mozilla_init_profile (); + + /* Fire up the best */ + gtk_moz_embed_push_startup (); + + /* Post initialization */ + if (new_build) + { + mozilla_init_prefs (mes); + } + + mozilla_load_proxy_prefs (mes); + + mozilla_init_single (mes); + + mozilla_register_components (); + + mozilla_register_external_protocols (); + + /* FIXME alert if fails */ +} + +static void +mozilla_embed_single_new_window_orphan_cb (GtkMozEmbedSingle *embed, + GtkMozEmbed **retval, + guint chrome_mask, + EphyEmbedSingle *shell) +{ + /* FIXME conversion duped in mozilla_embed */ + EphyEmbed *new_embed; + int i; + EmbedChromeMask mask = EMBED_CHROME_OPENASPOPUP; + + struct + { + guint chromemask; + EmbedChromeMask embed_mask; + } + conversion_map [] = + { + { GTK_MOZ_EMBED_FLAG_DEFAULTCHROME, EMBED_CHROME_DEFAULT }, + { GTK_MOZ_EMBED_FLAG_MENUBARON, EMBED_CHROME_MENUBARON }, + { GTK_MOZ_EMBED_FLAG_TOOLBARON, EMBED_CHROME_TOOLBARON }, + { GTK_MOZ_EMBED_FLAG_STATUSBARON, EMBED_CHROME_STATUSBARON }, + { GTK_MOZ_EMBED_FLAG_WINDOWRAISED, EMBED_CHROME_WINDOWRAISED }, + { GTK_MOZ_EMBED_FLAG_WINDOWLOWERED, EMBED_CHROME_WINDOWLOWERED }, + { GTK_MOZ_EMBED_FLAG_CENTERSCREEN, EMBED_CHROME_CENTERSCREEN }, + { GTK_MOZ_EMBED_FLAG_OPENASDIALOG, EMBED_CHROME_OPENASDIALOG }, + { GTK_MOZ_EMBED_FLAG_OPENASCHROME, EMBED_CHROME_OPENASCHROME }, + { 0, EMBED_CHROME_NONE } + }; + + for (i = 0; conversion_map[i].chromemask != 0; i++) + { + if (chrome_mask & conversion_map[i].chromemask) + { + mask = (EmbedChromeMask) (mask | conversion_map[i].embed_mask); + } + } + + g_signal_emit_by_name (shell, "new_window_orphan", &new_embed, mask); + + g_assert (new_embed != NULL); + + *retval = GTK_MOZ_EMBED(EPHY_EMBED(new_embed)); +} + +static void +mozilla_embed_single_finalize (GObject *object) +{ + MozillaEmbedSingle *mes; + + /* Destroy EphyEmbedSingle before because some + * services depend on xpcom */ + G_OBJECT_CLASS (parent_class)->finalize (object); + + g_return_if_fail (object != NULL); + g_return_if_fail (IS_MOZILLA_EMBED_SINGLE (object)); + + mes = MOZILLA_EMBED_SINGLE (object); + + g_return_if_fail (mes->priv != NULL); + + mozilla_notifiers_free (); + + mozilla_prefs_save (mes->priv->user_prefs); + + gtk_moz_embed_pop_startup (); + + g_free (mes->priv->user_prefs); + + g_free (mes->priv); +} + +static gresult +impl_clear_cache (EphyEmbedSingle *shell, + CacheType type) +{ + nsresult rv; + + nsCOMPtr CacheService = + do_GetService (NS_CACHESERVICE_CONTRACTID, &rv); + if (NS_FAILED(rv)) return G_FAILED; + + CacheService->EvictEntries((guint)type); + + return G_OK; +} + +static gresult +impl_set_offline_mode (EphyEmbedSingle *shell, + gboolean offline) +{ + nsresult rv; + + nsCOMPtr io = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); + if (NS_FAILED(rv)) + return G_FAILED; + + rv = io->SetOffline(offline); + if (NS_SUCCEEDED(rv)) return G_FAILED; + + return G_OK; +} + +static gresult +impl_load_proxy_autoconf (EphyEmbedSingle *shell, + const char* url) +{ + nsresult rv; + + nsCOMPtr pps = + do_GetService ("@mozilla.org/network/protocol-proxy-service;1", + &rv); + if (NS_FAILED(rv) || !pps) return G_FAILED; + + rv = pps->ConfigureFromPAC (url); + if (NS_FAILED(rv)) return G_FAILED; + + return G_OK; +} + +static gresult +fill_charsets_lists (MozillaEmbedSinglePrivate *priv) +{ + nsresult rv; + char *tmp; + PRUint32 cscount; + PRUint32 translated_cscount = get_translated_cscount (); + char *charset_str, *charset_title_str; + + nsCOMPtr docCharsetAtom; + nsCOMPtr ccm2 = + do_GetService (NS_CHARSETCONVERTERMANAGER_CONTRACTID, &rv); + if (!NS_SUCCEEDED(rv)) return G_FAILED; + + nsCOMPtr cs_list; + rv = ccm2->GetDecoderList (getter_AddRefs(cs_list)); + if (!NS_SUCCEEDED(rv)) return G_FAILED; + + rv = cs_list->Count(&cscount); + priv->charsets_hash = g_hash_table_new (g_str_hash, g_str_equal); + for (PRUint32 i = 0; i < cscount; i++) + { + nsCOMPtr cssupports = + (dont_AddRef)(cs_list->ElementAt(i)); + nsCOMPtr csatom ( do_QueryInterface(cssupports) ); + nsAutoString charset_ns, charset_title_ns; + + /* charset name */ + rv = csatom->ToString(charset_ns); + tmp = ToNewCString (charset_ns); + if (tmp == NULL || strlen (tmp) == 0) + { + continue; + } + charset_str = g_strdup (tmp); + nsMemory::Free (tmp); + tmp = nsnull; + + /* charset readable title */ + rv = ccm2->GetCharsetTitle2(csatom, &charset_title_ns); + tmp = ToNewCString (charset_title_ns); + if (tmp == NULL || + strlen (tmp) == 0) + { + if (tmp) nsMemory::Free (tmp); + charset_title_str = g_strdup (charset_str); + } + else + { + charset_title_str = g_strdup (tmp); + nsMemory::Free (tmp); + tmp = nsnull; + } + + for (PRUint32 j = 0; j < translated_cscount; j++) + { + if (g_ascii_strcasecmp ( + charset_str, + charset_trans_array[j].charset_name) == 0) + { + g_free (charset_title_str); + charset_title_str = (char *) + _(charset_trans_array[j].charset_title); + break; + } + } + + /* fill the hash and the sorted list */ + g_hash_table_insert (priv->charsets_hash, charset_title_str, charset_str); + priv->sorted_charsets_titles = + g_list_insert_sorted (priv->sorted_charsets_titles, + (gpointer)charset_title_str, + (GCompareFunc)g_ascii_strcasecmp); + } + + return G_OK; +} + +static void +ensure_charsets_tables (MozillaEmbedSingle *shell) +{ + if (!shell->priv->charsets_hash) + { + fill_charsets_lists (shell->priv); + } +} + +static gresult +impl_get_charset_titles (EphyEmbedSingle *shell, + const char *group, + GList **charsets) +{ + MozillaEmbedSingle *mshell = MOZILLA_EMBED_SINGLE(shell); + int count = get_translated_cscount (); + GList *l = NULL; + int j; + + ensure_charsets_tables (mshell); + g_return_val_if_fail (mshell->priv->charsets_hash != NULL, G_FAILED); + + for (j = 0; j < count; j++) + { + if (group == NULL || + strcmp (group, lgroups[charset_trans_array[j].lgroup]) == 0) + { + CharsetInfo *info; + info = g_new0 (CharsetInfo, 1); + info->name = charset_trans_array[j].charset_name; + info->title = charset_trans_array[j].charset_title; + l = g_list_append (l, info); + + /* FIXME check that the encoding exists in mozilla before + * adding it */ + } + } + + *charsets = l; + + return G_OK; +} + +static gresult +impl_get_charset_groups (EphyEmbedSingle *shell, + GList **groups) +{ + GList *l = NULL; + int i; + + for (i = 0; lgroups[i] != NULL; i++) + { + l = g_list_append (l, (gpointer)lgroups[i]); + } + + *groups = l; + + return G_OK; +} + +static gresult +impl_get_font_list (EphyEmbedSingle *shell, + const char *langGroup, + const char *fontType, + GList **fontList, + char **default_font) +{ + nsresult rv; + + nsCOMPtr mozFontList; + mozFontList = do_CreateInstance("@mozilla.org/gfx/fontlist;1", &rv); + if(NS_FAILED(rv)) return G_FAILED; + + nsCOMPtr fontEnum; + mozFontList->AvailableFonts(NS_ConvertUTF8toUCS2(langGroup).get(), + NS_ConvertUTF8toUCS2(fontType).get(), + getter_AddRefs(fontEnum)); + if(NS_FAILED(rv)) return G_FAILED; + + GList *l = NULL; + PRBool enumResult; + for(fontEnum->HasMoreElements(&enumResult) ; + enumResult == PR_TRUE; + fontEnum->HasMoreElements(&enumResult)) + { + nsCOMPtr fontName; + fontEnum->GetNext(getter_AddRefs(fontName)); + if(NS_FAILED(rv)) return G_FAILED; + + nsString fontString; + fontName->GetData(fontString); + + char *gFontString; + gFontString = g_strdup(NS_ConvertUCS2toUTF8(fontString).get()); + l = g_list_append(l, gFontString); + } + *fontList = l; + + if (default_font != NULL) + { + char key [255]; + + sprintf (key, "font.name.%s.%s", fontType, langGroup); + + *default_font = mozilla_prefs_get_string (key); + } + + return G_OK; +} + +static gresult +impl_list_cookies (EphyEmbedSingle *shell, + GList **cookies) +{ + nsresult result; + + nsCOMPtr cookieManager = + do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID); + nsCOMPtr cookieEnumerator; + result = + cookieManager->GetEnumerator (getter_AddRefs(cookieEnumerator)); + if (NS_FAILED(result)) return G_FAILED; + + PRBool enumResult; + for (cookieEnumerator->HasMoreElements(&enumResult) ; + enumResult == PR_TRUE ; + cookieEnumerator->HasMoreElements(&enumResult)) + { + CookieInfo *c; + + nsCOMPtr nsCookie; + result = cookieEnumerator->GetNext (getter_AddRefs(nsCookie)); + if (NS_FAILED(result)) return G_FAILED; + + c = g_new0 (CookieInfo, 1); + + nsCAutoString transfer; + + nsCookie->GetHost (transfer); + c->domain = g_strdup (transfer.get()); + nsCookie->GetName (transfer); + c->name = g_strdup (transfer.get()); + nsCookie->GetValue (transfer); + c->value = g_strdup (transfer.get()); + nsCookie->GetPath (transfer); + c->path = g_strdup (transfer.get()); + + PRBool isSecure; + nsCookie->GetIsSecure (&isSecure); + if (isSecure == PR_TRUE) + c->secure = g_strdup (_("Yes")); + else + c->secure = g_strdup (_("No")); + + PRUint64 dateTime; + nsCookie->GetExpires (&dateTime); + if(dateTime == 0) + c->expire = g_strdup (_("End of current session")); + else + c->expire = g_strdup_printf ("%s",ctime((time_t*)&dateTime)); + + *cookies = g_list_prepend (*cookies, c); + } + + *cookies = g_list_reverse (*cookies); + + return G_OK; +} + +static gresult +impl_remove_cookies (EphyEmbedSingle *shell, + GList *cookies) +{ + nsresult result; + GList *cl; + nsCOMPtr cookieManager = + do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID); + + for (cl = g_list_first(cookies) ; cl != NULL ; + cl = g_list_next (cl)) + { + CookieInfo *c = (CookieInfo *)cl->data; + + result = cookieManager->Remove (NS_LITERAL_CSTRING(c->domain), + NS_LITERAL_CSTRING(c->name), + NS_LITERAL_CSTRING(c->path), + PR_FALSE); + if (NS_FAILED(result)) return G_FAILED; + }; + + return G_OK; +} + +static gresult +impl_list_passwords (EphyEmbedSingle *shell, + PasswordType type, + GList **passwords) +{ + nsresult result = NS_ERROR_FAILURE; + + nsCOMPtr passwordManager = + do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID); + nsCOMPtr passwordEnumerator; + if (type == PASSWORD_PASSWORD) + result = passwordManager->GetEnumerator + (getter_AddRefs(passwordEnumerator)); + else if (type == PASSWORD_REJECT) + result = passwordManager->GetRejectEnumerator + (getter_AddRefs(passwordEnumerator)); + if (NS_FAILED(result)) return G_FAILED; + + PRBool enumResult; + for (passwordEnumerator->HasMoreElements(&enumResult) ; + enumResult == PR_TRUE ; + passwordEnumerator->HasMoreElements(&enumResult)) + { + nsCOMPtr nsPassword; + result = passwordEnumerator->GetNext + (getter_AddRefs(nsPassword)); + if (NS_FAILED(result)) return G_FAILED; + + PasswordInfo *p = g_new0 (PasswordInfo, 1); + + nsCAutoString transfer; + nsPassword->GetHost (transfer); + p->host = g_strdup (transfer.get()); + + if (type == PASSWORD_PASSWORD) + { + nsAutoString unicodeName; + nsPassword->GetUser (unicodeName); + p->username = g_strdup(NS_ConvertUCS2toUTF8(unicodeName).get()); + } + + *passwords = g_list_prepend (*passwords, p); + } + + *passwords = g_list_reverse (*passwords); + + return G_OK; +} + +static gresult +impl_remove_passwords (EphyEmbedSingle *shell, + GList *passwords, + PasswordType type) +{ + nsresult result = NS_ERROR_FAILURE; + nsCOMPtr passwordManager = + do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID); + + for (GList *l = g_list_first(passwords) ; l !=NULL ; + l = g_list_next(l)) + { + PasswordInfo *p = (PasswordInfo *)l->data; + if (type == PASSWORD_PASSWORD) + { + result = passwordManager->RemoveUser (NS_LITERAL_CSTRING(p->host), + NS_ConvertUTF8toUCS2(nsDependentCString(p->username))); + } + else if (type == PASSWORD_REJECT) + { + result = passwordManager->RemoveReject + (nsDependentCString(p->host)); + }; + + if (NS_FAILED(result)) return G_FAILED; + }; + + return G_OK; +} + +static gresult +impl_show_file_picker (EphyEmbedSingle *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) +{ + PRBool showContentCheck; + gchar *expanded_directory; + + if (ret_save_content == NULL) + showContentCheck = PR_FALSE; + else + showContentCheck = PR_TRUE; + + GFilePicker *filePicker = new GFilePicker (showContentCheck, + file_formats); + + /* FIXME sane path: expand tilde ... */ + expanded_directory = g_strdup (directory); + + /* make sure the directory exists, and use the home directory + * otherwise */ + if (!expanded_directory || + !g_file_test (expanded_directory, G_FILE_TEST_IS_DIR)) + { + if (expanded_directory) g_free (expanded_directory); + expanded_directory = g_strdup (g_get_home_dir()); + } + + nsCOMPtr dir = + do_CreateInstance (NS_LOCAL_FILE_CONTRACTID); + dir->InitWithNativePath (nsDependentCString(expanded_directory)); + g_free (expanded_directory); + + filePicker->InitWithGtkWidget (parentWidget, title, mode); + filePicker->SetDefaultString (NS_ConvertUTF8toUCS2(file).get()); + filePicker->SetDisplayDirectory (dir); + + PRInt16 retval; + filePicker->Show (&retval); + + if (ret_save_content != NULL) + { + if (retval == GFilePicker::returnOKSaveContent) + *ret_save_content = TRUE; + else + *ret_save_content = FALSE; + } + if (ret_file_format != NULL) + { + *ret_file_format = filePicker->mSelectedFileFormat; + } + + if (retval == nsIFilePicker::returnCancel) + { + delete filePicker; + return G_FAILED; + } + else + { + if (*ret_fullpath) + g_free (*ret_fullpath); + nsCOMPtr file; + filePicker->GetFile (getter_AddRefs(file)); + nsCAutoString tempFullPathStr; + file->GetNativePath (tempFullPathStr); + *ret_fullpath = g_strdup (tempFullPathStr.get()); + delete filePicker; + return G_OK; + } +} diff --git a/embed/mozilla/mozilla-embed-single.h b/embed/mozilla/mozilla-embed-single.h new file mode 100644 index 000000000..f46760d0c --- /dev/null +++ b/embed/mozilla/mozilla-embed-single.h @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti + * + * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef MOZILLA_EMBED_SINGLE_H +#define MOZILLA_EMBED_SINGLE_H + +#include "glib.h" +#include "ephy-embed-shell.h" +#include + +G_BEGIN_DECLS + +#define MOZILLA_EMBED_SINGLE_TYPE (mozilla_embed_single_get_type ()) +#define MOZILLA_EMBED_SINGLE(obj) (GTK_CHECK_CAST ((obj), MOZILLA_EMBED_SINGLE_TYPE, MozillaEmbedSingle)) +#define MOZILLA_EMBED_SINGLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), MOZILLA_EMBED_SINGLE_TYPE, MozillaEmbedSingleClass)) +#define IS_MOZILLA_EMBED_SINGLE(obj) (GTK_CHECK_TYPE ((obj), MOZILLA_EMBED_SINGLE_TYPE)) +#define IS_MOZILLA_EMBED_SINGLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), MOZILLA_EMBED_SINGLE)) +#define MOZILLA_EMBED_SINGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZILLA_EMBED_SINGLE_TYPE, MozillaEmbedSingleClass)) + +typedef struct MozillaEmbedSingle MozillaEmbedSingle; +typedef struct MozillaEmbedSinglePrivate MozillaEmbedSinglePrivate; + +struct MozillaEmbedSingle +{ + EphyEmbedSingle parent; + MozillaEmbedSinglePrivate *priv; +}; + +struct MozillaEmbedSingleClass +{ + EphyEmbedSingleClass parent_class; +}; + +GType mozilla_embed_single_get_type (void); + +G_END_DECLS + +#endif diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp index 24dfbb7a5..e188ecb99 100644 --- a/embed/mozilla/mozilla-notifiers.cpp +++ b/embed/mozilla/mozilla-notifiers.cpp @@ -19,6 +19,7 @@ #include "config.h" #include "ephy-embed-shell.h" +#include "ephy-embed-single.h" #include "mozilla-notifiers.h" #include "eel-gconf-extensions.h" #include "mozilla-prefs.h" @@ -82,7 +83,7 @@ static void mozilla_autodetect_charset_notifier(GConfClient *client, guint cnxn_id, GConfEntry *entry, - EphyEmbedShell *shell); + EphyEmbedSingle *single); static void mozilla_default_font_notifier(GConfClient *client, @@ -111,7 +112,7 @@ static void mozilla_default_charset_notifier (GConfClient *client, guint cnxn_id, GConfEntry *entry, - EphyEmbedShell *shell); + EphyEmbedSingle *single); static void mozilla_socks_version_notifier (GConfClient *client, guint cnxn_id, @@ -256,12 +257,14 @@ mozilla_proxy_autoconfig_notifier (GConfClient *client, GConfEntry *entry, char *pref) { - ephy_embed_shell_load_proxy_autoconf - (embed_shell, gconf_value_get_string(entry->value)); + EphyEmbedSingle *single; + single = ephy_embed_shell_get_embed_single (embed_shell); + ephy_embed_single_load_proxy_autoconf + (single, gconf_value_get_string(entry->value)); } void -mozilla_notifiers_init(MozillaEmbedShell *shell) +mozilla_notifiers_init(EphyEmbedSingle *single) { int i; @@ -296,7 +299,7 @@ mozilla_notifiers_init(MozillaEmbedShell *shell) ephy_notification_add( custom_notifiers[i].gconf_key, custom_notifiers[i].func, - (gpointer)shell, + (gpointer)single, &mozilla_notifiers); } @@ -482,7 +485,7 @@ static void mozilla_default_charset_notifier(GConfClient *client, guint cnxn_id, GConfEntry *entry, - EphyEmbedShell *shell) + EphyEmbedSingle *single) { /* FIXME */ } @@ -594,7 +597,7 @@ static void mozilla_autodetect_charset_notifier(GConfClient *client, guint cnxn_id, GConfEntry *entry, - EphyEmbedShell *shell) + EphyEmbedSingle *single) { int charset = eel_gconf_get_integer (CONF_LANGUAGE_AUTODETECT_CHARSET); if (charset < 0 || diff --git a/embed/mozilla/mozilla-notifiers.h b/embed/mozilla/mozilla-notifiers.h index 6718365f7..f7882b83f 100644 --- a/embed/mozilla/mozilla-notifiers.h +++ b/embed/mozilla/mozilla-notifiers.h @@ -19,9 +19,9 @@ #ifndef MOZILLA_NOTIFIERS_H #define MOZILLA_NOTIFIERS_H -#include "mozilla-embed-shell.h" +#include "ephy-embed-single.h" -void mozilla_notifiers_init (MozillaEmbedShell *shell); +void mozilla_notifiers_init (EphyEmbedSingle *single); void mozilla_notifiers_set_defaults (void); diff --git a/embed/mozilla/mozilla-prefs.cpp b/embed/mozilla/mozilla-prefs.cpp index e5b8c68e2..55f9dcc6b 100644 --- a/embed/mozilla/mozilla-prefs.cpp +++ b/embed/mozilla/mozilla-prefs.cpp @@ -22,17 +22,50 @@ #include #include #include +#include +#include #include #include +void +mozilla_prefs_load (const char *filename) +{ + nsresult rv; + + nsCOMPtr prefsLocalFile; + rv = NS_NewLocalFile (NS_ConvertUTF8toUCS2(filename), PR_TRUE, getter_AddRefs (prefsLocalFile)); + g_return_if_fail (NS_SUCCEEDED(rv)); + + nsCOMPtr prefService = + do_GetService (NS_PREFSERVICE_CONTRACTID); + g_return_if_fail (prefService != nsnull); + + nsCOMPtr prefsFile; + prefsLocalFile->QueryInterface(NS_GET_IID(nsIFile), (void **)&prefsFile); + g_return_if_fail (prefsFile != nsnull); + + prefService->ReadUserPrefs (prefsFile); +} + gboolean -mozilla_prefs_save (void) +mozilla_prefs_save (const char *filename) { + nsresult rv; + + nsCOMPtr prefsLocalFile; + rv = NS_NewLocalFile (NS_ConvertUTF8toUCS2(filename), PR_TRUE, getter_AddRefs (prefsLocalFile)); + g_return_val_if_fail (NS_SUCCEEDED(rv), FALSE); + nsCOMPtr prefService = do_GetService (NS_PREFSERVICE_CONTRACTID); g_return_val_if_fail (prefService != nsnull, FALSE); - nsresult rv = prefService->SavePrefFile (nsnull); + nsCOMPtr prefsFile; + prefsLocalFile->QueryInterface(NS_GET_IID(nsIFile), (void **)&prefsFile); + g_return_val_if_fail (prefsFile != nsnull, FALSE); + + rv = prefService->SavePrefFile (prefsFile); + return NS_SUCCEEDED (rv) ? TRUE : FALSE; } @@ -165,21 +198,3 @@ mozilla_prefs_get_string(const char *preference_name) return result; } -gboolean -mozilla_prefs_remove (const char *preference_name) -{ - g_return_val_if_fail (preference_name != NULL, FALSE); - - nsCOMPtr prefService = - do_GetService (NS_PREFSERVICE_CONTRACTID); - nsCOMPtr pref; - prefService->GetBranch ("", getter_AddRefs(pref)); - - if (pref) - { - nsresult rv = pref->ClearUserPref (preference_name); - return NS_SUCCEEDED (rv) ? TRUE : FALSE; - } - - return FALSE; -} diff --git a/embed/mozilla/mozilla-prefs.h b/embed/mozilla/mozilla-prefs.h index 82055c4a7..91d98c2e0 100644 --- a/embed/mozilla/mozilla-prefs.h +++ b/embed/mozilla/mozilla-prefs.h @@ -21,15 +21,17 @@ #include "glib/gtypes.h" -gboolean mozilla_prefs_save (void); +void mozilla_prefs_load (const char *filename); -gboolean mozilla_prefs_set_string (const char *preference_name, +gboolean mozilla_prefs_save (const char *filename); + +gboolean mozilla_prefs_set_string (const char *preference_name, const char *new_value); gboolean mozilla_prefs_set_boolean (const char *preference_name, gboolean new_boolean_value); -gboolean mozilla_prefs_set_int (const char *preference_name, +gboolean mozilla_prefs_set_int (const char *preference_name, int new_int_value); gboolean mozilla_prefs_get_boolean (const char *preference_name, @@ -39,6 +41,4 @@ int mozilla_prefs_get_int (const char *preference_name); gchar *mozilla_prefs_get_string (const char *preference_name); -gboolean mozilla_prefs_remove (const char *preference_name); - #endif diff --git a/src/appearance-prefs.c b/src/appearance-prefs.c index 0cb928cdf..85c4d91b9 100755 --- a/src/appearance-prefs.c +++ b/src/appearance-prefs.c @@ -183,10 +183,14 @@ setup_font_menu (AppearancePrefs *dialog, char key[255]; int pos; GtkWidget *entry = GTK_COMBO(combo)->entry; + EphyEmbedSingle *single; - ephy_embed_shell_get_font_list (EPHY_EMBED_SHELL (ephy_shell), - lang_encode[dialog->priv->language], - type, &fonts, &default_font); + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); + + ephy_embed_single_get_font_list (single, + lang_encode[dialog->priv->language], + type, &fonts, &default_font); /* Get the default font */ sprintf (key, "%s_%s_%s", CONF_RENDERING_FONT, type, diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c index 47b20c3cd..54481dbd3 100644 --- a/src/ephy-encoding-menu.c +++ b/src/ephy-encoding-menu.c @@ -241,6 +241,10 @@ ephy_encoding_menu_rebuild (EphyEncodingMenu *wrhm) GList *groups, *gl; EggMenuMerge *merge = EGG_MENU_MERGE (p->window->ui_merge); int group_index = 0, charset_index = 0; + EphyEmbedSingle *single; + + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); LOG ("Rebuilding encoding menu") @@ -252,7 +256,7 @@ ephy_encoding_menu_rebuild (EphyEncodingMenu *wrhm) p->action_group = egg_action_group_new ("EncodingActions"); egg_menu_merge_insert_action_group (merge, p->action_group, 0); - ephy_embed_shell_get_charset_groups (embed_shell, &groups); + ephy_embed_single_get_charset_groups (single, &groups); for (gl = groups; gl != NULL; gl = gl->next) { @@ -261,9 +265,9 @@ ephy_encoding_menu_rebuild (EphyEncodingMenu *wrhm) build_group (p->action_group, xml, group, group_index); - ephy_embed_shell_get_charset_titles (embed_shell, - group, - &charsets); + ephy_embed_single_get_charset_titles (single, + group, + &charsets); for (cl = charsets; cl != NULL; cl = cl->next) { diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c index d4b853866..a1084ce94 100644 --- a/src/ephy-nautilus-view.c +++ b/src/ephy-nautilus-view.c @@ -169,6 +169,10 @@ ephy_nautilus_view_instance_init (EphyNautilusView *view) { GtkWidget *w; EphyNautilusViewPrivate *p = g_new0 (EphyNautilusViewPrivate, 1); + EphyEmbedSingle *single; + + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); view->priv = p; view->priv->embed = ephy_embed_new (G_OBJECT (ephy_shell)); diff --git a/src/ephy-shell.c b/src/ephy-shell.c index c16f37403..964744a4a 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -103,7 +103,7 @@ ephy_shell_get_type (void) (GInstanceInitFunc) ephy_shell_init }; - ephy_shell_type = g_type_register_static (EPHY_EMBED_SHELL_IMPL, + ephy_shell_type = g_type_register_static (EPHY_EMBED_SHELL_TYPE, "EphyShell", &our_info, 0); } @@ -188,6 +188,12 @@ ephy_shell_new_window_cb (EphyEmbedShell *shell, static void ephy_shell_init (EphyShell *gs) { + EphyEmbedSingle *single; + + gs->priv = g_new0 (EphyShellPrivate, 1); + gs->priv->session = NULL; + gs->priv->bookmarks = NULL; + ephy_shell = gs; g_object_add_weak_pointer (G_OBJECT(ephy_shell), (gpointer *)&ephy_shell); @@ -199,9 +205,8 @@ ephy_shell_init (EphyShell *gs) ephy_stock_icons_init (); ephy_ensure_dir_exists (ephy_dot_dir ()); - gs->priv = g_new0 (EphyShellPrivate, 1); - gs->priv->session = NULL; - gs->priv->bookmarks = NULL; + /* This ensures mozilla is fired up */ + single = ephy_embed_shell_get_embed_single (EPHY_EMBED_SHELL (gs)); g_signal_connect (G_OBJECT (gs), "new_window_orphan", diff --git a/src/ephy-tab.c b/src/ephy-tab.c index 9b3e53c5a..e660b6bba 100644 --- a/src/ephy-tab.c +++ b/src/ephy-tab.c @@ -189,13 +189,14 @@ static void ephy_tab_init (EphyTab *tab) { GObject *embed, *embed_widget; - EphyEmbedShell *shell; + EphyEmbedSingle *single; - tab->priv = g_new0 (EphyTabPrivate, 1); + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); - shell = EPHY_EMBED_SHELL (ephy_shell); + tab->priv = g_new0 (EphyTabPrivate, 1); - tab->priv->embed = ephy_embed_new (G_OBJECT(shell)); + tab->priv->embed = ephy_embed_new (G_OBJECT(single)); tab->priv->window = NULL; tab->priv->event = NULL; diff --git a/src/general-prefs.c b/src/general-prefs.c index 706820f43..81fb1c1e2 100755 --- a/src/general-prefs.c +++ b/src/general-prefs.c @@ -18,6 +18,7 @@ #include "general-prefs.h" #include "ephy-shell.h" +#include "ephy-embed-single.h" #include "ephy-prefs.h" #include "ephy-embed-prefs.h" #include "ephy-shell.h" @@ -185,8 +186,12 @@ default_charset_menu_changed_cb (GtkOptionMenu *option_menu, GList *charsets; int i; CharsetInfo *info; + EphyEmbedSingle *single; - ephy_embed_shell_get_charset_titles (shell, NULL, &charsets); + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); + + ephy_embed_single_get_charset_titles (single, NULL, &charsets); i = gtk_option_menu_get_history (option_menu); charsets = g_list_nth (charsets, i); @@ -211,15 +216,17 @@ find_charset_in_list_cmp (gconstpointer a, static void create_default_charset_menu (GeneralPrefs *dialog) { - EphyEmbedShell *shell; GList *l; GList *charsets; GtkWidget *menu; GtkWidget *optionmenu; char *value; + EphyEmbedSingle *single; + + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); - shell = EPHY_EMBED_SHELL (ephy_shell); - ephy_embed_shell_get_charset_titles (shell, NULL, &l); + ephy_embed_single_get_charset_titles (single, NULL, &l); menu = gtk_menu_new (); @@ -251,7 +258,7 @@ create_default_charset_menu (GeneralPrefs *dialog) g_signal_connect (optionmenu, "changed", G_CALLBACK (default_charset_menu_changed_cb), - shell); + embed_shell); g_list_free (l); } diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 3524d6495..fc0a102f0 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -427,53 +427,61 @@ static void pdm_dialog_cookie_remove (PdmActionInfo *info, GList *data) { - ephy_embed_shell_remove_cookies - (EPHY_EMBED_SHELL (ephy_shell), data); + EphyEmbedSingle *single; + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); + ephy_embed_single_remove_cookies (single, data); } static void pdm_dialog_password_remove (PdmActionInfo *info, GList *data) { - ephy_embed_shell_remove_passwords - (EPHY_EMBED_SHELL (ephy_shell), data, - PASSWORD_PASSWORD); + EphyEmbedSingle *single; + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); + + ephy_embed_single_remove_passwords (single, data, + PASSWORD_PASSWORD); } static void pdm_dialog_cookies_free (PdmActionInfo *info, GList *data) { - EphyEmbedShell *shell; GList *l; + EphyEmbedSingle *single; + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); - shell = EPHY_EMBED_SHELL (ephy_shell); l = data ? data : info->list; - ephy_embed_shell_free_cookies (shell, l); + ephy_embed_single_free_cookies (single, l); } static void pdm_dialog_passwords_free (PdmActionInfo *info, GList *data) { - EphyEmbedShell *shell; GList *l; + EphyEmbedSingle *single; + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); - shell = EPHY_EMBED_SHELL (ephy_shell); l = data ? data : info->list; - ephy_embed_shell_free_passwords (shell, l); + ephy_embed_single_free_passwords (single, l); } static void pdm_dialog_init (PdmDialog *dialog) { - EphyEmbedShell *shell; PdmActionInfo *cookies; PdmActionInfo *passwords; GtkWidget *cookies_tv; GtkWidget *passwords_tv; + EphyEmbedSingle *single; - shell = EPHY_EMBED_SHELL (ephy_shell); + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); dialog->priv = g_new0 (PdmDialogPrivate, 1); dialog->priv->cookies = NULL; @@ -488,7 +496,7 @@ pdm_dialog_init (PdmDialog *dialog) passwords_tv = setup_passwords_treeview (dialog); cookies = g_new0 (PdmActionInfo, 1); - ephy_embed_shell_list_cookies (shell, &cookies->list); + ephy_embed_single_list_cookies (single, &cookies->list); cookies->dialog = dialog; cookies->remove_id = PROP_COOKIES_REMOVE; cookies->add = pdm_dialog_cookie_add; @@ -499,8 +507,8 @@ pdm_dialog_init (PdmDialog *dialog) setup_action (cookies); passwords = g_new0 (PdmActionInfo, 1); - ephy_embed_shell_list_passwords (shell, PASSWORD_PASSWORD, - &passwords->list); + ephy_embed_single_list_passwords (single, PASSWORD_PASSWORD, + &passwords->list); passwords->dialog = dialog; passwords->remove_id = PROP_PASSWORDS_REMOVE; passwords->add = pdm_dialog_password_add; diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 438cd900e..1d7bb34ee 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -318,18 +318,22 @@ void prefs_clear_memory_cache_button_clicked_cb (GtkWidget *button, gpointer data) { - EphyEmbedShell *shell; + EphyEmbedSingle *single; - shell = EPHY_EMBED_SHELL (ephy_shell); - ephy_embed_shell_clear_cache (shell, MEMORY_CACHE); + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); + + ephy_embed_single_clear_cache (single, MEMORY_CACHE); } void prefs_clear_disk_cache_button_clicked_cb (GtkWidget *button, gpointer data) { - EphyEmbedShell *shell; + EphyEmbedSingle *single; + + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); - shell = EPHY_EMBED_SHELL (ephy_shell); - ephy_embed_shell_clear_cache (shell, DISK_CACHE); + ephy_embed_single_clear_cache (single, DISK_CACHE); } diff --git a/src/window-commands.c b/src/window-commands.c index f83f56a89..923bf4775 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -308,6 +308,10 @@ window_cmd_file_open (EggAction *action, GtkWidget *wmain; EphyEmbedShell *embed_shell; gresult result; + EphyEmbedSingle *single; + + single = ephy_embed_shell_get_embed_single + (EPHY_EMBED_SHELL (ephy_shell)); embed_shell = EPHY_EMBED_SHELL (ephy_shell); @@ -316,8 +320,8 @@ window_cmd_file_open (EggAction *action, dir = eel_gconf_get_string (CONF_STATE_OPEN_DIR); - result = ephy_embed_shell_show_file_picker - (embed_shell, wmain, + result = ephy_embed_single_show_file_picker + (single, wmain, _("Select the file to open"), dir, NULL, modeOpen, &file, NULL, NULL, NULL); -- cgit v1.2.3