diff options
| -rw-r--r-- | ChangeLog | 49 | ||||
| -rw-r--r-- | embed/ephy-embed-single.c | 292 | ||||
| -rw-r--r-- | embed/ephy-embed-single.h | 226 | ||||
| -rw-r--r-- | embed/mozilla/default-prefs.js | 24 |
4 files changed, 591 insertions, 0 deletions
@@ -1,3 +1,52 @@ +2003-02-05 Marco Pesenti Gritti <marco@it.gnome.org> + + * embed/Makefile.am: + * embed/ephy-embed-event.h: + * embed/ephy-embed-shell.c: (ephy_embed_shell_init), + (ephy_embed_shell_finalize), (ephy_embed_shell_new), + (ephy_embed_shell_get_embed_single), (impl_get_downloader_view): + * embed/ephy-embed-shell.h: + * embed/ephy-embed-utils.c: (ephy_embed_utils_save), + (ephy_embed_utils_build_charsets_submenu): + * embed/ephy-embed.c: (ephy_embed_new): + * embed/ephy-embed.h: + * embed/mozilla/ContentHandler.h: + * embed/mozilla/EventContext.cpp: + * embed/mozilla/GlobalHistory.cpp: + * embed/mozilla/Makefile.am: + * embed/mozilla/MozRegisterComponents.cpp: + * embed/mozilla/PromptService.cpp: + * embed/mozilla/mozilla-notifiers.cpp: + * embed/mozilla/mozilla-notifiers.h: + * embed/mozilla/mozilla-prefs.cpp: + * embed/mozilla/mozilla-prefs.h: + * src/appearance-prefs.c: (setup_font_menu): + * src/ephy-encoding-menu.c: (ephy_encoding_menu_rebuild): + * src/ephy-nautilus-view.c: (ephy_nautilus_view_instance_init): + * src/ephy-shell.c: (ephy_shell_get_type), (ephy_shell_init): + * src/ephy-tab.c: (ephy_tab_init): + * src/general-prefs.c: (default_charset_menu_changed_cb), + (create_default_charset_menu): + * src/pdm-dialog.c: (pdm_dialog_cookie_remove), + (pdm_dialog_password_remove), (pdm_dialog_cookies_free), + (pdm_dialog_passwords_free), (pdm_dialog_init): + * src/prefs-dialog.c: (prefs_clear_memory_cache_button_clicked_cb), + (prefs_clear_disk_cache_button_clicked_cb): + * src/window-commands.c: (window_cmd_file_open): + + Split mozilla related calls out of EmbedShell. + Load default mozilla prefs from a .js file. + Disable stupid useless security dialogs. + Fix chechbox alert to have Ok as default action. + +2003-02-04 Marco Pesenti Gritti <marco@it.gnome.org> + + * data/epiphany.desktop.in: + * src/ephy-window.c: + + Fix back/forward accels. + Add startup feedback. + 2003-02-04 Xan Lopez <xan@masilla.org> * src/bookmarks/ephy-bookmarks-editor.c: diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c new file mode 100644 index 000000000..dd83b8039 --- /dev/null +++ b/embed/ephy-embed-single.c @@ -0,0 +1,292 @@ +/* + * 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 <config.h> + +#include "ephy-embed-shell.h" +#include "ephy-marshal.h" +#include "ephy-favicon-cache.h" +#include "mozilla-embed-single.h" +#include "ephy-debug.h" + +#include <string.h> + +struct EphyEmbedSinglePrivate +{ + EphyHistory *global_history; + DownloaderView *downloader_view; + GList *embeds; + EphyFaviconCache *favicon_cache; +}; + +static void +ephy_embed_single_class_init (EphyEmbedSingleClass *klass); +static void +ephy_embed_single_init (EphyEmbedSingle *ges); +static void +ephy_embed_single_finalize (GObject *object); + +static GObjectClass *parent_class = NULL; + +GType +ephy_embed_single_get_type (void) +{ + static GType ephy_embed_single_type = 0; + + if (ephy_embed_single_type == 0) + { + static const GTypeInfo our_info = + { + sizeof (EphyEmbedSingleClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) ephy_embed_single_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EphyEmbedSingle), + 0, /* n_preallocs */ + (GInstanceInitFunc) ephy_embed_single_init + }; + + ephy_embed_single_type = g_type_register_static (G_TYPE_OBJECT, + "EphyEmbedSingle", + &our_info, 0); + } + + return ephy_embed_single_type; +} + +static void +ephy_embed_single_class_init (EphyEmbedSingleClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + parent_class = (GObjectClass *) g_type_class_peek_parent (klass); + + object_class->finalize = ephy_embed_single_finalize; +} + +static void +ephy_embed_single_init (EphyEmbedSingle *ges) +{ + ges->priv = g_new0 (EphyEmbedSinglePrivate, 1); + + ges->priv->global_history = NULL; + ges->priv->downloader_view = NULL; + ges->priv->embeds = NULL; + + ges->priv->favicon_cache = NULL; +} + +static void +ephy_embed_single_finalize (GObject *object) +{ + EphyEmbedSingle *ges; + + g_return_if_fail (object != NULL); + g_return_if_fail (IS_EPHY_EMBED_SINGLE (object)); + + ges = EPHY_EMBED_SINGLE (object); + + g_return_if_fail (ges->priv != NULL); + + g_free (ges->priv); + + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +EphyEmbedSingle * +ephy_embed_single_new (const char *type) +{ + if (strcmp (type, "mozilla") == 0) + { + return EPHY_EMBED_SINGLE (g_object_new + (MOZILLA_EMBED_SINGLE_TYPE, NULL)); + } + + g_assert_not_reached (); + return NULL; +} + +gresult +ephy_embed_single_clear_cache (EphyEmbedSingle *shell, + CacheType type) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->clear_cache (shell, type); +} + +gresult +ephy_embed_single_set_offline_mode (EphyEmbedSingle *shell, + gboolean offline) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->set_offline_mode (shell, offline); +} + +gresult +ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *shell, + const char* url) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->load_proxy_autoconf (shell, url); +} + +gresult +ephy_embed_single_get_charset_titles (EphyEmbedSingle *shell, + const char *group, + GList **charsets) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->get_charset_titles (shell, group, charsets); +} + +gresult +ephy_embed_single_get_charset_groups (EphyEmbedSingle *shell, + GList **groups) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->get_charset_groups (shell, groups); +} + +gresult +ephy_embed_single_get_font_list (EphyEmbedSingle *shell, + const char *langGroup, + const char *fontType, + GList **fontList, + char **default_font) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->get_font_list (shell, langGroup, fontType, fontList, + default_font); +} + +gresult +ephy_embed_single_list_cookies (EphyEmbedSingle *shell, + GList **cookies) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->list_cookies (shell, cookies); +} + +gresult +ephy_embed_single_remove_cookies (EphyEmbedSingle *shell, + GList *cookies) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->remove_cookies (shell, cookies); +} + +gresult +ephy_embed_single_list_passwords (EphyEmbedSingle *shell, + PasswordType type, + GList **passwords) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->list_passwords (shell, type, passwords); +} + +gresult +ephy_embed_single_remove_passwords (EphyEmbedSingle *shell, + GList *passwords, + PasswordType type) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_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_single_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) +{ + EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); + return klass->show_file_picker (shell, parentWidget, title, + directory, file, mode, + ret_fullpath, ret_save_content, + file_formats, ret_file_format); +} + +gresult +ephy_embed_single_free_cookies (EphyEmbedSingle *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_single_free_passwords (EphyEmbedSingle *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-single.h b/embed/ephy-embed-single.h new file mode 100644 index 000000000..d685ac475 --- /dev/null +++ b/embed/ephy-embed-single.h @@ -0,0 +1,226 @@ +/* + * 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 EPHY_EMBED_SINGLE_H +#define EPHY_EMBED_SINGLE_H + +#include "ephy-embed.h" +#include "ephy-favicon-cache.h" +#include "ephy-history.h" +#include "downloader-view.h" + +#include <glib-object.h> +#include <glib.h> + +G_BEGIN_DECLS + +typedef struct EphyEmbedSingleClass EphyEmbedSingleClass; + +#define EPHY_EMBED_SINGLE_TYPE (ephy_embed_single_get_type ()) +#define EPHY_EMBED_SINGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_EMBED_SINGLE_TYPE, EphyEmbedSingle)) +#define EPHY_EMBED_SINGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_EMBED_SINGLE_TYPE, EphyEmbedSingleClass)) +#define IS_EPHY_EMBED_SINGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_EMBED_SINGLE_TYPE)) +#define IS_EPHY_EMBED_SINGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_EMBED_SINGLE_TYPE)) +#define EPHY_EMBED_SINGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_EMBED_SINGLE_TYPE, EphyEmbedSingleClass)) + +typedef struct EphyEmbedSingle EphyEmbedSingle; +typedef struct EphyEmbedSinglePrivate EphyEmbedSinglePrivate; + +/** + * 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; + +struct EphyEmbedSingle +{ + GObject parent; + EphyEmbedSinglePrivate *priv; +}; + +struct EphyEmbedSingleClass +{ + GObjectClass parent_class; + + /* Methods */ + + gresult (* clear_cache) (EphyEmbedSingle *shell, + CacheType type); + gresult (* set_offline_mode) (EphyEmbedSingle *shell, + gboolean offline); + gresult (* load_proxy_autoconf) (EphyEmbedSingle *shell, + const char* url); + gresult (* show_java_console) (EphyEmbedSingle *shell); + gresult (* show_js_console) (EphyEmbedSingle *shell); + gresult (* get_charset_groups) (EphyEmbedSingle *shell, + GList **groups); + gresult (* get_charset_titles) (EphyEmbedSingle *shell, + const char *group, + GList **charsets); + gresult (* get_font_list) (EphyEmbedSingle *shell, + const char *langGroup, + const char *fontType, + GList **fontList, + char **default_font); + gresult (* list_cookies) (EphyEmbedSingle *shell, + GList **cokies); + gresult (* remove_cookies) (EphyEmbedSingle *shell, + GList *cookies); + gresult (* list_passwords) (EphyEmbedSingle *shell, + PasswordType type, + GList **passwords); + gresult (* remove_passwords) (EphyEmbedSingle *shell, + GList *passwords, + PasswordType type); + gresult (* 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, + gint *ret_file_format); +}; + +GType ephy_embed_single_get_type (void); + +EphyEmbedSingle *ephy_embed_single_new (const char *type); + +gresult ephy_embed_single_clear_cache (EphyEmbedSingle *shell, + CacheType type); + +gresult ephy_embed_single_set_offline_mode (EphyEmbedSingle *shell, + gboolean offline); + +gresult ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *shell, + const char* url); + +/* Charsets */ +gresult ephy_embed_single_get_charset_groups (EphyEmbedSingle *shell, + GList **groups); + +gresult ephy_embed_single_get_charset_titles (EphyEmbedSingle *shell, + const char *group, + GList **charsets); + +gresult ephy_embed_single_get_font_list (EphyEmbedSingle *shell, + const char *langGroup, + const char *fontType, + GList **fontList, + char **default_font); + +/* Cookies */ +gresult ephy_embed_single_list_cookies (EphyEmbedSingle *shell, + GList **cookies); + +gresult ephy_embed_single_remove_cookies (EphyEmbedSingle *shell, + GList *cookies); + +gresult ephy_embed_single_free_cookies (EphyEmbedSingle *shell, + GList *cookies); + +/* Passwords */ +gresult ephy_embed_single_list_passwords (EphyEmbedSingle *shell, + PasswordType type, + GList **passwords); + +gresult ephy_embed_single_free_passwords (EphyEmbedSingle *shell, + GList *passwords); + +gresult ephy_embed_single_remove_passwords (EphyEmbedSingle *shell, + GList *passwords, + PasswordType type); + +gresult ephy_embed_single_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); + +G_END_DECLS + +#endif diff --git a/embed/mozilla/default-prefs.js b/embed/mozilla/default-prefs.js new file mode 100644 index 000000000..82ce61c46 --- /dev/null +++ b/embed/mozilla/default-prefs.js @@ -0,0 +1,24 @@ +// Don't allow mozilla to raise window when setting focus (work around bugs) +user_pref("mozilla.widget.raise-on-setfocus", false); + +// set default search engine +user_pref("keyword.URL", "http://www.google.com/search?q="); +user_pref("keyword.enabled", true); +user_pref("security.checkloaduri", false); + +// dont allow xpi installs from epiphany, there are crashes +user_pref("xpinstall.enabled", false); + +// deactivate mailcap and mime.types support +user_pref("helpers.global_mailcap_file", ""); +user_pref("helpers.global_mime_types_file", ""); +user_pref("helpers.private_mailcap_file", ""); +user_pref("helpers.private_mime_types_file", ""); + +// disable sucky XUL ftp view, have nice ns4-like html page instead +user_pref("network.dir.generate_html", true); + +// disable usless security warnings +user_pref("security.warn_entering_secure", false); +user_pref("security.warn_leaving_secure", false); +user_pref("security.warn_submit_insecure", false); |