--- epiphany-browser-2.21.4.orig/doc/reference/epiphany.args +++ epiphany-browser-2.21.4/doc/reference/epiphany.args @@ -0,0 +1,240 @@ + +EphyDialog::Modal +gboolean + +rw +Modal +Modal dialog. +FALSE + + + +EphyDialog::default-height +gint +>= -1 +rwX +Default height +Default dialog height. +-1 + + + +EphyDialog::default-width +gint +>= -1 +rwX +Default width +Default dialog width. +-1 + + + +EphyDialog::parent-window +GtkWindow + +rw +Parent window +Parent window. + + + + +EphyDialog::persist-position +gboolean + +rwX +Persist position +Persist dialog position. +FALSE + + + +EphyFileChooser::persist-key +gchararray + +rw +Persist Key +The gconf key to which to persist the selected directory. +NULL + + + +EphyNodeDb::immutable +gboolean + +rw +Immutable +Immutable. +FALSE + + + +EphyNodeDb::name +gchararray + +rwX +Name +Name. +NULL + + + +EphyLocationEntry::secure-bg-color +GdkColor + +sr +Secure background colour +Background colour to use for secure sites. + + + + +EphyLocationEntry::secure-fg-color +GdkColor + +sr +Secure foreground Colour +Foreground colour to use for secure sites. + + + + +EphyZoomAction::zoom +gfloat +[0.707107,4] +rw +zoom +(null) +1 + + + +EphyZoomControl::zoom +gfloat +[0.707107,4] +rw +zoom +(null) +1 + + + +EphyEmbedDialog::embed +GObject + +rw +Embed +The dialog's embed. + + + + +EphyEmbedPersist::dest +gchararray + +rw +Destination +Destination file path. +NULL + + + +EphyEmbedPersist::embed +GObject + +rwX +Embed +The embed containing the document. + + + + +EphyEmbedPersist::filechooser-parent +GtkWindow + +rw +Filechooser parent +The parent window for the filechooser. + + + + +EphyEmbedPersist::filechooser-title +gchararray + +rw +Filechooser title +Title to use if showing filechooser. +NULL + + + +EphyEmbedPersist::flags +EphyEmbedPersistFlags + +rw +Flags +Flags. + + + + +EphyEmbedPersist::max-size +gint64 +>= -1 +rw +Maxsize +Maximum size of the file. +-1 + + + +EphyEmbedPersist::persist-key +gchararray + +rw +persist key +Path persistence gconf key. +NULL + + + +EphyEmbedPersist::source +gchararray + +rw +Source +Url of the document to save. +NULL + + + +EphyEmbedPersist::user-time +guint + +rw +User Time +User Time. +0 + + + +EphyEmbedSingle::network-status +gboolean + +rw +network-status +network-status. +FALSE + + + +EphySession::active-window +EphyWindow + +r +Active Window +The active window. + + + --- epiphany-browser-2.21.4.orig/doc/reference/epiphany-undeclared.txt +++ epiphany-browser-2.21.4/doc/reference/epiphany-undeclared.txt @@ -0,0 +1,48 @@ +EPHY_SHELL_ERROR +EmbedPersistFlags +EmbedPrintPreviewNavType +EmbedReloadFlags +EmbedSecurityLevel +EmbedState +EmitCookieNotification +EphyCookieP3PPolicy +EphyCookieP3PState +EphyPermissionType +EphyShellError +EphyShellStartupFlags +ephy_embed_activate +ephy_embed_find_next +ephy_embed_get_encoding_info +ephy_embed_print_preview_close +ephy_embed_single_load_proxy_autoconf +ephy_embed_single_set_offline_mode +ephy_extensions_manager_add +ephy_extensions_manager_list +ephy_extensions_manager_load_dir +ephy_extensions_manager_new +ephy_glade_widget_new +ephy_node_db_get_by_name +ephy_password_manager_add +ephy_password_manager_list +ephy_password_manager_remove +ephy_permission_manager_add +ephy_permission_manager_clear +ephy_permission_manager_list +ephy_permission_manager_remove +ephy_permission_manager_test +ephy_session_autoresume +ephy_shell_delete_on_exit +ephy_shell_error_quark +ephy_shell_get_active_window +ephy_shell_get_print_setup_dialog +ephy_shell_new +ephy_shell_startup +ephy_window_add_tab +ephy_window_find +ephy_window_get_active_embed +ephy_window_get_active_tab +ephy_window_get_tabs +ephy_window_jump_to_tab +ephy_window_print +ephy_window_remove_tab +ephy_window_set_print_preview --- epiphany-browser-2.21.4.orig/doc/reference/epiphany-decl.txt +++ epiphany-browser-2.21.4/doc/reference/epiphany-decl.txt @@ -0,0 +1,6515 @@ + +EPHY_TYPE_HOME_ACTION +#define EPHY_TYPE_HOME_ACTION (ephy_home_action_get_type ()) + + +EPHY_HOME_ACTION +#define EPHY_HOME_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_HOME_ACTION, EphyHomeAction)) + + +EPHY_HOME_ACTION_CLASS +#define EPHY_HOME_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_HOME_ACTION, EphyHomeActionClass)) + + +EPHY_IS_HOME_ACTION +#define EPHY_IS_HOME_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_HOME_ACTION)) + + +EPHY_IS_HOME_ACTION_CLASS +#define EPHY_IS_HOME_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_HOME_ACTION)) + + +EPHY_HOME_ACTION_GET_CLASS +#define EPHY_HOME_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_HOME_ACTION, EphyHomeActionClass)) + + +EphyHomeAction + + +EphyHomeActionClass + + +EphyHomeAction +struct _EphyHomeAction +{ + EphyLinkAction parent_instance; +}; + + +EphyHomeActionClass +struct _EphyHomeActionClass +{ + EphyLinkActionClass parent_class; +}; + + +ephy_home_action_get_type +GType +void + + +EPHY_TYPE_FIND_TOOLBAR +#define EPHY_TYPE_FIND_TOOLBAR (ephy_find_toolbar_get_type ()) + + +EPHY_FIND_TOOLBAR +#define EPHY_FIND_TOOLBAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbar)) + + +EPHY_FIND_TOOLBAR_CLASS +#define EPHY_FIND_TOOLBAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbarClass)) + + +EPHY_IS_FIND_TOOLBAR +#define EPHY_IS_FIND_TOOLBAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_FIND_TOOLBAR)) + + +EPHY_IS_FIND_TOOLBAR_CLASS +#define EPHY_IS_FIND_TOOLBAR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_FIND_TOOLBAR)) + + +EPHY_FIND_TOOLBAR_GET_CLASS +#define EPHY_FIND_TOOLBAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_FIND_TOOLBAR, EphyFindToolbarClass)) + + +EphyFindToolbar + + +EphyFindToolbarPrivate + + +EphyFindToolbarClass + + +EphyFindToolbar +struct _EphyFindToolbar +{ + GtkToolbar parent; + + /*< private >*/ + EphyFindToolbarPrivate *priv; +}; + + +EphyFindToolbarClass +struct _EphyFindToolbarClass +{ + GtkToolbarClass parent_class; + + /* Signals */ + void (* next) (EphyFindToolbar *toolbar); + void (* previous) (EphyFindToolbar *toolbar); + void (* close) (EphyFindToolbar *toolbar); +}; + + +ephy_find_toolbar_get_type +GType +void + + +ephy_find_toolbar_new +EphyFindToolbar * +EphyWindow *window + + +ephy_find_toolbar_get_text +const char * +EphyFindToolbar *toolbar + + +ephy_find_toolbar_set_embed +void +EphyFindToolbar *toolbar,EphyEmbed *embed + + +ephy_find_toolbar_find_next +void +EphyFindToolbar *toolbar + + +ephy_find_toolbar_find_previous +void +EphyFindToolbar *toolbar + + +ephy_find_toolbar_open +void +EphyFindToolbar *toolbar,gboolean links_only,gboolean clear_search + + +ephy_find_toolbar_close +void +EphyFindToolbar *toolbar + + +ephy_find_toolbar_request_close +void +EphyFindToolbar *toolbar + + +EPHY_TYPE_EXTENSIONS_MANAGER +#define EPHY_TYPE_EXTENSIONS_MANAGER (ephy_extensions_manager_get_type ()) + + +EPHY_EXTENSIONS_MANAGER +#define EPHY_EXTENSIONS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EXTENSIONS_MANAGER, EphyExtensionsManager)) + + +EPHY_EXTENSIONS_MANAGER_CLASS +#define EPHY_EXTENSIONS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EXTENSIONS_MANAGER, EphyExtensionsManagerClass)) + + +EPHY_IS_EXTENSIONS_MANAGER +#define EPHY_IS_EXTENSIONS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EXTENSIONS_MANAGER)) + + +EPHY_IS_EXTENSIONS_MANAGER_CLASS +#define EPHY_IS_EXTENSIONS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EXTENSIONS_MANAGER)) + + +EPHY_EXTENSIONS_MANAGER_GET_CLASS +#define EPHY_EXTENSIONS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_EXTENSIONS_MANAGER, EphyExtensionsManagerClass)) + + +EphyExtensionsManager + + +EphyExtensionsManagerClass + + +EphyExtensionsManagerPrivate + + +EphyExtensionsManagerClass +struct _EphyExtensionsManagerClass +{ + GObjectClass parent_class; + + /* Signals */ + void (* added) (EphyExtensionsManager *manager, + EphyExtensionInfo *info); + void (* changed) (EphyExtensionsManager *manager, + EphyExtensionInfo *info); + void (* removed) (EphyExtensionsManager *manager, + EphyExtensionInfo *info); +}; + + +EphyExtensionsManager +struct _EphyExtensionsManager +{ + GObject parent_instance; + + /*< private >*/ + EphyExtensionsManagerPrivate *priv; +}; + + +ephy_extensions_manager_get_type +GType +void + + +ephy_extensions_manager_startup +void +EphyExtensionsManager *manager + + +ephy_extensions_manager_load +void +EphyExtensionsManager *manager,const char *identifier + + +ephy_extensions_manager_unload +void +EphyExtensionsManager *manager,const char *identifier + + +ephy_extensions_manager_register +void +EphyExtensionsManager *manager,GObject *object + + +ephy_extensions_manager_get_extensions +GList * +EphyExtensionsManager *manager + + +EPHY_TYPE_PYTHON_LOADER +#define EPHY_TYPE_PYTHON_LOADER (ephy_python_loader_get_type ()) + + +EPHY_PYTHON_LOADER +#define EPHY_PYTHON_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PYTHON_LOADER, EphyPythonLoader)) + + +EPHY_PYTHON_LOADER_CLASS +#define EPHY_PYTHON_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PYTHON_LOADER, EphyPythonLoaderClass)) + + +EPHY_IS_PYTHON_LOADER +#define EPHY_IS_PYTHON_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PYTHON_LOADER)) + + +EPHY_IS_PYTHON_LOADER_CLASS +#define EPHY_IS_PYTHON_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PYTHON_LOADER)) + + +EPHY_PYTHON_LOADER_GET_CLASS +#define EPHY_PYTHON_LOADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_PYTHON_LOADER, EphyPythonLoaderClass)) + + +EphyPythonLoader + + +EphyPythonLoaderClass + + +EphyPythonLoaderPrivate + + +EphyPythonLoaderClass +struct _EphyPythonLoaderClass +{ + GObjectClass parent_class; +}; + + +EphyPythonLoader +struct _EphyPythonLoader +{ + GObject parent_instance; + + /*< private >*/ + EphyPythonLoaderPrivate *priv; +}; + + +ephy_python_loader_get_type +GType +void + + +EPHY_TYPE_NET_MONITOR +#define EPHY_TYPE_NET_MONITOR (ephy_net_monitor_get_type ()) + + +EPHY_NET_MONITOR +#define EPHY_NET_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_NET_MONITOR, EphyNetMonitor)) + + +EPHY_NET_MONITOR_CLASS +#define EPHY_NET_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_NET_MONITOR, EphyNetMonitorClass)) + + +EPHY_IS_NET_MONITOR +#define EPHY_IS_NET_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_NET_MONITOR)) + + +EPHY_IS_NET_MONITOR_CLASS +#define EPHY_IS_NET_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NET_MONITOR)) + + +EPHY_NET_MONITOR_GET_CLASS +#define EPHY_NET_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NET_MONITOR, EphyNetMonitorClass)) + + +EphyNetMonitor + + +EphyNetMonitorClass + + +EphyNetMonitorPrivate + + +EphyNetMonitorClass +struct _EphyNetMonitorClass +{ + GObjectClass parent_class; +}; + + +EphyNetMonitor +struct _EphyNetMonitor +{ + GObject parent_instance; + + /*< private >*/ + EphyNetMonitorPrivate *priv; +}; + + +ephy_net_monitor_get_type +GType +void + + +ephy_net_monitor_new +EphyNetMonitor * +void + + +ephy_net_monitor_get_net_status +gboolean +EphyNetMonitor *monitor + + +ephy_activation_load_uri_list +gboolean +EphyDbus *ephy_dbus,char **uris,char *options,guint startup_id,GError **error + + +ephy_activation_load_session +gboolean +EphyDbus *ephy_dbus,char *session_name,guint user_time,GError **error + + +ephy_activation_open_bookmarks_editor +gboolean +EphyDbus *ephy_dbus,guint user_time,GError **error + + +EPHY_TYPE_LOCKDOWN +#define EPHY_TYPE_LOCKDOWN (ephy_lockdown_get_type ()) + + +EPHY_LOCKDOWN +#define EPHY_LOCKDOWN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LOCKDOWN, EphyLockdown)) + + +EPHY_LOCKDOWN_CLASS +#define EPHY_LOCKDOWN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LOCKDOWN, EphyLockdownClass)) + + +EPHY_IS_LOCKDOWN +#define EPHY_IS_LOCKDOWN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LOCKDOWN)) + + +EPHY_IS_LOCKDOWN_CLASS +#define EPHY_IS_LOCKDOWN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LOCKDOWN)) + + +EPHY_LOCKDOWN_GET_CLASS +#define EPHY_LOCKDOWN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_LOCKDOWN, EphyLockdownClass)) + + +EphyLockdownClass + + +EphyLockdown + + +EphyLockdownPrivate + + +EphyLockdownClass +struct _EphyLockdownClass +{ + GObjectClass parent_class; +}; + + +EphyLockdown +struct _EphyLockdown +{ + GObject parent_instance; + + /*< private >*/ + EphyLockdownPrivate *priv; +}; + + +ephy_lockdown_get_type +GType +void + + +ephy_python_init +void +void + + +ephy_python_shutdown +void +void + + +ephy_python_schedule_gc +void +void + + +EPHY_TYPE_SESSION +#define EPHY_TYPE_SESSION (ephy_session_get_type ()) + + +EPHY_SESSION +#define EPHY_SESSION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_SESSION, EphySession)) + + +EPHY_SESSION_CLASS +#define EPHY_SESSION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_SESSION, EphySessionClass)) + + +EPHY_IS_SESSION +#define EPHY_IS_SESSION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_SESSION)) + + +EPHY_IS_SESSION_CLASS +#define EPHY_IS_SESSION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SESSION)) + + +EPHY_SESSION_GET_CLASS +#define EPHY_SESSION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SESSION, EphySessionClass)) + + +EphySession + + +EphySessionPrivate + + +EphySessionClass + + +EphySessionCommand +typedef enum +{ + EPHY_SESSION_CMD_RESUME_SESSION, + EPHY_SESSION_CMD_LOAD_SESSION, + EPHY_SESSION_CMD_OPEN_BOOKMARKS_EDITOR, + EPHY_SESSION_CMD_OPEN_URIS, + EPHY_SESSION_CMD_MAYBE_OPEN_WINDOW, + EPHY_SESSION_CMD_LAST + +} EphySessionCommand; + + +EphySession +struct _EphySession +{ + GObject parent; + + /*< private >*/ + EphySessionPrivate *priv; +}; + + +EphySessionClass +struct _EphySessionClass +{ + GObjectClass parent_class; +}; + + +ephy_session_get_type +GType +void + + +ephy_session_get_active_window +EphyWindow * +EphySession *session + + +ephy_session_save +gboolean +EphySession *session,const char *filename + + +ephy_session_load +gboolean +EphySession *session,const char *filename,guint32 user_time + + +ephy_session_close +void +EphySession *session + + +ephy_session_get_windows +GList * +EphySession *session + + +ephy_session_add_window +void +EphySession *session,GtkWindow *window + + +ephy_session_remove_window +void +EphySession *session,GtkWindow *window + + +ephy_session_queue_command +void +EphySession *session,EphySessionCommand op,const char *arg,char **args,guint32 user_time,gboolean priority + + +EPHY_TYPE_TOOLBAR_EDITOR +#define EPHY_TYPE_TOOLBAR_EDITOR (ephy_toolbar_editor_get_type ()) + + +EPHY_TOOLBAR_EDITOR +#define EPHY_TOOLBAR_EDITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_TOOLBAR_EDITOR, EphyToolbarEditor)) + + +EPHY_TOOLBAR_EDITOR_CLASS +#define EPHY_TOOLBAR_EDITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_TOOLBAR_EDITOR, EphyToolbarEditorClass)) + + +EPHY_IS_TOOLBAR_EDITOR +#define EPHY_IS_TOOLBAR_EDITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_TOOLBAR_EDITOR)) + + +EPHY_IS_TOOLBAR_EDITOR_CLASS +#define EPHY_IS_TOOLBAR_EDITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TOOLBAR_EDITOR)) + + +EPHY_TOOLBAR_EDITOR_GET_CLASS +#define EPHY_TOOLBAR_EDITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TOOLBAR_EDITOR, EphyToolbarEditorClass)) + + +EphyToolbarEditor + + +EphyToolbarEditorPrivate + + +EphyToolbarEditorClass + + +EphyToolbarEditor +struct _EphyToolbarEditor +{ + GtkDialog parent_instance; + + /*< private >*/ + EphyToolbarEditorPrivate *priv; +}; + + +EphyToolbarEditorClass +struct _EphyToolbarEditorClass +{ + GtkDialogClass parent_class; +}; + + +ephy_toolbar_editor_get_type +GType +void + + +ephy_toolbar_editor_show +GtkWidget * +EphyWindow *window + + +EPHY_TYPE_LINK_ACTION +#define EPHY_TYPE_LINK_ACTION (ephy_link_action_get_type ()) + + +EPHY_LINK_ACTION +#define EPHY_LINK_ACTION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LINK_ACTION, EphyLinkAction)) + + +EPHY_LINK_ACTION_CLASS +#define EPHY_LINK_ACTION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LINK_ACTION, EphyLinkActionClass)) + + +EPHY_IS_LINK_ACTION +#define EPHY_IS_LINK_ACTION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LINK_ACTION)) + + +EPHY_IS_LINK_ACTION_CLASS +#define EPHY_IS_LINK_ACTION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK_ACTION)) + + +EPHY_LINK_ACTION_GET_CLASS +#define EPHY_LINK_ACTION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_LINK_ACTION, EphyLinkActionClass)) + + +EPHY_TYPE_LINK_ACTION_GROUP +#define EPHY_TYPE_LINK_ACTION_GROUP (ephy_link_action_group_get_type ()) + + +EPHY_LINK_ACTION_GROUP +#define EPHY_LINK_ACTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LINK_ACTION_GROUP, EphyLinkActionGroup)) + + +EPHY_LINK_ACTION_GROUP_CLASS +#define EPHY_LINK_ACTION_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LINK_ACTION_GROUP, EphyLinkActionGroupClass)) + + +EPHY_IS_LINK_ACTION_GROUP +#define EPHY_IS_LINK_ACTION_GROUP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LINK_ACTION_GROUP)) + + +EPHY_IS_LINK_ACTION_GROUP_CLASS +#define EPHY_IS_LINK_ACTION_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK_ACTION_GROUP)) + + +EPHY_LINK_ACTION_GROUP_GET_CLASS +#define EPHY_LINK_ACTION_GROUP_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_LINK_ACTION_GROUP, EphyLinkActionGroupClass)) + + +EphyLinkAction + + +EphyLinkActionClass + + +EphyLinkActionGroup + + +EphyLinkActionGroupClass + + +EphyLinkAction +struct _EphyLinkAction +{ + GtkAction parent_instance; +}; + + +EphyLinkActionClass +struct _EphyLinkActionClass +{ + GtkActionClass parent_class; +}; + + +EphyLinkActionGroup +struct _EphyLinkActionGroup +{ + GtkActionGroup parent_instance; +}; + + +EphyLinkActionGroupClass +struct _EphyLinkActionGroupClass +{ + GtkActionGroupClass parent_class; +}; + + +ephy_link_action_get_type +GType +void + + +ephy_link_action_group_get_type +GType +void + + +ephy_link_action_group_new +EphyLinkActionGroup * +const char *name + + +EPHY_TYPE_CERTS_MANAGER_DIALOG +#define EPHY_TYPE_CERTS_MANAGER_DIALOG (certs_manager_dialog_get_type ()) + + +EPHY_CERTS_MANAGER_DIALOG +#define EPHY_CERTS_MANAGER_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_CERTS_MANAGER_DIALOG, CertsManagerDialog)) + + +EPHY_CERTS_MANAGER_DIALOG_CLASS +#define EPHY_CERTS_MANAGER_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_CERTS_MANAGER_DIALOG, CertsManagerDialogClass)) + + +EPHY_IS_CERTS_MANAGER_DIALOG +#define EPHY_IS_CERTS_MANAGER_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_CERTS_MANAGER_DIALOG)) + + +EPHY_IS_CERTS_MANAGER_DIALOG_CLASS +#define EPHY_IS_CERTS_MANAGER_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_CERTS_MANAGER_DIALOG)) + + +EPHY_CERTS_MANAGER_DIALOG_GET_CLASS +#define EPHY_CERTS_MANAGER_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_CERTS_MANAGER_DIALOG, CertsManagerDialogClass)) + + +CertsManagerDialogClass + + +CertsManagerDialog + + +CertsManagerDialogPrivate + + +CertsManagerDialogClass +struct _CertsManagerDialogClass +{ + EphyDialogClass parent_class; +}; + + +CertsManagerDialog +struct _CertsManagerDialog +{ + EphyDialog parent; + + /*< private >*/ + CertsManagerDialogPrivate *priv; +}; + + +certs_manager_dialog_get_type +GType +void + + +certs_manager_dialog_new +EphyDialog * +void + + +DBUS_API_SUBJECT_TO_CHANGE +#define DBUS_API_SUBJECT_TO_CHANGE + + +EPHY_TYPE_DBUS +#define EPHY_TYPE_DBUS (ephy_dbus_get_type ()) + + +EPHY_DBUS +#define EPHY_DBUS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_DBUS, EphyDbus)) + + +EPHY_DBUS_CLASS +#define EPHY_DBUS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_DBUS, EphyDbusClass)) + + +EPHY_IS_DBUS +#define EPHY_IS_DBUS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_DBUS)) + + +EPHY_IS_DBUS_CLASS +#define EPHY_IS_DBUS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_DBUS)) + + +EPHY_DBUS_GET_CLASS +#define EPHY_DBUS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_DBUS, EphyDbusClass)) + + +ephy_dbus_error_quark +extern GQuark ephy_dbus_error_quark; + + +EPHY_DBUS_ERROR_QUARK +#define EPHY_DBUS_ERROR_QUARK (ephy_dbus_error_quark) + + +EphyDbus + + +EphyDbusPrivate + + +EphyDbusClass + + +EphyDbusBus +typedef enum +{ + EPHY_DBUS_SESSION, + EPHY_DBUS_SYSTEM +} EphyDbusBus; + + +EphyDbus +struct _EphyDbus +{ + GObject parent; + + /*< private >*/ + EphyDbusPrivate *priv; +}; + + +EphyDbusClass +struct _EphyDbusClass +{ + GObjectClass parent_class; + + /* Signals */ + void (* connected) (EphyDbus *dbus, + EphyDbusBus kind); + void (* disconnected) (EphyDbus *dbus, + EphyDbusBus kind); +}; + + +ephy_dbus_get_type +GType +void + + +ephy_dbus_get_default +EphyDbus * +void + + +ephy_dbus_get_bus +DBusGConnection * +EphyDbus *dbus,EphyDbusBus kind + + +ephy_dbus_get_proxy +DBusGProxy * +EphyDbus *dbus,EphyDbusBus kind + + +EPHY_TYPE_SHELL +#define EPHY_TYPE_SHELL (ephy_shell_get_type ()) + + +EPHY_SHELL +#define EPHY_SHELL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_SHELL, EphyShell)) + + +EPHY_SHELL_CLASS +#define EPHY_SHELL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_SHELL, EphyShellClass)) + + +EPHY_IS_SHELL +#define EPHY_IS_SHELL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_SHELL)) + + +EPHY_IS_SHELL_CLASS +#define EPHY_IS_SHELL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SHELL)) + + +EPHY_SHELL_GET_CLASS +#define EPHY_SHELL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SHELL, EphyShellClass)) + + +EphyShell + + +EphyShellClass + + +EphyShellPrivate + + +ephy_shell +extern EphyShell *ephy_shell; + + +EphyNewTabFlags +typedef enum +{ + /* Page types */ + EPHY_NEW_TAB_HOME_PAGE = 1 << 0, + EPHY_NEW_TAB_NEW_PAGE = 1 << 1, + EPHY_NEW_TAB_OPEN_PAGE = 1 << 2, + + /* Page mode */ + EPHY_NEW_TAB_FULLSCREEN_MODE = 1 << 4, + EPHY_NEW_TAB_DONT_SHOW_WINDOW = 1 << 5, + + /* Tabs */ + EPHY_NEW_TAB_APPEND_LAST = 1 << 7, + EPHY_NEW_TAB_APPEND_AFTER = 1 << 8, + EPHY_NEW_TAB_JUMP = 1 << 9, + EPHY_NEW_TAB_IN_NEW_WINDOW = 1 << 10, + EPHY_NEW_TAB_IN_EXISTING_WINDOW = 1 << 11, + + /* The way to load */ + EPHY_NEW_TAB_ALLOW_FIXUP = 1 << 12, + +} EphyNewTabFlags; + + +EphyShell +struct _EphyShell +{ + EphyEmbedShell parent; + + /*< private >*/ + EphyShellPrivate *priv; +}; + + +EphyShellClass +struct _EphyShellClass +{ + EphyEmbedShellClass parent_class; +}; + + +ephy_new_tab_flags_get_type +GType +void + + +ephy_shell_get_type +GType +void + + +ephy_shell_get_default +EphyShell * +void + + +ephy_shell_new_tab +EphyEmbed * +EphyShell *shell,EphyWindow *parent_window,EphyEmbed *previous_embed,const char *url,EphyNewTabFlags flags + + +ephy_shell_new_tab_full +EphyEmbed * +EphyShell *shell,EphyWindow *parent_window,EphyEmbed *previous_embed,const char *url,EphyNewTabFlags flags,EphyEmbedChrome chrome,gboolean is_popup,guint32 user_time + + +ephy_shell_get_session +GObject * +EphyShell *shell + + +ephy_shell_get_net_monitor +GObject * +EphyShell *shell + + +ephy_shell_get_bookmarks +EphyBookmarks * +EphyShell *shell + + +ephy_shell_get_toolbars_model +GObject * +EphyShell *shell,gboolean fullscreen + + +ephy_shell_get_extensions_manager +GObject * +EphyShell *shell + + +ephy_shell_get_bookmarks_editor +GtkWidget * +EphyShell *shell + + +ephy_shell_get_history_window +GtkWidget * +EphyShell *shell + + +ephy_shell_get_pdm_dialog +GObject * +EphyShell *shell + + +ephy_shell_get_prefs_dialog +GObject * +EphyShell *shell + + +ephy_action_change_sensitivity_flags +void +GtkAction *action,guint flags,gboolean set + + +EPHY_TYPE_PYTHON_EXTENSION +#define EPHY_TYPE_PYTHON_EXTENSION (ephy_python_extension_get_type ()) + + +EPHY_PYTHON_EXTENSION +#define EPHY_PYTHON_EXTENSION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PYTHON_EXTENSION, EphyPythonExtension)) + + +EPHY_PYTHON_EXTENSION_CLASS +#define EPHY_PYTHON_EXTENSION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PYTHON_EXTENSION, EphyPythonExtensionClass)) + + +EPHY_IS_PYTHON_EXTENSION +#define EPHY_IS_PYTHON_EXTENSION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PYTHON_EXTENSION)) + + +EPHY_IS_PYTHON_EXTENSION_CLASS +#define EPHY_IS_PYTHON_EXTENSION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PYTHON_EXTENSION)) + + +EPHY_PYTHON_EXTENSION_GET_CLASS +#define EPHY_PYTHON_EXTENSION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_PYTHON_EXTENSION, EphyPythonExtensionClass)) + + +EphyPythonExtension + + +EphyPythonExtensionClass + + +EphyPythonExtensionPrivate + + +EphyPythonExtensionClass +struct _EphyPythonExtensionClass +{ + GObjectClass parent_class; +}; + + +EphyPythonExtension +struct _EphyPythonExtension +{ + GObject parent_instance; + + /*< private >*/ + EphyPythonExtensionPrivate *priv; +}; + + +ephy_python_extension_get_type +GType +void + + +EPHY_TYPE_WINDOW +#define EPHY_TYPE_WINDOW (ephy_window_get_type ()) + + +EPHY_WINDOW +#define EPHY_WINDOW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_WINDOW, EphyWindow)) + + +EPHY_WINDOW_CLASS +#define EPHY_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_WINDOW, EphyWindowClass)) + + +EPHY_IS_WINDOW +#define EPHY_IS_WINDOW(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_WINDOW)) + + +EPHY_IS_WINDOW_CLASS +#define EPHY_IS_WINDOW_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_WINDOW)) + + +EPHY_WINDOW_GET_CLASS +#define EPHY_WINDOW_GET_CLASS(o)(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_WINDOW, EphyWindowClass)) + + +EphyWindowClass + + +EphyWindow + + +EphyWindowPrivate + + +EphyWindow +struct _EphyWindow +{ + GtkWindow parent; + + /*< private >*/ + EphyWindowPrivate *priv; +}; + + +EphyWindowClass +struct _EphyWindowClass +{ + GtkWindowClass parent_class; +}; + + +ephy_window_get_type +GType +void + + +ephy_window_new +EphyWindow * +void + + +ephy_window_new_with_chrome +EphyWindow * +EphyEmbedChrome chrome,gboolean is_popup + + +ephy_window_get_ui_manager +GObject * +EphyWindow *window + + +ephy_window_get_toolbar +GtkWidget * +EphyWindow *window + + +ephy_window_get_notebook +GtkWidget * +EphyWindow *window + + +ephy_window_get_find_toolbar +GtkWidget * +EphyWindow *window + + +ephy_window_get_statusbar +GtkWidget * +EphyWindow *window + + +ephy_window_load_url +void +EphyWindow *window,const char *url + + +ephy_window_set_zoom +void +EphyWindow *window,float zoom + + +ephy_window_activate_location +void +EphyWindow *window + + +ephy_window_get_is_print_preview +gboolean +EphyWindow *window + + +ephy_window_get_context_event +EphyEmbedEvent * +EphyWindow *window + + +EPHY_TYPE_TOPIC_FACTORY_ACTION +#define EPHY_TYPE_TOPIC_FACTORY_ACTION (ephy_topic_factory_action_get_type ()) + + +EPHY_TOPIC_FACTORY_ACTION +#define EPHY_TOPIC_FACTORY_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_TOPIC_FACTORY_ACTION, EphyTopicFactoryAction)) + + +EPHY_TOPIC_FACTORY_ACTION_CLASS +#define EPHY_TOPIC_FACTORY_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_TOPIC_FACTORY_ACTION, EphyTopicFactoryActionClass)) + + +EPHY_IS_TOPIC_FACTORY_ACTION +#define EPHY_IS_TOPIC_FACTORY_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_TOPIC_FACTORY_ACTION)) + + +EPHY_IS_TOPIC_FACTORY_ACTION_CLASS +#define EPHY_IS_TOPIC_FACTORY_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_TOPIC_FACTORY_ACTION)) + + +EPHY_TOPIC_FACTORY_ACTION_GET_CLASS +#define EPHY_TOPIC_FACTORY_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_TOPIC_FACTORY_ACTION, EphyTopicFactoryActionClass)) + + +EphyTopicFactoryAction + + +EphyTopicFactoryActionClass + + +EphyTopicFactoryAction +struct _EphyTopicFactoryAction +{ + GtkAction parent; +}; + + +EphyTopicFactoryActionClass +struct _EphyTopicFactoryActionClass +{ + GtkActionClass parent_class; +}; + + +ephy_topic_factory_action_get_type +GType +void + + +ephy_topic_factory_action_new +GtkAction * +const char *name + + +EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE +#define EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE 32 + + +EPHY_BOOKMARK_ACTION_NAME_BUFFER_SIZE +#define EPHY_BOOKMARK_ACTION_NAME_BUFFER_SIZE EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE + + +EPHY_BOOKMARK_ACTION_NAME_FORMAT +#define EPHY_BOOKMARK_ACTION_NAME_FORMAT "Bmk%u" + + +EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG +#define EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG(node) (ephy_node_get_id (node)) + + +EPHY_BOOKMARK_ACTION_NAME_PRINTF +#define EPHY_BOOKMARK_ACTION_NAME_PRINTF(buffer,node) (g_snprintf (buffer, sizeof (buffer), EPHY_BOOKMARK_ACTION_NAME_FORMAT, EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG (node))) + + +EPHY_BOOKMARK_ACTION_NAME_STRDUP_PRINTF +#define EPHY_BOOKMARK_ACTION_NAME_STRDUP_PRINTF(node) (g_strdup_printf (EPHY_BOOKMARK_ACTION_NAME_FORMAT, EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG (node))) + + +EPHY_TOPIC_ACTION_NAME_BUFFER_SIZE +#define EPHY_TOPIC_ACTION_NAME_BUFFER_SIZE EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE + + +EPHY_TOPIC_ACTION_NAME_FORMAT +#define EPHY_TOPIC_ACTION_NAME_FORMAT "Tp%u" + + +EPHY_TOPIC_ACTION_NAME_FORMAT_ARG +#define EPHY_TOPIC_ACTION_NAME_FORMAT_ARG(node) (ephy_node_get_id (node)) + + +EPHY_TOPIC_ACTION_NAME_PRINTF +#define EPHY_TOPIC_ACTION_NAME_PRINTF(buffer,node) (g_snprintf (buffer, sizeof (buffer), EPHY_TOPIC_ACTION_NAME_FORMAT, EPHY_TOPIC_ACTION_NAME_FORMAT_ARG (node))) + + +EPHY_TOPIC_ACTION_NAME_STRDUP_PRINTF +#define EPHY_TOPIC_ACTION_NAME_STRDUP_PRINTF(node) (g_strdup_printf (EPHY_TOPIC_ACTION_NAME_FORMAT, EPHY_TOPIC_ACTION_NAME_FORMAT_ARG (node))) + + +EPHY_OPEN_TABS_ACTION_NAME_BUFFER_SIZE +#define EPHY_OPEN_TABS_ACTION_NAME_BUFFER_SIZE EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE + + +EPHY_OPEN_TABS_ACTION_NAME_FORMAT +#define EPHY_OPEN_TABS_ACTION_NAME_FORMAT "OpTb%u" + + +EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG +#define EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG(node) (ephy_node_get_id (node)) + + +EPHY_OPEN_TABS_ACTION_NAME_PRINTF +#define EPHY_OPEN_TABS_ACTION_NAME_PRINTF(buffer,node) (g_snprintf (buffer, sizeof (buffer), EPHY_OPEN_TABS_ACTION_NAME_FORMAT, EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG (node))) + + +EPHY_OPEN_TABS_ACTION_NAME_STRDUP_PRINTF +#define EPHY_OPEN_TABS_ACTION_NAME_STRDUP_PRINTF(node) (g_strdup_printf (EPHY_OPEN_TABS_ACTION_NAME_FORMAT, EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG (node))) + + +ephy_bookmarks_ui_attach_window +void +EphyWindow *window + + +ephy_bookmarks_ui_detach_window +void +EphyWindow *window + + +ephy_bookmarks_ui_attach_toolbar_model +void +EggToolbarsModel *model + + +ephy_bookmarks_ui_detach_toolbar_model +void +EggToolbarsModel *model + + +ephy_bookmarks_ui_add_bookmark +void +GtkWindow *parent,const char *location,const char *title + + +ephy_bookmarks_ui_show_bookmark +void +EphyNode *bookmark + + +EPHY_TYPE_TOPICS_ENTRY +#define EPHY_TYPE_TOPICS_ENTRY (ephy_topics_entry_get_type ()) + + +EPHY_TOPICS_ENTRY +#define EPHY_TOPICS_ENTRY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_TOPICS_ENTRY, EphyTopicsEntry)) + + +EPHY_TOPICS_ENTRY_CLASS +#define EPHY_TOPICS_ENTRY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_TOPICS_ENTRY, EphyTopicsEntryClass)) + + +EPHY_IS_TOPICS_ENTRY +#define EPHY_IS_TOPICS_ENTRY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_TOPICS_ENTRY)) + + +EPHY_IS_TOPICS_ENTRY_CLASS +#define EPHY_IS_TOPICS_ENTRY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TOPICS_ENTRY)) + + +EPHY_TOPICS_ENTRY_GET_CLASS +#define EPHY_TOPICS_ENTRY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TOPICS_ENTRY, EphyTopicsEntryClass)) + + +EphyTopicsEntryPrivate + + +ephy_topics_entry_get_type +GType +void + + +ephy_topics_entry_new +GtkWidget * +EphyBookmarks *bookmarks,EphyNode *bookmark + + +ephy_topics_entry_insert_topic +void +EphyTopicsEntry *entry,const char *title + + +EPHY_TYPE_BOOKMARK_FACTORY_ACTION +#define EPHY_TYPE_BOOKMARK_FACTORY_ACTION (ephy_bookmark_factory_action_get_type ()) + + +EPHY_BOOKMARK_FACTORY_ACTION +#define EPHY_BOOKMARK_FACTORY_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_BOOKMARK_FACTORY_ACTION, EphyBookmarkFactoryAction)) + + +EPHY_BOOKMARK_FACTORY_ACTION_CLASS +#define EPHY_BOOKMARK_FACTORY_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_BOOKMARK_FACTORY_ACTION, EphyBookmarkFactoryActionClass)) + + +EPHY_IS_BOOKMARK_FACTORY_ACTION +#define EPHY_IS_BOOKMARK_FACTORY_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_BOOKMARK_FACTORY_ACTION)) + + +EPHY_IS_BOOKMARK_FACTORY_ACTION_CLASS +#define EPHY_IS_BOOKMARK_FACTORY_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_BOOKMARK_FACTORY_ACTION)) + + +EPHY_BOOKMARK_FACTORY_ACTION_GET_CLASS +#define EPHY_BOOKMARK_FACTORY_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_BOOKMARK_FACTORY_ACTION, EphyBookmarkFactoryActionClass)) + + +EphyBookmarkFactoryAction + + +EphyBookmarkFactoryActionClass + + +EphyBookmarkFactoryAction +struct _EphyBookmarkFactoryAction +{ + GtkAction parent; +}; + + +EphyBookmarkFactoryActionClass +struct _EphyBookmarkFactoryActionClass +{ + GtkActionClass parent_class; +}; + + +ephy_bookmark_factory_action_get_type +GType +void + + +ephy_bookmark_factory_action_new +GtkAction * +const char *name + + +EPHY_TYPE_TOPICS_PALETTE +#define EPHY_TYPE_TOPICS_PALETTE (ephy_topics_palette_get_type ()) + + +EPHY_TOPICS_PALETTE +#define EPHY_TOPICS_PALETTE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_TOPICS_PALETTE, EphyTopicsPalette)) + + +EPHY_TOPICS_PALETTE_CLASS +#define EPHY_TOPICS_PALETTE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_TOPICS_PALETTE, EphyTopicsPaletteClass)) + + +EPHY_IS_TOPICS_PALETTE +#define EPHY_IS_TOPICS_PALETTE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_TOPICS_PALETTE)) + + +EPHY_IS_TOPICS_PALETTE_CLASS +#define EPHY_IS_TOPICS_PALETTE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TOPICS_PALETTE)) + + +EPHY_TOPICS_PALETTE_GET_CLASS +#define EPHY_TOPICS_PALETTE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TOPICS_PALETTE, EphyTopicsPaletteClass)) + + +EphyTopicsPalettePrivate + + +ephy_topics_palette_get_type +GType +void + + +ephy_topics_palette_new +GtkWidget * +EphyBookmarks *bookmarks,EphyNode *bookmark + + +ephy_topics_palette_new_topic +void +EphyTopicsPalette *palette + + +ephy_topic_action_group_new +GtkActionGroup * +EphyNode *node,GtkUIManager *manager + + +ephy_bookmark_group_new +GtkActionGroup * +EphyNode *node + + +ephy_nodes_remove_covered +gint +EphyNode *parent, GPtrArray *children + + +ephy_nodes_remove_not_covered +gint +EphyNode *parent, GPtrArray *children + + +ephy_nodes_count_covered +gint +EphyNode *parent, const GPtrArray *children + + +ephy_nodes_covered +gboolean +EphyNode *parent, const GPtrArray *children + + +ephy_nodes_get_covered +GPtrArray * +EphyNode *parent, const GPtrArray *children, GPtrArray *_covered + + +ephy_nodes_get_covering +GPtrArray * +const GPtrArray *parents, const GPtrArray *children,GPtrArray *_covering, GPtrArray *_uncovered, GArray *_sizes + + +ephy_open_tabs_group_new +GtkActionGroup * +EphyNode *node + + +EPHY_TYPE_RELATED_ACTION +#define EPHY_TYPE_RELATED_ACTION (ephy_related_action_get_type ()) + + +EPHY_RELATED_ACTION +#define EPHY_RELATED_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_RELATED_ACTION, EphyRelatedAction)) + + +EPHY_RELATED_ACTION_CLASS +#define EPHY_RELATED_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_RELATED_ACTION, EphyRelatedActionClass)) + + +EPHY_IS_RELATED_ACTION +#define EPHY_IS_RELATED_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_RELATED_ACTION)) + + +EPHY_IS_RELATED_ACTION_CLASS +#define EPHY_IS_RELATED_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_RELATED_ACTION)) + + +EPHY_RELATED_ACTION_GET_CLASS +#define EPHY_RELATED_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_RELATED_ACTION, EphyRelatedActionClass)) + + +EphyRelatedAction + + +EphyRelatedActionClass + + +EphyRelatedAction +struct _EphyRelatedAction +{ + EphyTopicAction parent_instance; +}; + + +EphyRelatedActionClass +struct _EphyRelatedActionClass +{ + EphyTopicActionClass parent_class; +}; + + +ephy_related_action_get_type +GType +void + + +ephy_related_action_new +GtkAction * +EphyLink *link, GtkUIManager *manager, char *name + + +EPHY_TYPE_EMBED_SINGLE +#define EPHY_TYPE_EMBED_SINGLE (ephy_embed_single_get_type ()) + + +EPHY_EMBED_SINGLE +#define EPHY_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingle)) + + +EPHY_EMBED_SINGLE_IFACE +#define EPHY_EMBED_SINGLE_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIface)) + + +EPHY_IS_EMBED_SINGLE +#define EPHY_IS_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_SINGLE)) + + +EPHY_IS_EMBED_SINGLE_IFACE +#define EPHY_IS_EMBED_SINGLE_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_SINGLE)) + + +EPHY_EMBED_SINGLE_GET_IFACE +#define EPHY_EMBED_SINGLE_GET_IFACE(i) (G_TYPE_INSTANCE_GET_INTERFACE ((i), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIface)) + + +EphyEmbedSingle + + +EphyEmbedSingleIface + + +EphyEmbedSingleIface +struct _EphyEmbedSingleIface +{ + GTypeInterface base_iface; + + /* Signals */ + + EphyEmbed * (* new_window) (EphyEmbedSingle *single, + EphyEmbed *parent_embed, + EphyEmbedChrome chromemask); + + gboolean (* handle_content) (EphyEmbedSingle *shell, + char *mime_type, + char *uri); + + gboolean (* add_sidebar) (EphyEmbedSingle *single, + const char *url, + const char *title); + + gboolean (* add_search_engine) (EphyEmbedSingle *single, + const char *url, + const char *icon_url, + const char *title); + + /* Methods */ + + gboolean (* init) (EphyEmbedSingle *single); + GtkWidget * (* open_window) (EphyEmbedSingle *single, + EphyEmbed *parent, + const char *address, + const char *name, + const char *features); + void (* clear_cache) (EphyEmbedSingle *shell); + void (* clear_auth_cache) (EphyEmbedSingle *shell); + void (* set_network_status)(EphyEmbedSingle *shell, + gboolean offline); + gboolean (* get_network_status)(EphyEmbedSingle *single); + GList * (* get_font_list) (EphyEmbedSingle *shell, + const char *langGroup); + const char * (* get_backend_name) (EphyEmbedSingle *shell); +}; + + +ephy_embed_single_get_type +GType +void + + +ephy_embed_single_init +gboolean +EphyEmbedSingle *single + + +ephy_embed_single_open_window +GtkWidget * +EphyEmbedSingle *single,EphyEmbed *parent,const char *address,const char *name,const char *features + + +ephy_embed_single_clear_cache +void +EphyEmbedSingle *single + + +ephy_embed_single_clear_auth_cache +void +EphyEmbedSingle *single + + +ephy_embed_single_set_network_status +void +EphyEmbedSingle *single,gboolean online + + +ephy_embed_single_get_network_status +gboolean +EphyEmbedSingle *single + + +ephy_embed_single_get_font_list +GList * +EphyEmbedSingle *single,const char *lang_group + + +ephy_embed_single_get_backend_name +const char * +EphyEmbedSingle *single + + +EphyX509CertType +typedef enum +{ + PERSONAL_CERTIFICATE, + SERVER_CERTIFICATE, + CA_CERTIFICATE +} EphyX509CertType; + + +EPHY_TYPE_X509_CERT +#define EPHY_TYPE_X509_CERT (ephy_x509_cert_get_type ()) + + +EPHY_X509_CERT +#define EPHY_X509_CERT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_X509_CERT, EphyX509Cert)) + + +EPHY_X509_CERT_IFACE +#define EPHY_X509_CERT_IFACE(klass) (G_TYPE_CHECK_IFACE_CAST ((klass), EPHY_TYPE_X509_CERT, EphyX509CertIface)) + + +EPHY_IS_X509_CERT +#define EPHY_IS_X509_CERT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_X509_CERT)) + + +EPHY_IS_X509_CERT_IFACE +#define EPHY_IS_X509_CERT_IFACE(klass) (G_TYPE_CHECK_IFACE_TYPE ((klass), EPHY_TYPE_X509_CERT)) + + +EPHY_X509_CERT_GET_IFACE +#define EPHY_X509_CERT_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_X509_CERT, EphyX509CertIface)) + + +EphyX509Cert + + +EphyX509CertIface + + +EphyX509CertIface +struct _EphyX509CertIface +{ + GTypeInterface base_iface; + + /* Methods */ + const char * (* get_title) (EphyX509Cert *cert); +}; + + +ephy_x509_cert_get_type +GType +void + + +ephy_x509_cert_get_title +const char * +EphyX509Cert *cert + + +EPHY_TYPE_COOKIE_MANAGER +#define EPHY_TYPE_COOKIE_MANAGER (ephy_cookie_manager_get_type ()) + + +EPHY_COOKIE_MANAGER +#define EPHY_COOKIE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManager)) + + +EPHY_COOKIE_MANAGER_IFACE +#define EPHY_COOKIE_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIface)) + + +EPHY_IS_COOKIE_MANAGER +#define EPHY_IS_COOKIE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_COOKIE_MANAGER)) + + +EPHY_IS_COOKIE_MANAGER_IFACE +#define EPHY_IS_COOKIE_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COOKIE_MANAGER)) + + +EPHY_COOKIE_MANAGER_GET_IFACE +#define EPHY_COOKIE_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIface)) + + +EPHY_TYPE_COOKIE +#define EPHY_TYPE_COOKIE (ephy_cookie_get_type ()) + + +EphyCookieManager + + +EphyCookieManagerIface + + +EphyCookieManagerIface +struct _EphyCookieManagerIface +{ + GTypeInterface base_iface; + + /* Signals */ + void (* added) (EphyCookieManager *manager, + EphyCookie *cookie); + void (* changed) (EphyCookieManager *manager, + EphyCookie *cookie); + void (* deleted) (EphyCookieManager *manager, + EphyCookie *cookie); + void (* rejected) (EphyCookieManager *manager, + const char *url); + void (* cleared) (EphyCookieManager *manager); + + /* Methods */ + GList * (* list) (EphyCookieManager *manager); + void (* remove) (EphyCookieManager *manager, + const EphyCookie *cookie); + void (* clear) (EphyCookieManager *manager); +}; + + +ephy_cookie_get_type +GType +void + + +ephy_cookie_new +EphyCookie * +void + + +ephy_cookie_copy +EphyCookie * +const EphyCookie *cookie + + +ephy_cookie_free +void +EphyCookie *cookie + + +ephy_cookie_manager_get_type +GType +void + + +ephy_cookie_manager_list_cookies +GList * +EphyCookieManager *manager + + +ephy_cookie_manager_remove_cookie +void +EphyCookieManager *manager,const EphyCookie *cookie + + +ephy_cookie_manager_clear +void +EphyCookieManager *manager + + +EPHY_TYPE_EMBED_FIND +#define EPHY_TYPE_EMBED_FIND (ephy_embed_find_get_type ()) + + +EPHY_EMBED_FIND +#define EPHY_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED_FIND, EphyEmbedFind)) + + +EPHY_EMBED_FIND_IFACE +#define EPHY_EMBED_FIND_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_FIND, EphyEmbedFindIface)) + + +EPHY_IS_EMBED_FIND +#define EPHY_IS_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_FIND)) + + +EPHY_IS_EMBED_FIND_IFACE +#define EPHY_IS_EMBED_FIND_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_FIND)) + + +EPHY_EMBED_FIND_GET_IFACE +#define EPHY_EMBED_FIND_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED_FIND, EphyEmbedFindIface)) + + +EphyEmbedFind + + +EphyEmbedFindIface + + +EphyEmbedFindResult +typedef enum +{ + EPHY_EMBED_FIND_FOUND = 0, + EPHY_EMBED_FIND_NOTFOUND = 1, + EPHY_EMBED_FIND_FOUNDWRAPPED = 2 +} EphyEmbedFindResult; + + +EphyEmbedFindIface +struct _EphyEmbedFindIface +{ + GTypeInterface base_iface; + + /* Methods */ + void (* set_embed) (EphyEmbedFind *find, + EphyEmbed *embed); + void (* set_properties) (EphyEmbedFind *find, + const char *search_string, + gboolean case_sensitive); + EphyEmbedFindResult (* find) (EphyEmbedFind *find, + const char *search_string, + gboolean links_only); + EphyEmbedFindResult (* find_again) (EphyEmbedFind *find, + gboolean forward, + gboolean links_only); + void (* set_selection) (EphyEmbedFind *find, + gboolean attention); + gboolean (* activate_link) (EphyEmbedFind *find, + GdkModifierType mask); +}; + + +ephy_embed_find_get_type +GType +void + + +ephy_embed_find_set_embed +void +EphyEmbedFind *find,EphyEmbed *embed + + +ephy_embed_find_set_properties +void +EphyEmbedFind *find,const char *search_string,gboolean case_sensitive + + +ephy_embed_find_find +EphyEmbedFindResult +EphyEmbedFind *find,const char *search_string,gboolean links_only + + +ephy_embed_find_find_again +EphyEmbedFindResult +EphyEmbedFind *find,gboolean forward,gboolean links_only + + +ephy_embed_find_set_selection +void +EphyEmbedFind *find,gboolean attention + + +ephy_embed_find_activate_link +gboolean +EphyEmbedFind *find,GdkModifierType mask + + +ephy_embed_factory_new_object +GObject * +GType type + + +EPHY_TYPE_EMBED +#define EPHY_TYPE_EMBED (ephy_embed_get_type ()) + + +EPHY_EMBED +#define EPHY_EMBED(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED, EphyEmbed)) + + +EPHY_EMBED_IFACE +#define EPHY_EMBED_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED, EphyEmbedIface)) + + +EPHY_IS_EMBED +#define EPHY_IS_EMBED(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED)) + + +EPHY_IS_EMBED_IFACE +#define EPHY_IS_EMBED_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED)) + + +EPHY_EMBED_GET_IFACE +#define EPHY_EMBED_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED, EphyEmbedIface)) + + +EphyEmbed + + +EphyEmbedIface + + +EphyEmbedNetState +typedef enum +{ + EPHY_EMBED_STATE_UNKNOWN = 0, + EPHY_EMBED_STATE_START = 1 << 0, + EPHY_EMBED_STATE_REDIRECTING = 1 << 1, + EPHY_EMBED_STATE_TRANSFERRING = 1 << 2, + EPHY_EMBED_STATE_NEGOTIATING = 1 << 3, + EPHY_EMBED_STATE_STOP = 1 << 4, + + EPHY_EMBED_STATE_IS_REQUEST = 1 << 5, + EPHY_EMBED_STATE_IS_DOCUMENT = 1 << 6, + EPHY_EMBED_STATE_IS_NETWORK = 1 << 7, + EPHY_EMBED_STATE_IS_WINDOW = 1 << 8, + EPHY_EMBED_STATE_RESTORING = 1 << 9 +} EphyEmbedNetState; + + +EphyEmbedChrome +typedef enum +{ + EPHY_EMBED_CHROME_MENUBAR = 1 << 0, + EPHY_EMBED_CHROME_TOOLBAR = 1 << 1, + EPHY_EMBED_CHROME_STATUSBAR = 1 << 2, + EPHY_EMBED_CHROME_BOOKMARKSBAR = 1 << 3 +} EphyEmbedChrome; + + +EphyEmbedLoadFlags +typedef enum +{ + EPHY_EMBED_LOAD_FLAGS_NONE = 1 << 0, + EPHY_EMBED_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP = 1 << 1, +} EphyEmbedLoadFlags; + + +EPHY_EMBED_CHROME_ALL +#define EPHY_EMBED_CHROME_ALL (EPHY_EMBED_CHROME_MENUBAR | \ + EPHY_EMBED_CHROME_TOOLBAR | \ + EPHY_EMBED_CHROME_STATUSBAR | \ + EPHY_EMBED_CHROME_BOOKMARKSBAR) + + +EphyEmbedPrintPreviewNavType +typedef enum +{ + EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM = 0, + EPHY_EMBED_PRINTPREVIEW_PREV_PAGE = 1, + EPHY_EMBED_PRINTPREVIEW_NEXT_PAGE = 2, + EPHY_EMBED_PRINTPREVIEW_HOME = 3, + EPHY_EMBED_PRINTPREVIEW_END = 4 +} EphyEmbedPrintPreviewNavType; + + +EphyEmbedSecurityLevel +typedef enum +{ + EPHY_EMBED_STATE_IS_UNKNOWN, + EPHY_EMBED_STATE_IS_INSECURE, + EPHY_EMBED_STATE_IS_BROKEN, + EPHY_EMBED_STATE_IS_SECURE_LOW, + EPHY_EMBED_STATE_IS_SECURE_MED, + EPHY_EMBED_STATE_IS_SECURE_HIGH +} EphyEmbedSecurityLevel; + + +EphyEmbedDocumentType +typedef enum +{ + EPHY_EMBED_DOCUMENT_HTML, + EPHY_EMBED_DOCUMENT_XML, + EPHY_EMBED_DOCUMENT_IMAGE, + EPHY_EMBED_DOCUMENT_OTHER +} EphyEmbedDocumentType; + + +EphyEmbedNavigationFlags +typedef enum +{ + EPHY_EMBED_NAV_UP = 1 << 0, + EPHY_EMBED_NAV_BACK = 1 << 1, + EPHY_EMBED_NAV_FORWARD = 1 << 2 +} EphyEmbedNavigationFlags; + + +EphyEmbedAddressExpire +typedef enum +{ + EPHY_EMBED_ADDRESS_EXPIRE_NOW, + EPHY_EMBED_ADDRESS_EXPIRE_NEXT, + EPHY_EMBED_ADDRESS_EXPIRE_CURRENT +} EphyEmbedAddressExpire; + + +EphyEmbedIface +struct _EphyEmbedIface +{ + GTypeInterface base_iface; + + int (* context_menu) (EphyEmbed *embed, + EphyEmbedEvent *event); + void (* favicon) (EphyEmbed *embed, + const char *location); + void (* feed_link) (EphyEmbed *embed, + const char *type, + const char *title, + const char *address); + void (* search_link) (EphyEmbed *embed, + const char *type, + const char *title, + const char *address); + gboolean (* dom_mouse_click) (EphyEmbed *embed, + EphyEmbedEvent *event); + gboolean (* dom_mouse_down) (EphyEmbed *embed, + EphyEmbedEvent *event); + void (* dom_content_loaded) (EphyEmbed *embed, + gpointer event); + void (* popup_blocked) (EphyEmbed *embed, + const char *address, + const char *target, + const char *features); + void (* zoom_change) (EphyEmbed *embed, + float new_zoom); + void (* content_blocked) (EphyEmbed *embed, + const char *uri); + gboolean (* modal_alert) (EphyEmbed *embed); + void (* modal_alert_closed) (EphyEmbed *embed); + void (* document_type) (EphyEmbed *embed, + EphyEmbedDocumentType type); + void (* new_window) (EphyEmbed *embed, + EphyEmbed *new_embed); + gboolean (* search_key_press) (EphyEmbed *embed, + GdkEventKey *event); + gboolean (* close_request) (EphyEmbed *embed); + + /* Methods */ + void (* load_url) (EphyEmbed *embed, + const char *url); + void (* load) (EphyEmbed *embed, + const char *url, + EphyEmbedLoadFlags flags, + EphyEmbed *referring_embed); + void (* stop_load) (EphyEmbed *embed); + void (* reload) (EphyEmbed *embed, + gboolean force); + gboolean (* can_go_back) (EphyEmbed *embed); + gboolean (* can_go_forward) (EphyEmbed *embed); + gboolean (* can_go_up) (EphyEmbed *embed); + GSList * (* get_go_up_list) (EphyEmbed *embed); + void (* go_back) (EphyEmbed *embed); + void (* go_forward) (EphyEmbed *embed); + void (* go_up) (EphyEmbed *embed); + + const char * (* get_title) (EphyEmbed *embed); + char * (* get_location) (EphyEmbed *embed, + gboolean toplevel); + const char * (* get_link_message) (EphyEmbed *embed); + char * (* get_js_status) (EphyEmbed *embed); + int (* shistory_n_items) (EphyEmbed *embed); + void (* shistory_get_nth) (EphyEmbed *embed, + int nth, + gboolean is_relative, + char **url, + char **title); + int (* shistory_get_pos) (EphyEmbed *embed); + void (* shistory_go_nth) (EphyEmbed *embed, + int nth); + void (* shistory_copy) (EphyEmbed *source, + EphyEmbed *dest, + gboolean copy_back, + gboolean copy_forward, + gboolean copy_current); + void (* get_security_level) (EphyEmbed *embed, + EphyEmbedSecurityLevel *level, + char **description); + void (* show_page_certificate) (EphyEmbed *embed); + void (* set_zoom) (EphyEmbed *embed, + float zoom); + float (* get_zoom) (EphyEmbed *embed); + void (* scroll_lines) (EphyEmbed *embed, + int num_lines); + void (* scroll_pages) (EphyEmbed *embed, + int num_pages); + void (* scroll_pixels) (EphyEmbed *embed, + int dx, + int dy); + char * (* get_encoding) (EphyEmbed *embed); + gboolean (* has_automatic_encoding) (EphyEmbed *embed); + void (* set_encoding) (EphyEmbed *embed, + const char *encoding); + void (* print) (EphyEmbed *embed); + void (* set_print_preview_mode) (EphyEmbed *embed, + gboolean mode); + int (* print_preview_n_pages) (EphyEmbed *embed); + void (* print_preview_navigate) (EphyEmbed *embed, + EphyEmbedPrintPreviewNavType type, + int page); + gboolean (* has_modified_forms) (EphyEmbed *embed); + void (* close) (EphyEmbed *embed); + EphyEmbedDocumentType (* get_document_type) (EphyEmbed *embed); + int (* get_load_percent) (EphyEmbed *embed); + gboolean (* get_load_status) (EphyEmbed *embed); + EphyEmbedNavigationFlags (* get_navigation_flags) (EphyEmbed *embed); + const char * (* get_typed_address) (EphyEmbed *embed); + void (* set_typed_address) (EphyEmbed *embed, + const char *address, + EphyEmbedAddressExpire expire); + const char * (* get_address) (EphyEmbed *embed); + const char * (* get_status_message) (EphyEmbed *embed); + GdkPixbuf * (* get_icon) (EphyEmbed *embed); + const char * (* get_icon_address) (EphyEmbed *embed); + gboolean (* get_is_blank) (EphyEmbed *embed); + const char * (* get_loading_title) (EphyEmbed *embed); + gboolean (* get_visibility) (EphyEmbed *embed); +}; + + +ephy_embed_net_state_get_type +GType +void + + +ephy_embed_chrome_get_type +GType +void + + +ephy_embed_ppv_navigation_get_type +GType +void + + +ephy_embed_security_level_get_type +GType +void + + +ephy_embed_document_type_get_type +GType +void + + +ephy_embed_get_type +GType +void + + +ephy_embed_load_url +void +EphyEmbed *embed,const char *url + + +ephy_embed_load +void +EphyEmbed *embed,const char *url,EphyEmbedLoadFlags flags,EphyEmbed *referring_embed + + +ephy_embed_stop_load +void +EphyEmbed *embed + + +ephy_embed_reload +void +EphyEmbed *embed,gboolean force + + +ephy_embed_get_title +const char * +EphyEmbed *embed + + +ephy_embed_get_location +char * +EphyEmbed *embed,gboolean toplevel + + +ephy_embed_get_link_message +const char * +EphyEmbed *embed + + +ephy_embed_get_js_status +char * +EphyEmbed *embed + + +ephy_embed_can_go_back +gboolean +EphyEmbed *embed + + +ephy_embed_can_go_forward +gboolean +EphyEmbed *embed + + +ephy_embed_can_go_up +gboolean +EphyEmbed *embed + + +ephy_embed_get_go_up_list +GSList * +EphyEmbed *embed + + +ephy_embed_go_back +void +EphyEmbed *embed + + +ephy_embed_go_forward +void +EphyEmbed *embed + + +ephy_embed_go_up +void +EphyEmbed *embed + + +ephy_embed_shistory_n_items +int +EphyEmbed *embed + + +ephy_embed_shistory_get_nth +void +EphyEmbed *embed,int nth,gboolean is_relative,char **url,char **title + + +ephy_embed_shistory_get_pos +int +EphyEmbed *embed + + +ephy_embed_shistory_go_nth +void +EphyEmbed *embed,int nth + + +ephy_embed_shistory_copy +void +EphyEmbed *source,EphyEmbed *dest,gboolean copy_back,gboolean copy_forward,gboolean copy_current + + +ephy_embed_get_security_level +void +EphyEmbed *embed,EphyEmbedSecurityLevel *level,char **description + + +ephy_embed_show_page_certificate +void +EphyEmbed *embed + + +ephy_embed_set_zoom +void +EphyEmbed *embed,float zoom + + +ephy_embed_get_zoom +float +EphyEmbed *embed + + +ephy_embed_scroll +void +EphyEmbed *embed,int num_lines + + +ephy_embed_page_scroll +void +EphyEmbed *embed,int num_pages + + +ephy_embed_scroll_pixels +void +EphyEmbed *embed,int dx,int dy + + +ephy_embed_get_document_type +EphyEmbedDocumentType +EphyEmbed *embed + + +ephy_embed_get_load_percent +int +EphyEmbed *embed + + +ephy_embed_get_load_status +gboolean +EphyEmbed *embed + + +ephy_embed_get_navigation_flags +EphyEmbedNavigationFlags +EphyEmbed *embed + + +ephy_embed_get_typed_address +const char * +EphyEmbed *embed + + +ephy_embed_set_typed_address +void +EphyEmbed *embed,const char *address,EphyEmbedAddressExpire expire + + +ephy_embed_get_address +const char * +EphyEmbed *embed + + +ephy_embed_get_status_message +const char * +EphyEmbed *embed + + +ephy_embed_get_icon +GdkPixbuf * +EphyEmbed *embed + + +ephy_embed_get_icon_address +const char * +EphyEmbed *embed + + +ephy_embed_get_is_blank +gboolean +EphyEmbed *embed + + +ephy_embed_get_loading_title +const char * +EphyEmbed *embed + + +ephy_embed_get_visibility +gboolean +EphyEmbed *embed + + +ephy_embed_get_encoding +char * +EphyEmbed *embed + + +ephy_embed_has_automatic_encoding +gboolean +EphyEmbed *embed + + +ephy_embed_set_encoding +void +EphyEmbed *embed,const char *encoding + + +ephy_embed_print +void +EphyEmbed *embed + + +ephy_embed_set_print_preview_mode +void +EphyEmbed *embed,gboolean preview_mode + + +ephy_embed_print_preview_n_pages +int +EphyEmbed *embed + + +ephy_embed_print_preview_navigate +void +EphyEmbed *embed,EphyEmbedPrintPreviewNavType type,int page + + +ephy_embed_close +void +EphyEmbed *embed + + +ephy_embed_has_modified_forms +gboolean +EphyEmbed *embed + + +EPHY_TYPE_BASE_EMBED +#define EPHY_TYPE_BASE_EMBED (ephy_base_embed_get_type ()) + + +EPHY_BASE_EMBED +#define EPHY_BASE_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_BASE_EMBED, EphyBaseEmbed)) + + +EPHY_BASE_EMBED_CLASS +#define EPHY_BASE_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_BASE_EMBED, EphyBaseEmbedClass)) + + +EPHY_IS_BASE_EMBED +#define EPHY_IS_BASE_EMBED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_BASE_EMBED)) + + +EPHY_IS_BASE_EMBED_CLASS +#define EPHY_IS_BASE_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_BASE_EMBED)) + + +EPHY_BASE_EMBED_GET_CLASS +#define EPHY_BASE_EMBED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_BASE_EMBED, EphyBaseEmbedClass)) + + +EphyBaseEmbed + + +EphyBaseEmbedClass + + +EphyBaseEmbedPrivate + + +EphyBaseEmbedClass +struct _EphyBaseEmbedClass { + GtkBinClass parent_class; +}; + + + +EphyBaseEmbed +struct _EphyBaseEmbed { + GtkBin parent_instance; + + /*< private >*/ + EphyBaseEmbedPrivate *priv; +}; + + + +ephy_base_embed_get_type +GType +void + + +ephy_base_embed_set_title +void +EphyBaseEmbed *embed,const char *title + + +ephy_base_embed_set_loading_title +void +EphyBaseEmbed *embed,const char *title,gboolean is_address + + +ephy_base_embed_set_address +void +EphyBaseEmbed *embed,const char *address + + +ephy_base_embed_location_changed +void +EphyBaseEmbed *embed,char *location + + +ephy_base_embed_load_icon +void +EphyBaseEmbed *embed + + +ephy_base_embed_set_icon_address +void +EphyBaseEmbed *embed,const char *address + + +ephy_base_embed_set_link_message +void +EphyBaseEmbed *embed,char *link_message + + +ephy_base_embed_set_security_level +void +EphyBaseEmbed *embed,EphyEmbedSecurityLevel level + + +ephy_base_embed_restore_zoom_level +void +EphyBaseEmbed *membed,const char *address + + +ephy_base_embed_update_from_net_state +void +EphyBaseEmbed *embed,const char *uri,EphyEmbedNetState state + + +ephy_base_embed_set_load_percent +void +EphyBaseEmbed *embed, int percent + + +ephy_base_embed_popups_manager_reset +void +EphyBaseEmbed *embed + + +ephy_base_embed_set_visibility +void +EphyBaseEmbed *embed,gboolean visibility + + +EPHY_TYPE_ADBLOCK_MANAGER +#define EPHY_TYPE_ADBLOCK_MANAGER ephy_adblock_manager_get_type() + + +EPHY_ADBLOCK_MANAGER +#define EPHY_ADBLOCK_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_ADBLOCK_MANAGER, EphyAdBlockManager)) + + +EPHY_ADBLOCK_MANAGER_CLASS +#define EPHY_ADBLOCK_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_ADBLOCK_MANAGER, EphyAdBlockManagerwClass)) + + +EPHY_IS_ADBLOCK_MANAGER +#define EPHY_IS_ADBLOCK_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_ADBLOCK_MANAGER)) + + +EPHY_IS_ADBLOCK_MANAGER_CLASS +#define EPHY_IS_ADBLOCK_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_TYPE_ADBLOCK_MANAGER)) + + +EPHY_ADBLOCK_MANAGER_GET_CLASS +#define EPHY_ADBLOCK_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_TYPE_ADBLOCK_MANAGER, EphyAdBlockManagerwClass)) + + +EphyAdBlockManager + + +EphyAdBlockManagerClass + + +EphyAdBlockManagerPrivate + + +EphyAdBlockManager +struct _EphyAdBlockManager { + GObject parent; + + /* < private > */ + EphyAdBlockManagerPrivate *priv; +}; + + + +EphyAdBlockManagerClass +struct _EphyAdBlockManagerClass { + GObjectClass parent_class; + + /* Signals */ + void (* rules_changed) (EphyAdBlockManager *manager); +}; + + + +ephy_adblock_manager_get_type +GType +void + + +ephy_adblock_manager_should_load +gboolean +EphyAdBlockManager *self,EphyEmbed *embed,const char *url,AdUriCheckType check_type + + +ephy_adblock_manager_set_blocker +void +EphyAdBlockManager *self,EphyAdBlock *blocker + + +ephy_adblock_manager_edit_rule +void +EphyAdBlockManager *self,const char *url,gboolean allowed + + +ephy_adblock_manager_has_blocker +gboolean +EphyAdBlockManager *self + + +EPHY_TYPE_CERTIFICATE_MANAGER +#define EPHY_TYPE_CERTIFICATE_MANAGER (ephy_certificate_manager_get_type ()) + + +EPHY_CERTIFICATE_MANAGER +#define EPHY_CERTIFICATE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_CERTIFICATE_MANAGER, EphyCertificateManager)) + + +EPHY_CERTIFICATE_MANAGER_IFACE +#define EPHY_CERTIFICATE_MANAGER_IFACE(klass) (G_TYPE_CHECK_IFACE_CAST ((klass), EPHY_TYPE_CERTIFICATE_MANAGER, EphyCertificateManagerIface)) + + +EPHY_IS_CERTIFICATE_MANAGER +#define EPHY_IS_CERTIFICATE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_CERTIFICATE_MANAGER)) + + +EPHY_IS_CERTIFICATE_MANAGER_IFACE +#define EPHY_IS_CERTIFICATE_MANAGER_IFACE(klass) (G_TYPE_CHECK_IFACE_TYPE ((klass), EPHY_TYPE_CERTIFICATE_MANAGER)) + + +EPHY_CERTIFICATE_MANAGER_GET_IFACE +#define EPHY_CERTIFICATE_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_CERTIFICATE_MANAGER, EphyCertificateManagerIface)) + + +EphyCertificateManager + + +EphyCertificateManagerIface + + +EphyCertificateManagerIface +struct _EphyCertificateManagerIface +{ + GTypeInterface base_iface; + + /* Methods */ + GList * (* get_certificates) (EphyCertificateManager *manager, + EphyX509CertType type); + gboolean (* remove_certificate) (EphyCertificateManager *manager, + EphyX509Cert *cert); + gboolean (* import) (EphyCertificateManager *manager, + const gchar *file); +}; + + +ephy_certificate_manager_get_type +GType +void + + +ephy_certificate_manager_get_certificates +GList * +EphyCertificateManager *manager,EphyX509CertType type + + +ephy_certificate_manager_remove_certificate +gboolean +EphyCertificateManager *manager,EphyX509Cert *cert + + +ephy_certificate_manager_import +gboolean +EphyCertificateManager *manager,const gchar *file + + +EPHY_TYPE_PASSWORD_MANAGER +#define EPHY_TYPE_PASSWORD_MANAGER (ephy_password_manager_get_type ()) + + +EPHY_PASSWORD_MANAGER +#define EPHY_PASSWORD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManager)) + + +EPHY_PASSWORD_MANAGER_IFACE +#define EPHY_PASSWORD_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIface)) + + +EPHY_IS_PASSWORD_MANAGER +#define EPHY_IS_PASSWORD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PASSWORD_MANAGER)) + + +EPHY_IS_PASSWORD_MANAGER_IFACE +#define EPHY_IS_PASSWORD_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PASSWORD_MANAGER)) + + +EPHY_PASSWORD_MANAGER_GET_IFACE +#define EPHY_PASSWORD_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIface)) + + +EPHY_TYPE_PASSWORD_INFO +#define EPHY_TYPE_PASSWORD_INFO (ephy_password_info_get_type ()) + + +EphyPasswordManager + + +EphyPasswordManagerIface + + +EphyPasswordManagerIface +struct _EphyPasswordManagerIface +{ + GTypeInterface base_iface; + + /* Signals */ + void (* changed) (EphyPasswordManager *manager); + + /* Methods */ + void (* add) (EphyPasswordManager *manager, + EphyPasswordInfo *info); + void (* remove) (EphyPasswordManager *manager, + EphyPasswordInfo *info); + void (* remove_all) (EphyPasswordManager *manager); + GList * (* list) (EphyPasswordManager *manager); +}; + + +ephy_password_info_get_type +GType +void + + +ephy_password_info_new +EphyPasswordInfo * +const char *host,const char *username,const char *password + + +ephy_password_info_copy +EphyPasswordInfo * +const EphyPasswordInfo *info + + +ephy_password_info_free +void +EphyPasswordInfo *info + + +ephy_password_manager_get_type +GType +void + + +ephy_password_manager_add_password +void +EphyPasswordManager *manager,EphyPasswordInfo *info + + +ephy_password_manager_remove_password +void +EphyPasswordManager *manager,EphyPasswordInfo *info + + +ephy_password_manager_remove_all_passwords +void +EphyPasswordManager *manager + + +ephy_password_manager_list_passwords +GList * +EphyPasswordManager *manager + + +EPHY_TYPE_EMBED_PERSIST +#define EPHY_TYPE_EMBED_PERSIST (ephy_embed_persist_get_type ()) + + +EPHY_EMBED_PERSIST +#define EPHY_EMBED_PERSIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED_PERSIST, EphyEmbedPersist)) + + +EPHY_EMBED_PERSIST_CLASS +#define EPHY_EMBED_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_PERSIST, EphyEmbedPersistClass)) + + +EPHY_IS_EMBED_PERSIST +#define EPHY_IS_EMBED_PERSIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_PERSIST)) + + +EPHY_IS_EMBED_PERSIST_CLASS +#define EPHY_IS_EMBED_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_PERSIST)) + + +EPHY_EMBED_PERSIST_GET_CLASS +#define EPHY_EMBED_PERSIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_EMBED_PERSIST, EphyEmbedPersistClass)) + + +EphyEmbedPersistClass + + +EphyEmbedPersist + + +EphyEmbedPersistPrivate + + +EphyEmbedPersistFlags +typedef enum +{ + EPHY_EMBED_PERSIST_COPY_PAGE = 1 << 0, + EPHY_EMBED_PERSIST_MAINDOC = 1 << 1, + EPHY_EMBED_PERSIST_NO_VIEW = 1 << 2, + EPHY_EMBED_PERSIST_ASK_DESTINATION = 1 << 3, + EPHY_EMBED_PERSIST_DO_CONVERSION = 1 << 4, + EPHY_EMBED_PERSIST_FROM_CACHE = 1 << 5, + EPHY_EMBED_PERSIST_NO_CERTDIALOGS = 1 << 6, + EPHY_EMBED_PERSIST_NO_COOKIES = 1 << 7 +} EphyEmbedPersistFlags; + + +EphyEmbedPersist +struct _EphyEmbedPersist +{ + GObject parent; + + /*< private >*/ + EphyEmbedPersistPrivate *priv; +}; + + +EphyEmbedPersistClass +struct _EphyEmbedPersistClass +{ + GObjectClass parent_class; + + void (* completed) (EphyEmbedPersist *persist); + void (* cancelled) (EphyEmbedPersist *persist); + + /* Methods */ + + gboolean (* save) (EphyEmbedPersist *persist); + + void (* cancel) (EphyEmbedPersist *persist); + char * (* to_string) (EphyEmbedPersist *persist); +}; + + +ephy_embed_persist_flags_get_type +GType +void + + +ephy_embed_persist_get_type +GType +void + + +ephy_embed_persist_save +gboolean +EphyEmbedPersist *persist + + +ephy_embed_persist_cancel +void +EphyEmbedPersist *persist + + +ephy_embed_persist_set_dest +void +EphyEmbedPersist *persist,const char *value + + +ephy_embed_persist_set_embed +void +EphyEmbedPersist *persist,EphyEmbed *value + + +ephy_embed_persist_set_fc_title +void +EphyEmbedPersist *persist,const char *value + + +ephy_embed_persist_set_fc_parent +void +EphyEmbedPersist *persist,GtkWindow *value + + +ephy_embed_persist_set_flags +void +EphyEmbedPersist *persist,EphyEmbedPersistFlags value + + +ephy_embed_persist_set_max_size +void +EphyEmbedPersist *persist,gint64 value + + +ephy_embed_persist_set_persist_key +void +EphyEmbedPersist *persist,const char *value + + +ephy_embed_persist_set_source +void +EphyEmbedPersist *persist,const char *value + + +ephy_embed_persist_set_user_time +void +EphyEmbedPersist *persist,guint32 user_time + + +ephy_embed_persist_get_dest +const char * +EphyEmbedPersist *persist + + +ephy_embed_persist_get_embed +EphyEmbed * +EphyEmbedPersist *persist + + +ephy_embed_persist_get_fc_title +const char * +EphyEmbedPersist *persist + + +ephy_embed_persist_get_fc_parent +GtkWindow * +EphyEmbedPersist *persist + + +ephy_embed_persist_get_flags +EphyEmbedPersistFlags +EphyEmbedPersist *persist + + +ephy_embed_persist_get_max_size +gint64 +EphyEmbedPersist *persist + + +ephy_embed_persist_get_persist_key +const char * +EphyEmbedPersist *persist + + +ephy_embed_persist_get_source +const char * +EphyEmbedPersist *persist + + +ephy_embed_persist_get_user_time +guint32 +EphyEmbedPersist *persist + + +ephy_embed_persist_to_string +char * +EphyEmbedPersist *persist + + +EPHY_TYPE_ADBLOCK +#define EPHY_TYPE_ADBLOCK (ephy_adblock_get_type ()) + + +EPHY_ADBLOCK +#define EPHY_ADBLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_ADBLOCK, EphyAdBlock)) + + +EPHY_ADBLOCK_IFACE +#define EPHY_ADBLOCK_IFACE(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_ADBLOCK, EphyAdBlockIface)) + + +EPHY_IS_ADBLOCK +#define EPHY_IS_ADBLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_ADBLOCK)) + + +EPHY_IS_ADBLOCK_IFACE +#define EPHY_IS_ADBLOCK_IFACE(class) (G_TYPE_CHECK_CLASS_TYPE ((class), EPHY_TYPE_ADBLOCK)) + + +EPHY_ADBLOCK_GET_IFACE +#define EPHY_ADBLOCK_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_ADBLOCK, EphyAdBlockIface)) + + +AdUriCheckType +typedef enum +{ + AD_URI_CHECK_TYPE_OTHER = 1U, + AD_URI_CHECK_TYPE_SCRIPT = 2U, /* Indicates an executable script + (such as JavaScript) */ + AD_URI_CHECK_TYPE_IMAGE = 3U, /* Indicates an image (e.g., IMG + elements) */ + AD_URI_CHECK_TYPE_STYLESHEET = 4U, /* Indicates a stylesheet (e.g., + STYLE elements) */ + AD_URI_CHECK_TYPE_OBJECT = 5U, /* Indicates a generic object + (plugin-handled content + typically falls under this + category) */ + AD_URI_CHECK_TYPE_DOCUMENT = 6U, /* Indicates a document at the + top-level (i.e., in a + browser) */ + AD_URI_CHECK_TYPE_SUBDOCUMENT = 7U, /* Indicates a document contained + within another document (e.g., + IFRAMEs, FRAMES, and OBJECTs) */ + AD_URI_CHECK_TYPE_REFRESH = 8U /* Indicates a timed refresh */ +} AdUriCheckType; + + +EphyAdBlock + + +EphyAdBlockIface + + +EphyAdBlockIface +struct _EphyAdBlockIface +{ + GTypeInterface base_iface; + + gboolean (* should_load) (EphyAdBlock *adblock, + EphyEmbed *embed, + const char *url, + AdUriCheckType check_type); + + void (* edit_rule) (EphyAdBlock *adblock, + const char *url, + gboolean allowed); +}; + + +ephy_adblock_get_type +GType +void + + +ephy_adblock_should_load +gboolean +EphyAdBlock *adblock,EphyEmbed *embed,const char *url,AdUriCheckType check_type + + +ephy_adblock_edit_rule +void +EphyAdBlock *adblock,const char *url,gboolean allowed + + +EPHY_TYPE_EMBED_CONTAINER +#define EPHY_TYPE_EMBED_CONTAINER (ephy_embed_container_get_type ()) + + +EPHY_EMBED_CONTAINER +#define EPHY_EMBED_CONTAINER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED_CONTAINER, EphyEmbedContainer)) + + +EPHY_EMBED_CONTAINER_IFACE +#define EPHY_EMBED_CONTAINER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_CONTAINER, EphyEmbedContainerIface)) + + +EPHY_IS_EMBED_CONTAINER +#define EPHY_IS_EMBED_CONTAINER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_CONTAINER)) + + +EPHY_IS_EMBED_CONTAINER_IFACE +#define EPHY_IS_EMBED_CONTAINER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_CONTAINER)) + + +EPHY_EMBED_CONTAINER_GET_IFACE +#define EPHY_EMBED_CONTAINER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED_CONTAINER, EphyEmbedContainerIface)) + + +EphyEmbedContainer + + +EphyEmbedContainerIface + + +EphyEmbedContainerIface +struct _EphyEmbedContainerIface +{ + GTypeInterface parent_iface; + + gint (* add_child) (EphyEmbedContainer *container, + EphyEmbed *child, + gint position, + gboolean set_active); + + void (* set_active_child) (EphyEmbedContainer *container, + EphyEmbed *child); + + void (* remove_child) (EphyEmbedContainer *container, + EphyEmbed *child); + + EphyEmbed * (* get_active_child) (EphyEmbedContainer *container); + + GList * (* get_children) (EphyEmbedContainer *container); + + gboolean (* get_is_popup) (EphyEmbedContainer *container); + + EphyEmbedChrome (* get_chrome) (EphyEmbedContainer *container); +}; + + +ephy_embed_container_get_type +GType +void + + +ephy_embed_container_add_child +gint +EphyEmbedContainer *container,EphyEmbed *child,gint position,gboolean set_active + + +ephy_embed_container_set_active_child +void +EphyEmbedContainer *container,EphyEmbed *child + + +ephy_embed_container_remove_child +void +EphyEmbedContainer *container,EphyEmbed *child + + +ephy_embed_container_get_active_child +EphyEmbed * +EphyEmbedContainer *container + + +ephy_embed_container_get_children +GList * +EphyEmbedContainer *container + + +ephy_embed_container_get_is_popup +gboolean +EphyEmbedContainer *container + + +ephy_embed_container_get_chrome +EphyEmbedChrome +EphyEmbedContainer *container + + +EPHY_TYPE_COMMAND_MANAGER +#define EPHY_TYPE_COMMAND_MANAGER (ephy_command_manager_get_type ()) + + +EPHY_COMMAND_MANAGER +#define EPHY_COMMAND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManager)) + + +EPHY_COMMAND_MANAGER_IFACE +#define EPHY_COMMAND_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerIface)) + + +EPHY_IS_COMMAND_MANAGER +#define EPHY_IS_COMMAND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_COMMAND_MANAGER)) + + +EPHY_IS_COMMAND_MANAGER_IFACE +#define EPHY_IS_COMMAND_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COMMAND_MANAGER)) + + +EPHY_COMMAND_MANAGER_GET_IFACE +#define EPHY_COMMAND_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerIface)) + + +EphyCommandManager + + +EphyCommandManagerIface + + +EphyCommandManagerIface +struct _EphyCommandManagerIface +{ + GTypeInterface base_iface; + + void (* do_command) (EphyCommandManager *manager, + const char *command); + gboolean (* can_do_command) (EphyCommandManager *manager, + const char *command); + + /* Signals */ + + void (* command_changed) (EphyCommandManager *manager, + char *command); +}; + + +ephy_command_manager_get_type +GType +void + + +ephy_command_manager_do_command +void +EphyCommandManager *manager,const char *command + + +ephy_command_manager_can_do_command +gboolean +EphyCommandManager *manager,const char *command + + +EPHY_TYPE_PERMISSION_MANAGER +#define EPHY_TYPE_PERMISSION_MANAGER (ephy_permission_manager_get_type ()) + + +EPHY_PERMISSION_MANAGER +#define EPHY_PERMISSION_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManager)) + + +EPHY_PERMISSION_MANAGER_IFACE +#define EPHY_PERMISSION_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerIface)) + + +EPHY_IS_PERMISSION_MANAGER +#define EPHY_IS_PERMISSION_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PERMISSION_MANAGER)) + + +EPHY_IS_PERMISSION_MANAGER_IFACE +#define EPHY_IS_PERMISSION_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PERMISSION_MANAGER)) + + +EPHY_PERMISSION_MANAGER_GET_IFACE +#define EPHY_PERMISSION_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerIface)) + + +EPHY_TYPE_PERMISSION_INFO +#define EPHY_TYPE_PERMISSION_INFO (ephy_permission_info_get_type ()) + + +EPT_COOKIE +#define EPT_COOKIE "cookie" + + +EPT_IMAGE +#define EPT_IMAGE "image" + + +EPT_POPUP +#define EPT_POPUP "popup" + + +EphyPermission +typedef enum +{ + EPHY_PERMISSION_ALLOWED, + EPHY_PERMISSION_DENIED, + EPHY_PERMISSION_DEFAULT +} EphyPermission; + + +EphyPermissionInfo + + +EphyPermissionManager + + +EphyPermissionManagerIface + + +EphyPermissionInfo +struct _EphyPermissionInfo +{ + char *host; + GQuark qtype; + EphyPermission permission; +}; + + +EphyPermissionManagerIface +struct _EphyPermissionManagerIface +{ + GTypeInterface base_iface; + + /* Signals */ + void (* added) (EphyPermissionManager *manager, + EphyPermissionInfo *info); + void (* changed) (EphyPermissionManager *manager, + EphyPermissionInfo *info); + void (* deleted) (EphyPermissionManager *manager, + EphyPermissionInfo *info); + void (* cleared) (EphyPermissionManager *manager); + + /* Methods */ + void (* add) (EphyPermissionManager *manager, + const char *host, + const char *type, + EphyPermission permission); + void (* remove) (EphyPermissionManager *manager, + const char *host, + const char *type); + void (* clear) (EphyPermissionManager *manager); + EphyPermission (* test) (EphyPermissionManager *manager, + const char *host, + const char *type); + GList * (* list) (EphyPermissionManager *manager, + const char *type); +}; + + +ephy_permission_get_type +GType +void + + +ephy_permission_info_get_type +GType +void + + +ephy_permission_info_new +EphyPermissionInfo * +const char *host,const char *type,EphyPermission permission + + +ephy_permission_info_copy +EphyPermissionInfo * +const EphyPermissionInfo *info + + +ephy_permission_info_free +void +EphyPermissionInfo *info + + +ephy_permission_manager_get_type +GType +void + + +ephy_permission_manager_add_permission +void +EphyPermissionManager *manager,const char *host,const char *type,EphyPermission permission + + +ephy_permission_manager_remove_permission +void +EphyPermissionManager *manager,const char *host,const char *type + + +ephy_permission_manager_clear_permissions +void +EphyPermissionManager *manager + + +ephy_permission_manager_test_permission +EphyPermission +EphyPermissionManager *manager,const char *host,const char *type + + +ephy_permission_manager_list_permissions +GList * +EphyPermissionManager *manager,const char *type + + +ephy_embed_utils_link_message_parse +char * +char *message + + +ephy_embed_utils_get_title_composite +const char * +EphyEmbed *embed + + +ephy_embed_utils_address_has_web_scheme +gboolean +const char *address + + +GeckoEmbedProgressFlags +typedef enum +{ + GECKO_EMBED_FLAG_START = 1U << 0, + GECKO_EMBED_FLAG_REDIRECTING = 1U << 1, + GECKO_EMBED_FLAG_TRANSFERRING = 1U << 2, + GECKO_EMBED_FLAG_NEGOTIATING = 1U << 3, + GECKO_EMBED_FLAG_STOP = 1U << 4, + + GECKO_EMBED_FLAG_IS_REQUEST = 1U << 16, + GECKO_EMBED_FLAG_IS_DOCUMENT = 1U << 17, + GECKO_EMBED_FLAG_IS_NETWORK = 1U << 18, + GECKO_EMBED_FLAG_IS_WINDOW = 1U << 19, + + GECKO_EMBED_FLAG_RESTORING = 1U << 24, +} GeckoEmbedProgressFlags; + + +GeckoEmbedStatusEnum +typedef enum +{ + /* NS_ERROR_UNKNOWN_HOST */ + GECKO_EMBED_STATUS_FAILED_DNS = 2152398878U, + /* NS_ERROR_CONNECTION_REFUSED */ + GECKO_EMBED_STATUS_FAILED_CONNECT = 2152398861U, + /* NS_ERROR_NET_TIMEOUT */ + GECKO_EMBED_STATUS_FAILED_TIMEOUT = 2152398862U, + /* NS_BINDING_ABORTED */ + GECKO_EMBED_STATUS_FAILED_USERCANCELED = 2152398850U +} GeckoEmbedStatusEnum; + + +GeckoEmbedReloadFlags +typedef enum +{ + GECKO_EMBED_FLAG_RELOADNORMAL = 0, + GECKO_EMBED_FLAG_RELOADBYPASSCACHE = 1, + GECKO_EMBED_FLAG_RELOADBYPASSPROXY = 2, + GECKO_EMBED_FLAG_RELOADBYPASSPROXYANDCACHE = 3, + GECKO_EMBED_FLAG_RELOADCHARSETCHANGE = 4 +} GeckoEmbedReloadFlags; + + +GeckoEmbedChromeFlags +typedef enum +{ + GECKO_EMBED_FLAG_DEFAULTCHROME = 1U << 0, + GECKO_EMBED_FLAG_WINDOWBORDERSON = 1U << 1, + GECKO_EMBED_FLAG_WINDOWCLOSEON = 1U << 2, + GECKO_EMBED_FLAG_WINDOWRESIZEON = 1U << 3, + GECKO_EMBED_FLAG_MENUBARON = 1U << 4, + GECKO_EMBED_FLAG_TOOLBARON = 1U << 5, + GECKO_EMBED_FLAG_LOCATIONBARON = 1U << 6, + GECKO_EMBED_FLAG_STATUSBARON = 1U << 7, + GECKO_EMBED_FLAG_PERSONALTOOLBARON = 1U << 8, + GECKO_EMBED_FLAG_SCROLLBARSON = 1U << 9, + GECKO_EMBED_FLAG_TITLEBARON = 1U << 10, + GECKO_EMBED_FLAG_EXTRACHROMEON = 1U << 11, + GECKO_EMBED_FLAG_ALLCHROME = 1U << 12, + GECKO_EMBED_FLAG_WINDOWRAISED = 1U << 25, + GECKO_EMBED_FLAG_WINDOWLOWERED = 1U << 26, + GECKO_EMBED_FLAG_CENTERSCREEN = 1U << 27, + GECKO_EMBED_FLAG_DEPENDENT = 1U << 28, + GECKO_EMBED_FLAG_MODAL = 1U << 29, + GECKO_EMBED_FLAG_OPENASDIALOG = 1U << 30, + GECKO_EMBED_FLAG_OPENASCHROME = 1U << 31, +} GeckoEmbedChromeFlags; + + +GECKO_TYPE_DOM_EVENT +#define GECKO_TYPE_DOM_EVENT (gecko_dom_event_get_type ()) + + +GeckoDOMEvent + + +gecko_dom_event_get_type +GType +void + + +gecko_dom_event_copy +GeckoDOMEvent * +GeckoDOMEvent * + + +gecko_dom_event_free +void +GeckoDOMEvent * + + +gecko_init +gboolean + + + +gecko_init_with_profile +gboolean +const char *, const char*, const char* + + +gecko_shutdown +void + + + +Init +nsresult +GeckoEmbed *aOwningWidget + + +Realize +nsresult +PRBool *aAlreadRealized + + +Unrealize +void +void + + +Show +void +void + + +Hide +void +void + + +Resize +void +PRUint32 aWidth, PRUint32 aHeight + + +Destroy +void +void + + +SetURI +void +const char *aURI + + +LoadCurrentURI +void +void + + +Reload +void +PRUint32 reloadFlags + + +SetChromeMask +void +PRUint32 chromeMask + + +ApplyChromeMask +void + + + +OpenStream +nsresult +const char *aBaseURI, const char *aContentType + + +AppendToStream +nsresult +const char *aData, PRInt32 aLen + + +CloseStream +nsresult +void + + +ContentStateChange +void +void + + +ContentFinishedLoading +void +void + + +TopLevelFocusIn +void +void + + +TopLevelFocusOut +void +void + + +ChildFocusIn +void +void + + +ChildFocusOut +void +void + + +GetAtkObjectForCurrentDocument +void * + + + +GetListener +void +void + + +AttachListeners +void +void + + +DetachListeners +void +void + + +GetPIDOMWindow +nsresult +nsPIDOMWindow **aPIWin + + +gecko_embed_get_nsIWebBrowser +void +GeckoEmbed *embed,nsIWebBrowser **retval + + +gecko_embed_get_GeckoBrowser +GeckoBrowser* +GeckoEmbed *embed + + +gecko_dom_event_get_I +nsIDOMEvent * +GeckoDOMEvent * + + +GECKO_TYPE_EMBED_SINGLE +#define GECKO_TYPE_EMBED_SINGLE (gecko_embed_single_get_type()) + + +GECKO_EMBED_SINGLE +#define GECKO_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GECKO_TYPE_EMBED_SINGLE, GeckoEmbedSingle)) + + +GECKO_EMBED_SINGLE_CLASS +#define GECKO_EMBED_SINGLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GECKO_TYPE_EMBED_SINGLE, GeckoEmbedSingleClass)) + + +GECKO_IS_EMBED_SINGLE +#define GECKO_IS_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GECKO_TYPE_EMBED_SINGLE)) + + +GECKO_IS_EMBED_SINGLE_CLASS +#define GECKO_IS_EMBED_SINGLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GECKO_TYPE_EMBED_SINGLE)) + + +GECKO_EMBED_SINGLE_GET_CLASS +#define GECKO_EMBED_SINGLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GECKO_TYPE_EMBED_SINGLE, GeckoEmbedSingleClass)) + + +GeckoEmbedSingle + + +GeckoEmbedSinglePrivate + + +GeckoEmbedSingleClass + + +GeckoEmbedSingle +struct _GeckoEmbedSingle +{ + GObject parent_instance; + + /*< private >*/ + GeckoEmbedSinglePrivate *priv; +}; + + +GeckoEmbedSingleClass +struct _GeckoEmbedSingleClass +{ + GObjectClass parent_class; + + void (* new_window_orphan) (GeckoEmbedSingle *single, + GeckoEmbed **newEmbed, + guint chromemask); +}; + + +gecko_embed_single_get_type +GType +void + + +gecko_embed_single_get +GeckoEmbedSingle * +void + + +gecko_embed_single_push_startup +void +void + + +gecko_embed_single_pop_startup +void +void + + +Init +nsresult +GeckoBrowser *aOwner + + +nsModuleComponentInfo +struct nsModuleComponentInfo; + + +gecko_embed_single_get_GeckoSingle +GeckoSingle* +void + + +gecko_embed_single_set_directory_service_provider +void +nsIDirectoryServiceProvider *aProvider + + +gecko_embed_single_set_app_components +void +const nsModuleComponentInfo *aComps,int aNumComps + + +gecko_embed_single_create_window +void +GeckoEmbed **aNewEmbed,guint aChromeFlags + + +Init +nsresult +GeckoBrowser *aOwner + + +IsCurrentURI +PRBool +nsIURI *aURI + + +gecko_embed_marshal_BOOLEAN__BOXED +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_BOOLEAN__POINTER +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_BOOLEAN__STRING +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_VOID__INT_INT +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_VOID__INT_UINT +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_VOID__OBJECT_UINT +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_VOID__POINTER_INT_POINTER +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_VOID__POINTER_UINT +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_VOID__STRING_INT_INT +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +gecko_embed_marshal_VOID__STRING_INT_UINT +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +HandleEvent +NS_IMETHOD +nsIDOMEvent* aEvent) { return NS_OK; }// nsIDOMKeyListenerNS_IMETHOD KeyDown(nsIDOMEvent* aDOMEvent + + +KeyUp +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +KeyPress +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +MouseDown +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +MouseUp +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +MouseClick +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +MouseDblClick +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +MouseOver +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +MouseOut +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +Activate +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +FocusIn +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +FocusOut +NS_IMETHOD +nsIDOMEvent* aDOMEvent + + +ContextMenu +NS_IMETHOD +nsIDOMEvent *aDOMEvent + + +Emit +NS_METHOD +nsIDOMEvent *aDOMEvent,GeckoEmbedSignals signal,GeckoDOMEventType + + +GECKO_TYPE_EMBED_PROGRESS_FLAGS +#define GECKO_TYPE_EMBED_PROGRESS_FLAGS gecko_embed_progress_flags_get_type() + + +gecko_embed_progress_flags_get_type +GType +void + + +GECKO_TYPE_EMBED_STATUS_ENUM +#define GECKO_TYPE_EMBED_STATUS_ENUM gecko_embed_status_enum_get_type() + + +gecko_embed_status_enum_get_type +GType +void + + +GECKO_TYPE_EMBED_RELOAD_FLAGS +#define GECKO_TYPE_EMBED_RELOAD_FLAGS gecko_embed_reload_flags_get_type() + + +gecko_embed_reload_flags_get_type +GType +void + + +GECKO_TYPE_EMBED_CHROME_FLAGS +#define GECKO_TYPE_EMBED_CHROME_FLAGS gecko_embed_chrome_flags_get_type() + + +gecko_embed_chrome_flags_get_type +GType +void + + +GeckoDOMEvent +struct _GeckoDOMEvent { + nsIDOMEvent *mEvent; +}; + + + +GECKO_DOM_EVENT_STATIC_INIT +#define GECKO_DOM_EVENT_STATIC_INIT(aEvent,aDOMEvent) \ +{ aEvent.mEvent = aDOMEvent; } + + +GECKO_DOM_EVENT_STATIC_DEINIT +#define GECKO_DOM_EVENT_STATIC_DEINIT(aEvent) \ +{ } + + +gecko_dom_event_new +GeckoDOMEvent * +nsIDOMEvent * + + +gecko_reparent_to_offscreen +void +GtkWidget* + + +GeckoEmbedSignals +typedef enum { + DOM_KEY_DOWN, + DOM_KEY_PRESS, + DOM_KEY_UP, + DOM_MOUSE_DOWN, + DOM_MOUSE_UP, + DOM_MOUSE_CLICK, + DOM_MOUSE_DOUBLE_CLICK, + DOM_MOUSE_OVER, + DOM_MOUSE_OUT, + DOM_ACTIVATE, + DOM_FOCUS_IN, + DOM_FOCUS_OUT, + DOM_CONTEXT_MENU, + + LINK_MESSAGE, + JS_STATUS, + LOCATION, + TITLE, + PROGRESS, + PROGRESS_ALL, + NET_STATE, + NET_STATE_ALL, + NET_START, + NET_STOP, + NEW_WINDOW, + VISIBILITY, + DESTROY_BROWSER, + OPEN_URI, + SIZE_TO, + SECURITY_CHANGE, + STATUS_CHANGE, + LAST_EMBED_SIGNAL +} GeckoEmbedSignals; + + +GECKO_TYPE_EMBED +#define GECKO_TYPE_EMBED (gecko_embed_get_type()) + + +GECKO_EMBED +#define GECKO_EMBED(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GECKO_TYPE_EMBED, GeckoEmbed)) + + +GECKO_EMBED_CLASS +#define GECKO_EMBED_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GECKO_TYPE_EMBED, GeckoEmbedClass)) + + +GECKO_IS_EMBED +#define GECKO_IS_EMBED(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GECKO_TYPE_EMBED)) + + +GECKO_IS_EMBED_CLASS +#define GECKO_IS_EMBED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GECKO_TYPE_EMBED)) + + +GECKO_EMBED_GET_CLASS +#define GECKO_EMBED_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GECKO_TYPE_EMBED, GeckoEmbedClass)) + + +GeckoEmbed + + +GeckoEmbedPrivate + + +GeckoEmbedClass + + +GeckoEmbed +struct _GeckoEmbed +{ + GtkBin parent_instance; + + /*< private >*/ + GeckoEmbedPrivate *priv; +}; + + +GeckoEmbedClass +struct _GeckoEmbedClass +{ + GtkBinClass parent_class; + + /* Signals */ + + /* Network */ + gboolean (* open_uri) (GeckoEmbed *embed, const char *aURI); + void (* net_start) (GeckoEmbed *embed); + void (* net_stop) (GeckoEmbed *embed); + void (* net_state) (GeckoEmbed *embed, int state, guint status); + void (* net_state_all) (GeckoEmbed *embed, const char *aURI, + int state, guint status); + void (* progress) (GeckoEmbed *embed, int curprogress, + int maxprogress); + void (* progress_all) (GeckoEmbed *embed, const char *aURI, + int curprogress, int maxprogress); + void (* security_change) (GeckoEmbed *embed, gpointer request, + guint state); + void (* status_change) (GeckoEmbed *embed, gpointer request, + int status, gpointer message); + + /* Document */ + void (* link_message) (GeckoEmbed *embed); + void (* js_status_message) (GeckoEmbed *embed); + void (* location) (GeckoEmbed *embed); + void (* title) (GeckoEmbed *embed); + void (* visibility) (GeckoEmbed *embed, gboolean visibility); + void (* destroy_browser) (GeckoEmbed *embed); + void (* size_to) (GeckoEmbed *embed, int width, int height); + + + /* misc. */ + void (* new_window) (GeckoEmbed *embed, GeckoEmbed **newEmbed, + guint chromemask); + + /* reserved for future use */ + void (* reserved_0) (void); + void (* reserved_1) (void); + void (* reserved_2) (void); + void (* reserved_3) (void); + void (* reserved_4) (void); + void (* reserved_5) (void); + void (* reserved_6) (void); + void (* reserved_7) (void); + void (* reserved_8) (void); + void (* reserved_9) (void); + void (* reserved_a) (void); + void (* reserved_b) (void); + void (* reserved_c) (void); + void (* reserved_d) (void); + void (* reserved_e) (void); + void (* reserved_f) (void); +}; + + +gecko_embed_get_type +GType +void + + +gecko_embed_new +GtkWidget * +void + + +gecko_embed_load_url +void +GeckoEmbed *embed,const char *url + + +gecko_embed_stop_load +void +GeckoEmbed *embed + + +gecko_embed_can_go_back +gboolean +GeckoEmbed *embed + + +gecko_embed_can_go_forward +gboolean +GeckoEmbed *embed + + +gecko_embed_go_back +void +GeckoEmbed *embed + + +gecko_embed_go_forward +void +GeckoEmbed *embed + + +gecko_embed_render_data +void +GeckoEmbed *embed,const char *data,guint32 len,const char *base_uri,const char *mime_type + + +gecko_embed_open_stream +void +GeckoEmbed *embed,const char *base_uri,const char *mime_type + + +gecko_embed_append_data +void +GeckoEmbed *embed,const char *data, guint32 len + + +gecko_embed_close_stream +void +GeckoEmbed *embed + + +gecko_embed_get_link_message +char * +GeckoEmbed *embed + + +gecko_embed_get_js_status +char * +GeckoEmbed *embed + + +gecko_embed_get_title +char * +GeckoEmbed *embed + + +gecko_embed_get_location +char * +GeckoEmbed *embed + + +gecko_embed_reload +void +GeckoEmbed *embed, gint32 flags + + +gecko_embed_set_chrome_mask +void +GeckoEmbed *embed,guint32 flags + + +gecko_embed_get_chrome_mask +guint32 +GeckoEmbed *embed + + +Init +nsresult +GeckoBrowser *aOwner + + +CreateWindow +nsresult +void + + +ReleaseChildren +void +void + + +gecko_init_with_params +gboolean +const char *, const char*, const char*, nsIDirectoryServiceProvider* + + +Init +nsresult +EphyEmbedSingle *aOwner + + +Detach +nsresult + + + +IsOnline +PRBool +) { return mIsOnline; }protected:nsresult EmitCookieNotification (const char *name, nsISupports *aSubject + + +EmitPermissionNotification +nsresult +const char *name, nsISupports *aSubject + + +ExamineResponse +nsresult +nsISupports *aSubject + + +ExamineRequest +nsresult +nsISupports *aSubject + + +ExamineCookies +nsresult +nsISupports *aSubject + + +mozilla_cookie_to_ephy_cookie +EphyCookie * +nsICookie *cookie + + +mozilla_permission_to_ephy_permission +EphyPermissionInfo * +nsIPermission *perm + + +SetEmbed +nsresult +EphyEmbed *aEmbed + + +SetFindProperties +void +const char *aSearchString,PRBool aCaseSensitive + + +SetSelectionAttention +void +PRBool aAttention + + +Find +EphyEmbedFindResult +const char *aSearchString,PRBool aLinksOnly + + +FindAgain +EphyEmbedFindResult +PRBool aForward,PRBool aLinksOnly + + +ActivateLink +PRBool +GdkModifierType aMask + + +MOZILLA_TYPE_EMBED_FIND +#define MOZILLA_TYPE_EMBED_FIND (mozilla_embed_find_get_type ()) + + +MOZILLA_EMBED_FIND +#define MOZILLA_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MOZILLA_TYPE_EMBED_FIND, MozillaEmbedFind)) + + +MOZILLA_EMBED_FIND_CLASS +#define MOZILLA_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MOZILLA_TYPE_EMBED_FIND, MozillaEmbedFindClass)) + + +MOZILLA_IS_EMBED_FIND +#define MOZILLA_IS_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MOZILLA_TYPE_EMBED_FIND)) + + +MOZILLA_IS_EMBED_FIND_CLASS +#define MOZILLA_IS_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MOZILLA_TYPE_EMBED_FIND)) + + +MOZILLA_EMBED_FIND_GET_CLASS +#define MOZILLA_EMBED_FIND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MOZILLA_TYPE_EMBED_FIND, MozillaEmbedFindClass)) + + +MozillaEmbedFindClass + + +MozillaEmbedFind + + +MozillaEmbedFindPrivate + + +MozillaEmbedFind +struct _MozillaEmbedFind +{ + GObject parent_instance; + + /*< private >*/ + MozillaEmbedFindPrivate *priv; +}; + + +MozillaEmbedFindClass +struct _MozillaEmbedFindClass +{ + GObjectClass parent_class; +}; + + +mozilla_embed_find_get_type +GType +void + + +MOZILLA_TYPE_EMBED_EVENT +#define MOZILLA_TYPE_EMBED_EVENT (mozilla_embed_event_get_type ()) + + +MOZILLA_EMBED_EVENT +#define MOZILLA_EMBED_EVENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MOZILLA_TYPE_EMBED_EVENT, MozillaEmbedEvent)) + + +MOZILLA_EMBED_EVENT_CLASS +#define MOZILLA_EMBED_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MOZILLA_TYPE_EMBED_EVENT, MozillaEmbedEventClass)) + + +MOZILLA_IS_EMBED_EVENT +#define MOZILLA_IS_EMBED_EVENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MOZILLA_TYPE_EMBED_EVENT)) + + +MOZILLA_IS_EMBED_EVENT_CLASS +#define MOZILLA_IS_EMBED_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MOZILLA_TYPE_EMBED_EVENT)) + + +MOZILLA_EMBED_EVENT_GET_CLASS +#define MOZILLA_EMBED_EVENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MOZILLA_TYPE_EMBED_EVENT, MozillaEmbedEventClass)) + + +MozillaEmbedEventClass + + +MozillaEmbedEvent + + +MozillaEmbedEventPrivate + + +MozillaEmbedEventClass +struct _MozillaEmbedEventClass +{ + GObjectClass parent_class; +}; + + +MozillaEmbedEvent +struct _MozillaEmbedEvent +{ + GObject parent; + + /*< private >*/ + MozillaEmbedEventPrivate *priv; + + /*< private >*/ /* public to the embed implementation */ + guint button; + guint context; + guint modifier; + guint x; + guint y; + guint keycode; +}; + + +mozilla_embed_event_get_type +GType +void + + +mozilla_embed_event_new +MozillaEmbedEvent * +gpointer dom_event + + +mozilla_embed_event_set_property +void +MozillaEmbedEvent *event,const char *name,GValue *value + + +EPHY_COOKIEPROMPTSERVICE_CID +#define EPHY_COOKIEPROMPTSERVICE_CID \ + { 0x50766a18, 0x0b34, 0x41d9, { 0x8f, 0x6c, 0x46, 0x12, 0x20, 0x0e, 0x65, 0x56 } } + + +EPHY_COOKIEPROMPTSERVICE_CLASSNAME +#define EPHY_COOKIEPROMPTSERVICE_CLASSNAME "Epiphany Cookie Prompt Service" + + +EPHY_COOKIEPROMPTSERVICE_CONTRACTID +#define EPHY_COOKIEPROMPTSERVICE_CONTRACTID "@mozilla.org/embedcomp/cookieprompt-service;1" + + +GECKO_PRINT_SESSION_IID +#define GECKO_PRINT_SESSION_IID \ +{ 0x0940c973, 0x97e7, 0x476f, \ + { 0xa6, 0x12, 0x4e, 0xd9, 0x47, 0x3a, 0x0b, 0x36 } } + + +GECKO_PRINT_SESSION_CLASSNAME +#define GECKO_PRINT_SESSION_CLASSNAME "Gecko Print Session" + + +SetSettings +nsresult +nsIPrintSettings *, GtkPrintSettings*, GtkPageSetup*, GtkPrinter* + + +GetSourceFile +void +nsACString& + + +Cancel +void + + + +StartPrinting +void + + + +JobStatusChanged +void + + + +JobDone +void + + + +JobError +void +const char * + + +SetProgress +void +PRInt32, PRInt32 + + +SetProgressText +void +const char * + + +LaunchJobOnIdle +void + + + +DestroyJob +void + + + +nsModuleComponentInfo +struct nsModuleComponentInfo; + + +EPHY_CONTENT_POLICY_CONTRACTID +#define EPHY_CONTENT_POLICY_CONTRACTID "@gnome.org/projects/epiphany/epiphany-content-policy;1" + + +EPHY_CONTENT_POLICY_CLASSNAME +#define EPHY_CONTENT_POLICY_CLASSNAME "Epiphany Content Policy Class" + + +EPHY_CONTENT_POLICY_CID +#define EPHY_CONTENT_POLICY_CID \ +{ /* 6bb60b15-b7bd-4023-a19e-ab691bc3fb43 */ \ + 0x6bb60b15, \ + 0xb7bd, \ + 0x4023, \ + { 0xa1, 0x9e, 0xab, 0x69, 0x1b, 0xc3, 0xfb, 0x43 } \ +} + + +EPHY_REDIRECTLISTENER_CID +#define EPHY_REDIRECTLISTENER_CID \ +{ 0x6a9533c6, 0xf068, 0x4e63, { 0x82, 0x25, 0x5f, 0xeb, 0xa0, 0xb5, 0x4d, 0x6b } } + + +EPHY_REDIRECTLISTENER_CLASSNAME +#define EPHY_REDIRECTLISTENER_CLASSNAME "Epiphany Redirect Listener Class" + + +Init +nsresult +EphyHistory *aHistory + + +GECKO_PROMPT_SERVICE_CID +#define GECKO_PROMPT_SERVICE_CID \ +{ /* cadc6035-7c53-4039-823b-004a289d5eb2 */ \ + 0xcadc6035, 0x7c53, 0x4039, \ + { 0x82, 0x3b, 0x00, 0x4a, 0x28, 0x9d, 0x5e, 0xb2 } } + + +GECKO_PROMPT_SERVICE_CLASSNAME +#define GECKO_PROMPT_SERVICE_CLASSNAME "Gecko Prompt Service" + + +EPHY_ABOUT_MODULE_CID +#define EPHY_ABOUT_MODULE_CID \ +{ 0xa9aea13e, 0x21de, 0x4be8, \ + { 0xa0, 0x7e, 0xa0, 0x5f, 0x11, 0x65, 0x8c, 0x55 } } + + +EPHY_ABOUT_NETERROR_CONTRACTID +#define EPHY_ABOUT_NETERROR_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "neterror" + + +EPHY_ABOUT_NETERROR_CLASSNAME +#define EPHY_ABOUT_NETERROR_CLASSNAME "Epiphany about:neterror module" + + +EPHY_ABOUT_EPIPHANY_CONTRACTID +#define EPHY_ABOUT_EPIPHANY_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "epiphany" + + +EPHY_ABOUT_EPIPHANY_CLASSNAME +#define EPHY_ABOUT_EPIPHANY_CLASSNAME "Epiphany about:epiphany module" + + +EPHY_ABOUT_RECOVER_CONTRACTID +#define EPHY_ABOUT_RECOVER_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "recover" + + +EPHY_ABOUT_RECOVER_CLASSNAME +#define EPHY_ABOUT_RECOVER_CLASSNAME "Epiphany about:recover module" + + +Redirect +nsresult +const nsACString&, nsIChannel** + + +ParseURL +nsresult +const char*, nsACString&, nsACString&, nsACString&, nsACString&, nsACString& + + +GetErrorMessage +nsresult +nsIURI*, const char*, char**, char**, char**, char**, char**, char** + + +CreateErrorPage +nsresult +nsIURI*, nsIChannel** + + +CreateRecoverPage +nsresult +nsIURI*, nsIChannel** + + +WritePage +nsresult +nsIURI*, nsIURI*, nsIURI*, const nsACString&, const char*, const char*, const char*, const char*, const char*, const char*, nsIChannel** + + +Write +nsresult +nsIOutputStream*, const char* + + +GTK_NSSSECURITYWARNINGDIALOGS_CLASSNAME +#define GTK_NSSSECURITYWARNINGDIALOGS_CLASSNAME "Epiphany Security Warning Dialogs Class" + + +GTK_NSSSECURITYWARNINGDIALOGS_CID +#define GTK_NSSSECURITYWARNINGDIALOGS_CID \ +{ \ + /* 1f5eac0a-d7e3-4f8e-b4d5-7240f7cba269 */ \ + 0x1f5eac0a, \ + 0xd7e3, \ + 0x4f8e, \ + { 0xb4, 0xd5, 0x72, 0x40, 0xf7, 0xcb, 0xa2, 0x69 } \ +} + + +DoDialog +void +nsIInterfaceRequestor *aContext,const char *aPrefName,GtkMessageType aType,GtkButtonsType aButtons,int aDefaultResponse,const char *aTitle,const char *aPrimary,const char *aSecondary,const char *aButtonText,PRBool *_retval + + +NS_FORWARD_NSIREQUEST +NS_DECL_ISUPPORTS +mChannel->)NS_FORWARD_NSICHANNEL (mChannel->)EphyWrappedChannel (nsIChannel *aChannel) : mChannel (aChannel) { }virtual ~EphyWrappedChannel () { }protected:nsCOMPtr mChannel;};class EphyRedirectChannel : public EphyWrappedChannel{public:EphyRedirectChannel (nsIChannel *aChannel) : EphyWrappedChannel (aChannel) { }virtual ~EphyRedirectChannel () { }NS_IMETHOD SetLoadFlags (nsLoadFlags aFlags + + +GECKO_PRINT_SERVICE_IID +#define GECKO_PRINT_SERVICE_IID \ +{ 0x6a71ff30, 0x7f4d, 0x4d91, \ + { 0xb7, 0x1a, 0xd5, 0xc9, 0x76, 0x4b, 0x34, 0xbe } } + + +GECKO_PRINT_SERVICE_CLASSNAME +#define GECKO_PRINT_SERVICE_CLASSNAME "Gecko Print Service" + + +PrintUnattended +nsresult +nsIDOMWindow *, nsIPrintSettings * + + +GECKO_SPELL_CHECK_ENGINE_IID +#define GECKO_SPELL_CHECK_ENGINE_IID \ +{ 0x26948b8b, 0xd136, 0x4a78, { 0xa9, 0xc5, 0x3a, 0x14, 0x58, 0x12, 0xb6, 0x49 } } + + +GECKO_SPELL_CHECK_ENGINE_CONTRACTID +#define GECKO_SPELL_CHECK_ENGINE_CONTRACTID "@mozilla.org/spellchecker/myspell;1" + + +GECKO_SPELL_CHECK_ENGINE_CLASSNAME +#define GECKO_SPELL_CHECK_ENGINE_CLASSNAME "Gecko Print Settings" + + +nsModuleComponentInfo +struct nsModuleComponentInfo; + + +EPHY_SIDEBAR_CLASSNAME +#define EPHY_SIDEBAR_CLASSNAME \ + "Epiphany's Sidebar Implementation" + + +EPHY_SIDEBAR_CID +#define EPHY_SIDEBAR_CID \ +{ /* {50f13159-f9b9-44b3-b18e-6ee5d85a202a} */ \ + 0x50f13159, \ + 0xf9b9, \ + 0x44b3, \ + {0xb1, 0x8e, 0x6e, 0xe5, 0xd8, 0x5a, 0x20, 0x2a} \ +} + + +GECKO_FORMSIGNINGDIALOGS_CID +#define GECKO_FORMSIGNINGDIALOGS_CID \ +{ 0x4e42a43e, 0xfbc5, 0x40cc, { 0xbc, 0xbb, 0x8c, 0xbc, 0x4e, 0x21, 0x01, 0xeb } } + + +GECKO_FORMSIGNINGDIALOGS_CLASSNAME +#define GECKO_FORMSIGNINGDIALOGS_CLASSNAME "Gecko Form Signing Dialogs" + + +GetGeckoEmbedForDOMWindow +GtkWidget* +nsIDOMWindow* + + +GetGtkWindowForDOMWindow +GtkWidget* +nsIDOMWindow* + + +GetIOService +nsresult +nsIIOService **ioService + + +NewURI +nsresult +nsIURI **result,const nsAString &spec,const char *charset = nsnull,nsIURI *baseURI = nsnull + + +NewURI +nsresult +nsIURI **result,const nsACString &spec,const char *charset = nsnull,nsIURI *baseURI = nsnull + + +NewFileURI +nsresult +nsIURI **result,nsIFile *spec + + +FindEmbed +GtkWidget * +nsIDOMWindow *aDOMWindow + + +FindGtkParent +GtkWidget * +nsIDOMWindow *aDOMWindow + + +ConvertUTF16toUTF8 +char * +const PRUnichar*, PRInt32 + + +IsCalledFromScript +PRBool + + + +JSContext +struct JSContext; + + +Init +nsresult + + + +ShouldShow +PRBool +) { return mDefaultEnabled && mContextPushed; }void Run (GtkWidget *aDialog + + +Response +int +) { return mResponse; }private:// stack only pleasevoid *operator new (size_t) CPP_THROW_NEW;PRBool DispatchEvent (const char*, PRBool + + +EPHY_COOKIEPROMPTSERVICE_CID +#define EPHY_COOKIEPROMPTSERVICE_CID \ + { 0x50766a18, 0x0b34, 0x41d9, { 0x8f, 0x6c, 0x46, 0x12, 0x20, 0x0e, 0x65, 0x56 } } + + +EPHY_COOKIEPROMPTSERVICE_CLASSNAME +#define EPHY_COOKIEPROMPTSERVICE_CLASSNAME "Epiphany Cookie Prompt Service" + + +EPHY_COOKIEPROMPTSERVICE_CONTRACTID +#define EPHY_COOKIEPROMPTSERVICE_CONTRACTID "@mozilla.org/embedcomp/cookieprompt-service;1" + + +GetIOService +nsresult +nsIIOService **ioService + + +NewURI +nsresult +nsIURI **result,const nsAString &spec,const char *charset = nsnull,nsIURI *baseURI = nsnull + + +NewURI +nsresult +nsIURI **result,const nsACString &spec,const char *charset = nsnull,nsIURI *baseURI = nsnull + + +NewFileURI +nsresult +nsIURI **result,nsIFile *spec + + +FindEmbed +GtkWidget * +nsIDOMWindow *aDOMWindow + + +FindGtkParent +GtkWidget * +nsIDOMWindow *aDOMWindow + + +ConvertUTF16toUTF8 +char * +const PRUnichar*, PRInt32 + + +IsCalledFromScript +PRBool + + + +GECKO_PRINT_SESSION_IID +#define GECKO_PRINT_SESSION_IID \ +{ 0x0940c973, 0x97e7, 0x476f, \ + { 0xa6, 0x12, 0x4e, 0xd9, 0x47, 0x3a, 0x0b, 0x36 } } + + +GECKO_PRINT_SESSION_CLASSNAME +#define GECKO_PRINT_SESSION_CLASSNAME "Gecko Print Session" + + +SetSettings +nsresult +nsIPrintSettings *, GtkPrintSettings*, GtkPageSetup*, GtkPrinter* + + +GetSourceFile +void +nsACString& + + +Cancel +void + + + +StartPrinting +void + + + +JobStatusChanged +void + + + +JobDone +void + + + +JobError +void +const char * + + +SetProgress +void +PRInt32, PRInt32 + + +SetProgressText +void +const char * + + +LaunchJobOnIdle +void + + + +DestroyJob +void + + + +JSContext +struct JSContext; + + +Init +nsresult + + + +Init +nsresult +EphyEmbedSingle *aOwner + + +Detach +nsresult + + + +IsOnline +PRBool +) { return mIsOnline; }protected:nsresult EmitCookieNotification (const char *name, nsISupports *aSubject + + +EmitPermissionNotification +nsresult +const char *name, nsISupports *aSubject + + +ExamineResponse +nsresult +nsISupports *aSubject + + +ExamineRequest +nsresult +nsISupports *aSubject + + +ExamineCookies +nsresult +nsISupports *aSubject + + +mozilla_cookie_to_ephy_cookie +EphyCookie * +nsICookie *cookie + + +mozilla_permission_to_ephy_permission +EphyPermissionInfo * +nsIPermission *perm + + +nsModuleComponentInfo +struct nsModuleComponentInfo; + + +EPHY_CONTENT_POLICY_CONTRACTID +#define EPHY_CONTENT_POLICY_CONTRACTID "@gnome.org/projects/epiphany/epiphany-content-policy;1" + + +EPHY_CONTENT_POLICY_CLASSNAME +#define EPHY_CONTENT_POLICY_CLASSNAME "Epiphany Content Policy Class" + + +EPHY_CONTENT_POLICY_CID +#define EPHY_CONTENT_POLICY_CID \ +{ /* 6bb60b15-b7bd-4023-a19e-ab691bc3fb43 */ \ + 0x6bb60b15, \ + 0xb7bd, \ + 0x4023, \ + { 0xa1, 0x9e, 0xab, 0x69, 0x1b, 0xc3, 0xfb, 0x43 } \ +} + + +SetEmbed +nsresult +EphyEmbed *aEmbed + + +SetFindProperties +void +const char *aSearchString,PRBool aCaseSensitive + + +SetSelectionAttention +void +PRBool aAttention + + +Find +EphyEmbedFindResult +const char *aSearchString,PRBool aLinksOnly + + +FindAgain +EphyEmbedFindResult +PRBool aForward,PRBool aLinksOnly + + +ActivateLink +PRBool +GdkModifierType aMask + + +MOZILLA_TYPE_EMBED_FIND +#define MOZILLA_TYPE_EMBED_FIND (mozilla_embed_find_get_type ()) + + +MOZILLA_EMBED_FIND +#define MOZILLA_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MOZILLA_TYPE_EMBED_FIND, MozillaEmbedFind)) + + +MOZILLA_EMBED_FIND_CLASS +#define MOZILLA_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MOZILLA_TYPE_EMBED_FIND, MozillaEmbedFindClass)) + + +MOZILLA_IS_EMBED_FIND +#define MOZILLA_IS_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MOZILLA_TYPE_EMBED_FIND)) + + +MOZILLA_IS_EMBED_FIND_CLASS +#define MOZILLA_IS_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MOZILLA_TYPE_EMBED_FIND)) + + +MOZILLA_EMBED_FIND_GET_CLASS +#define MOZILLA_EMBED_FIND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MOZILLA_TYPE_EMBED_FIND, MozillaEmbedFindClass)) + + +MozillaEmbedFindClass + + +MozillaEmbedFind + + +MozillaEmbedFindPrivate + + +MozillaEmbedFind +struct _MozillaEmbedFind +{ + GObject parent_instance; + + /*< private >*/ + MozillaEmbedFindPrivate *priv; +}; + + +MozillaEmbedFindClass +struct _MozillaEmbedFindClass +{ + GObjectClass parent_class; +}; + + +mozilla_embed_find_get_type +GType +void + + +EPHY_REDIRECTLISTENER_CID +#define EPHY_REDIRECTLISTENER_CID \ +{ 0x6a9533c6, 0xf068, 0x4e63, { 0x82, 0x25, 0x5f, 0xeb, 0xa0, 0xb5, 0x4d, 0x6b } } + + +EPHY_REDIRECTLISTENER_CLASSNAME +#define EPHY_REDIRECTLISTENER_CLASSNAME "Epiphany Redirect Listener Class" + + +Init +nsresult +EphyHistory *aHistory + + +EPHY_ABOUT_MODULE_CID +#define EPHY_ABOUT_MODULE_CID \ +{ 0xa9aea13e, 0x21de, 0x4be8, \ + { 0xa0, 0x7e, 0xa0, 0x5f, 0x11, 0x65, 0x8c, 0x55 } } + + +EPHY_ABOUT_NETERROR_CONTRACTID +#define EPHY_ABOUT_NETERROR_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "neterror" + + +EPHY_ABOUT_NETERROR_CLASSNAME +#define EPHY_ABOUT_NETERROR_CLASSNAME "Epiphany about:neterror module" + + +EPHY_ABOUT_EPIPHANY_CONTRACTID +#define EPHY_ABOUT_EPIPHANY_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "epiphany" + + +EPHY_ABOUT_EPIPHANY_CLASSNAME +#define EPHY_ABOUT_EPIPHANY_CLASSNAME "Epiphany about:epiphany module" + + +EPHY_ABOUT_RECOVER_CONTRACTID +#define EPHY_ABOUT_RECOVER_CONTRACTID NS_ABOUT_MODULE_CONTRACTID_PREFIX "recover" + + +EPHY_ABOUT_RECOVER_CLASSNAME +#define EPHY_ABOUT_RECOVER_CLASSNAME "Epiphany about:recover module" + + +Redirect +nsresult +const nsACString&, nsIChannel** + + +ParseURL +nsresult +const char*, nsACString&, nsACString&, nsACString&, nsACString&, nsACString& + + +GetErrorMessage +nsresult +nsIURI*, const char*, char**, char**, char**, char**, char**, char** + + +CreateErrorPage +nsresult +nsIURI*, nsIChannel** + + +CreateRecoverPage +nsresult +nsIURI*, nsIChannel** + + +WritePage +nsresult +nsIURI*, nsIURI*, nsIURI*, const nsACString&, const char*, const char*, const char*, const char*, const char*, const char*, nsIChannel** + + +Write +nsresult +nsIOutputStream*, const char* + + +GTK_NSSSECURITYWARNINGDIALOGS_CLASSNAME +#define GTK_NSSSECURITYWARNINGDIALOGS_CLASSNAME "Epiphany Security Warning Dialogs Class" + + +GTK_NSSSECURITYWARNINGDIALOGS_CID +#define GTK_NSSSECURITYWARNINGDIALOGS_CID \ +{ \ + /* 1f5eac0a-d7e3-4f8e-b4d5-7240f7cba269 */ \ + 0x1f5eac0a, \ + 0xd7e3, \ + 0x4f8e, \ + { 0xb4, 0xd5, 0x72, 0x40, 0xf7, 0xcb, 0xa2, 0x69 } \ +} + + +DoDialog +void +nsIInterfaceRequestor *aContext,const char *aPrefName,GtkMessageType aType,GtkButtonsType aButtons,int aDefaultResponse,const char *aTitle,const char *aPrimary,const char *aSecondary,const char *aButtonText,PRBool *_retval + + +NS_FORWARD_NSIREQUEST +NS_DECL_ISUPPORTS +mChannel->)NS_FORWARD_NSICHANNEL (mChannel->)EphyWrappedChannel (nsIChannel *aChannel) : mChannel (aChannel) { }virtual ~EphyWrappedChannel () { }protected:nsCOMPtr mChannel;};class EphyRedirectChannel : public EphyWrappedChannel{public:EphyRedirectChannel (nsIChannel *aChannel) : EphyWrappedChannel (aChannel) { }virtual ~EphyRedirectChannel () { }NS_IMETHOD SetLoadFlags (nsLoadFlags aFlags + + +GECKO_PRINT_SERVICE_IID +#define GECKO_PRINT_SERVICE_IID \ +{ 0x6a71ff30, 0x7f4d, 0x4d91, \ + { 0xb7, 0x1a, 0xd5, 0xc9, 0x76, 0x4b, 0x34, 0xbe } } + + +GECKO_PRINT_SERVICE_CLASSNAME +#define GECKO_PRINT_SERVICE_CLASSNAME "Gecko Print Service" + + +PrintUnattended +nsresult +nsIDOMWindow *, nsIPrintSettings * + + +GECKO_SPELL_CHECK_ENGINE_IID +#define GECKO_SPELL_CHECK_ENGINE_IID \ +{ 0x26948b8b, 0xd136, 0x4a78, { 0xa9, 0xc5, 0x3a, 0x14, 0x58, 0x12, 0xb6, 0x49 } } + + +GECKO_SPELL_CHECK_ENGINE_CONTRACTID +#define GECKO_SPELL_CHECK_ENGINE_CONTRACTID "@mozilla.org/spellchecker/myspell;1" + + +GECKO_SPELL_CHECK_ENGINE_CLASSNAME +#define GECKO_SPELL_CHECK_ENGINE_CLASSNAME "Gecko Print Settings" + + +MOZILLA_TYPE_EMBED_EVENT +#define MOZILLA_TYPE_EMBED_EVENT (mozilla_embed_event_get_type ()) + + +MOZILLA_EMBED_EVENT +#define MOZILLA_EMBED_EVENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MOZILLA_TYPE_EMBED_EVENT, MozillaEmbedEvent)) + + +MOZILLA_EMBED_EVENT_CLASS +#define MOZILLA_EMBED_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MOZILLA_TYPE_EMBED_EVENT, MozillaEmbedEventClass)) + + +MOZILLA_IS_EMBED_EVENT +#define MOZILLA_IS_EMBED_EVENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MOZILLA_TYPE_EMBED_EVENT)) + + +MOZILLA_IS_EMBED_EVENT_CLASS +#define MOZILLA_IS_EMBED_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MOZILLA_TYPE_EMBED_EVENT)) + + +MOZILLA_EMBED_EVENT_GET_CLASS +#define MOZILLA_EMBED_EVENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MOZILLA_TYPE_EMBED_EVENT, MozillaEmbedEventClass)) + + +MozillaEmbedEventClass + + +MozillaEmbedEvent + + +MozillaEmbedEventPrivate + + +MozillaEmbedEventClass +struct _MozillaEmbedEventClass +{ + GObjectClass parent_class; +}; + + +MozillaEmbedEvent +struct _MozillaEmbedEvent +{ + GObject parent; + + /*< private >*/ + MozillaEmbedEventPrivate *priv; + + /*< private >*/ /* public to the embed implementation */ + guint button; + guint context; + guint modifier; + guint x; + guint y; + guint keycode; +}; + + +mozilla_embed_event_get_type +GType +void + + +mozilla_embed_event_new +MozillaEmbedEvent * +gpointer dom_event + + +mozilla_embed_event_set_property +void +MozillaEmbedEvent *event,const char *name,GValue *value + + +nsModuleComponentInfo +struct nsModuleComponentInfo; + + +EPHY_SIDEBAR_CLASSNAME +#define EPHY_SIDEBAR_CLASSNAME \ + "Epiphany's Sidebar Implementation" + + +EPHY_SIDEBAR_CID +#define EPHY_SIDEBAR_CID \ +{ /* {50f13159-f9b9-44b3-b18e-6ee5d85a202a} */ \ + 0x50f13159, \ + 0xf9b9, \ + 0x44b3, \ + {0xb1, 0x8e, 0x6e, 0xe5, 0xd8, 0x5a, 0x20, 0x2a} \ +} + + +MOZILLA_TYPE_X509_CERT +#define MOZILLA_TYPE_X509_CERT (mozilla_x509_cert_get_type ()) + + +MOZILLA_X509_CERT +#define MOZILLA_X509_CERT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOZILLA_TYPE_X509_CERT, MozillaX509Cert)) + + +MOZILLA_X509_CERT_CLASS +#define MOZILLA_X509_CERT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOZILLA_TYPE_X509_CERT, MozillaX509CertClass)) + + +MOZILLA_IS_X509_CERT +#define MOZILLA_IS_X509_CERT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOZILLA_TYPE_X509_CERT)) + + +MOZILLA_IS_X509_CERT_CLASS +#define MOZILLA_IS_X509_CERT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOZILLA_TYPE_X509_CERT)) + + +MOZILLA_X509_CERT_GET_CLASS +#define MOZILLA_X509_CERT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOZILLA_TYPE_X509_CERT, MozillaX509CertClass)) + + +MozillaX509Cert + + +MozillaX509CertPrivate + + +MozillaX509CertClass + + +MozillaX509Cert +struct _MozillaX509Cert +{ + GObject parent; + MozillaX509CertPrivate *priv; +}; + + +MozillaX509CertClass +struct _MozillaX509CertClass +{ + GObjectClass parent_class; +}; + + +mozilla_x509_cert_get_type +GType +void + + +mozilla_x509_cert_new +MozillaX509Cert * +nsIX509Cert *aMozCert + + +mozilla_x509_cert_get_mozilla_cert +nsresult +MozillaX509Cert *cert, nsIX509Cert **aCert + + +GECKO_FORMSIGNINGDIALOGS_CID +#define GECKO_FORMSIGNINGDIALOGS_CID \ +{ 0x4e42a43e, 0xfbc5, 0x40cc, { 0xbc, 0xbb, 0x8c, 0xbc, 0x4e, 0x21, 0x01, 0xeb } } + + +GECKO_FORMSIGNINGDIALOGS_CLASSNAME +#define GECKO_FORMSIGNINGDIALOGS_CLASSNAME "Gecko Form Signing Dialogs" + + +EPHY_PROMPT_SERVICE_IID +#define EPHY_PROMPT_SERVICE_IID \ +{ /* 6e8b90d4-78a6-41c5-98da-b1559a40d30d */ \ + 0x6e8b90d4, 0x78a6, 0x41c5, \ + { 0x98, 0xda, 0xb1, 0x55, 0x9a, 0x40, 0xd3, 0x0d } } + + +EPHY_PROMPT_SERVICE_CLASSNAME +#define EPHY_PROMPT_SERVICE_CLASSNAME "Epiphany Prompt Service" + + +WEBKIT_TYPE_EMBED_FIND +#define WEBKIT_TYPE_EMBED_FIND (webkit_embed_find_get_type ()) + + +WEBKIT_EMBED_FIND +#define WEBKIT_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED_FIND, WebKitEmbedFind)) + + +WEBKIT_EMBED_FIND_CLASS +#define WEBKIT_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED_FIND, WebKitEmbedFindClass)) + + +WEBKIT_IS_EMBED_FIND +#define WEBKIT_IS_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WEBKIT_TYPE_EMBED_FIND)) + + +WEBKIT_IS_EMBED_FIND_CLASS +#define WEBKIT_IS_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), WEBKIT_TYPE_EMBED_FIND)) + + +WEBKIT_EMBED_FIND_GET_CLASS +#define WEBKIT_EMBED_FIND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED_FIND, WebKitEmbedFindClass)) + + +WebKitEmbedFindClass + + +WebKitEmbedFind + + +WebKitEmbedFindPrivate + + +WebKitEmbedFind +struct _WebKitEmbedFind +{ + GObject parent_instance; + + /*< private >*/ + WebKitEmbedFindPrivate *priv; +}; + + +WebKitEmbedFindClass +struct _WebKitEmbedFindClass +{ + GObjectClass parent_class; +}; + + +webkit_embed_find_get_type +GType +void + + +EPHY_TYPE_MODULE +#define EPHY_TYPE_MODULE (ephy_module_get_type ()) + + +EPHY_MODULE +#define EPHY_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_MODULE, EphyModule)) + + +EPHY_MODULE_CLASS +#define EPHY_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_MODULE, EphyModuleClass)) + + +EPHY_IS_MODULE +#define EPHY_IS_MODULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_MODULE)) + + +EPHY_IS_MODULE_CLASS +#define EPHY_IS_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_MODULE)) + + +EPHY_MODULE_GET_CLASS +#define EPHY_MODULE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_MODULE, EphyModuleClass)) + + +EphyModule + + +ephy_module_get_type +GType +void + + +ephy_module_new +EphyModule * +const char *path,gboolean resident + + +ephy_module_get_path +const char * +EphyModule *module + + +ephy_module_new_object +GObject * +EphyModule *module + + +eel_strdup_strftime +char * +const char *format,struct tm *time_pieces + + +ephy_time_helpers_utf_friendly_time +char * +time_t date + + +EPHY_TYPE_NODE_DB +#define EPHY_TYPE_NODE_DB (ephy_node_db_get_type ()) + + +EPHY_NODE_DB +#define EPHY_NODE_DB(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_NODE_DB, EphyNodeDb)) + + +EPHY_NODE_DB_CLASS +#define EPHY_NODE_DB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_NODE_DB, EphyNodeDbClass)) + + +EPHY_IS_NODE_DB +#define EPHY_IS_NODE_DB(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_NODE_DB)) + + +EPHY_IS_NODE_DB_CLASS +#define EPHY_IS_NODE_DB_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NODE_DB)) + + +EPHY_NODE_DB_GET_CLASS +#define EPHY_NODE_DB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NODE_DB, EphyNodeDbClass)) + + +EphyNodeDb + + +EphyNodeDbPrivate + + +EphyNodeDb +struct _EphyNodeDb +{ + GObject parent; + + /*< private >*/ + EphyNodeDbPrivate *priv; +}; + + +ephy_node_db_get_type +GType +void + + +ephy_node_db_new +EphyNodeDb * +const char *name + + +ephy_node_db_load_from_file +gboolean +EphyNodeDb *db,const char *xml_file,const xmlChar *xml_root,const xmlChar *xml_version + + +ephy_node_db_write_to_xml_safe +int +EphyNodeDb *db,const xmlChar *filename,const xmlChar *root,const xmlChar *version,const xmlChar *comment,EphyNode *node, ... + + +ephy_node_db_get_name +const char * +EphyNodeDb *db + + +ephy_node_db_is_immutable +gboolean +EphyNodeDb *db + + +ephy_node_db_set_immutable +void +EphyNodeDb *db,gboolean immutable + + +ephy_node_db_get_node_from_id +EphyNode * +EphyNodeDb *db,guint id + + +ephy_object_idle_unref +void +gpointer object + + +g_timeout_add_seconds +#define g_timeout_add_seconds(I, F, D) g_timeout_add((I)*1000, (F), (D)) + + +EPHY_TYPE_PASSWORD_DIALOG +#define EPHY_TYPE_PASSWORD_DIALOG (ephy_password_dialog_get_type ()) + + +EPHY_PASSWORD_DIALOG +#define EPHY_PASSWORD_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PASSWORD_DIALOG, EphyPasswordDialog)) + + +EPHY_PASSWORD_DIALOG_CLASS +#define EPHY_PASSWORD_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_DIALOG, EphyPasswordDialogClass)) + + +EPHY_IS_PASSWORD_DIALOG +#define EPHY_IS_PASSWORD_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PASSWORD_DIALOG)) + + +EPHY_IS_PASSWORD_DIALOG_CLASS +#define EPHY_IS_PASSWORD_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PASSWORD_DIALOG)) + + +EPHY_PASSWORD_DIALOG_GET_CLASS +#define EPHY_PASSWORD_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_PASSWORD_DIALOG, EphyPasswordDialogClass)) + + +EphyPasswordDialog + + +EphyPasswordDialogPrivate + + +EphyPasswordDialogClass + + +EphyPasswordDialog +struct _EphyPasswordDialog +{ + GtkMessageDialog parent_instance; + + /*< private >*/ + EphyPasswordDialogPrivate *priv; +}; + + +EphyPasswordDialogClass +struct _EphyPasswordDialogClass +{ + GtkMessageDialogClass parent_class; +}; + + +EphyPasswordDialogFlags +typedef enum +{ + EPHY_PASSWORD_DIALOG_FLAGS_SHOW_USERNAME = 1 << 0, + EPHY_PASSWORD_DIALOG_FLAGS_EDIT_USERNAME = 1 << 1, + EPHY_PASSWORD_DIALOG_FLAGS_SHOW_DOMAIN = 1 << 2, + EPHY_PASSWORD_DIALOG_FLAGS_EDIT_DOMAIN = 1 << 3, + EPHY_PASSWORD_DIALOG_FLAGS_SHOW_PASSWORD = 1 << 4, + EPHY_PASSWORD_DIALOG_FLAGS_SHOW_NEW_PASSWORD = 1 << 5, + EPHY_PASSWORD_DIALOG_FLAGS_SHOW_QUALITY_METER = 1 << 6, + EPHY_PASSWORD_DIALOG_FLAGS_SHOW_REMEMBER = 1 << 7, +} EphyPasswordDialogFlags; + + +EPHY_PASSWORD_DIALOG_FLAGS_DEFAULT +#define EPHY_PASSWORD_DIALOG_FLAGS_DEFAULT 0 + + +ephy_password_dialog_get_type +GType +void + + +ephy_password_dialog_new +GtkWidget * +GtkWidget *parent,const char *title,EphyPasswordDialogFlags flags + + +ephy_password_dialog_set_remember +void +EphyPasswordDialog *dialog,GnomePasswordDialogRemember remember + + +ephy_password_dialog_get_remember +GnomePasswordDialogRemember +EphyPasswordDialog *dialog + + +ephy_password_dialog_set_label +void +EphyPasswordDialog *dialog,const char *markup + + +ephy_password_dialog_get_username_entry +GtkWidget * +EphyPasswordDialog *dialog + + +ephy_password_dialog_get_username +const char * +EphyPasswordDialog *dialog + + +ephy_password_dialog_set_username +void +EphyPasswordDialog *dialog,const char *text + + +ephy_password_dialog_get_domain +const char * +EphyPasswordDialog *dialog + + +ephy_password_dialog_set_domain +void +EphyPasswordDialog *dialog,const char *text + + +ephy_password_dialog_get_password +const char * +EphyPasswordDialog *dialog + + +ephy_password_dialog_set_password +void +EphyPasswordDialog *dialog,const char *text + + +ephy_password_dialog_get_new_password +const char * +EphyPasswordDialog *dialog + + +EPHY_TYPE_SHLIB_LOADER +#define EPHY_TYPE_SHLIB_LOADER (ephy_shlib_loader_get_type ()) + + +EPHY_SHLIB_LOADER +#define EPHY_SHLIB_LOADER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_SHLIB_LOADER, EphyShlibLoader)) + + +EPHY_SHLIB_LOADER_CLASS +#define EPHY_SHLIB_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_SHLIB_LOADER, EphyShlibLoaderClass)) + + +EPHY_IS_SHLIB_LOADER +#define EPHY_IS_SHLIB_LOADER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_SHLIB_LOADER)) + + +EPHY_IS_SHLIB_LOADER_CLASS +#define EPHY_IS_SHLIB_LOADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SHLIB_LOADER)) + + +EPHY_SHLIB_LOADER_GET_CLASS +#define EPHY_SHLIB_LOADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SHLIB_LOADER, EphyShlibLoaderClass)) + + +EphyShlibLoader + + +EphyShlibLoaderPrivate + + +EphyShlibLoaderClass + + +EphyShlibLoaderClass +struct _EphyShlibLoaderClass +{ + GObjectClass parent_class; +}; + + +EphyShlibLoader +struct _EphyShlibLoader +{ + GObject parent_instance; + + /*< private >*/ + EphyShlibLoaderPrivate *priv; +}; + + +ephy_shlib_loader_get_type +GType +void + + +ephy_signal_accumulator_object +gboolean +GSignalInvocationHint *ihint,GValue *return_accu,const GValue *handler_return,gpointer accu_data + + +ephy_signal_accumulator_string +gboolean +GSignalInvocationHint *ihint,GValue *return_accu,const GValue *handler_return,gpointer accu_data + + +EPHY_TYPE_SPELL_CHECK +#define EPHY_TYPE_SPELL_CHECK (ephy_spell_check_get_type ()) + + +EPHY_SPELL_CHECK +#define EPHY_SPELL_CHECK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_SPELL_CHECK, EphySpellCheck)) + + +EPHY_SPELL_CHECK_CLASS +#define EPHY_SPELL_CHECK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EPHY_TYPE_SPELL_CHECK, EphySpellCheckClass)) + + +EPHY_IS_SPELL_CHECK +#define EPHY_IS_SPELL_CHECK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_SPELL_CHECK)) + + +EPHY_IS_SPELL_CHECK_CLASS +#define EPHY_IS_SPELL_CHECK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SPELL_CHECK)) + + +EPHY_SPELL_CHECK_GET_CLASS +#define EPHY_SPELL_CHECK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SPELL_CHECK, EphySpellCheckClass)) + + +EphySpellCheck + + +EphySpellCheckPrivate + + +EphySpellCheckClass + + +EphySpellCheck +struct _EphySpellCheck +{ + GObject parent_instance; + + /*< private >*/ + EphySpellCheckPrivate *priv; +}; + + +EphySpellCheckClass +struct _EphySpellCheckClass +{ + GObjectClass parent_class; +}; + + +ephy_spell_check_get_type +GType +void + + +ephy_spell_check_get_default +EphySpellCheck * +void + + +ephy_spell_check_check_word +gboolean +EphySpellCheck *speller,const char *word,gssize len,gboolean *correct + + +ephy_spell_check_get_suggestions +char ** +EphySpellCheck *speller,const char *word,gssize len,gsize *count + + +ephy_spell_check_free_suggestions +void +EphySpellCheck *speller,char **suggestions + + +ephy_spell_check_set_language +gboolean +EphySpellCheck *speller,const char *lang + + +ephy_spell_check_get_language +char * +EphySpellCheck *speller + + +ephy_print_utils_page_setup_new_from_file +GtkPageSetup * +const gchar *file_name,GError **error + + +ephy_print_utils_page_setup_new_from_key_file +GtkPageSetup * +GKeyFile *key_file,GError **error + + +ephy_print_utils_page_setup_to_file +gboolean +GtkPageSetup *setup,const char *file_name,GError **error + + +ephy_print_utils_page_setup_to_key_file +gboolean +GtkPageSetup *setup,GKeyFile *key_file,GError **error + + +EPHY_TYPE_LOADER +#define EPHY_TYPE_LOADER (ephy_loader_get_type ()) + + +EPHY_LOADER +#define EPHY_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_TYPE_LOADER, EphyLoader)) + + +EPHY_LOADER_IFACE +#define EPHY_LOADER_IFACE(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_TYPE_LOADER, EphyLoaderIface)) + + +EPHY_IS_LOADER +#define EPHY_IS_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_TYPE_LOADER)) + + +EPHY_IS_LOADER_IFACE +#define EPHY_IS_LOADER_IFACE(iface) (G_TYPE_CHECK_CLASS_TYPE ((iface), EPHY_TYPE_LOADER)) + + +EPHY_LOADER_GET_IFACE +#define EPHY_LOADER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_LOADER, EphyLoaderIface)) + + +EphyLoader + + +EphyLoaderIface + + +EphyLoaderIface +struct _EphyLoaderIface +{ + GTypeInterface base_iface; + + /* Identifier */ + const char *type; + + /* Methods */ + GObject * (* get_object) (EphyLoader *loader, + GKeyFile *keyfile); + void (* release_object) (EphyLoader *loader, + GObject *object); +}; + + +ephy_loader_get_type +GType +void + + +ephy_loader_type +const char * +const EphyLoader *loader + + +ephy_loader_get_object +GObject * +EphyLoader *loader,GKeyFile *keyfile + + +ephy_loader_release_object +void +EphyLoader *loader,GObject *object + + +EPHY_TYPE_ICON_ENTRY +#define EPHY_TYPE_ICON_ENTRY (ephy_icon_entry_get_type()) + + +EPHY_ICON_ENTRY +#define EPHY_ICON_ENTRY(object) (G_TYPE_CHECK_INSTANCE_CAST((object), EPHY_TYPE_ICON_ENTRY, EphyIconEntry)) + + +EPHY_ICON_ENTRY_CLASS +#define EPHY_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), EPHY_TYPE_ICON_ENTRY, EphyIconEntryClass)) + + +EPHY_IS_ICON_ENTRY +#define EPHY_IS_ICON_ENTRY(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), EPHY_TYPE_ICON_ENTRY)) + + +EPHY_IS_ICON_ENTRY_CLASS +#define EPHY_IS_ICON_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), EPHY_TYPE_ICON_ENTRY)) + + +EPHY_ICON_ENTRY_GET_CLASS +#define EPHY_ICON_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_ICON_ENTRY, EphyIconEntryClass)) + + +EphyIconEntryClass + + +EphyIconEntry + + +EphyIconEntryPrivate + + +EphyIconEntryClass +struct _EphyIconEntryClass +{ + GtkBinClass parent_class; +}; + + +EphyIconEntry +struct _EphyIconEntry +{ + GtkBin parent_object; + + /*< public >*/ + GtkWidget *entry; + + /*< private >*/ + EphyIconEntryPrivate *priv; +}; + + +ephy_icon_entry_get_type +GType +void + + +ephy_icon_entry_new +GtkWidget * +void + + +ephy_icon_entry_pack_widget +void +EphyIconEntry *entry,GtkWidget *widget,gboolean start + + +ephy_icon_entry_get_entry +GtkWidget * +EphyIconEntry *entry + + +EPHY_TYPE_SPINNER_TOOL_ITEM +#define EPHY_TYPE_SPINNER_TOOL_ITEM (ephy_spinner_tool_item_get_type ()) + + +EPHY_SPINNER_TOOL_ITEM +#define EPHY_SPINNER_TOOL_ITEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_SPINNER_TOOL_ITEM, EphySpinnerToolItem)) + + +EPHY_SPINNER_TOOL_ITEM_CLASS +#define EPHY_SPINNER_TOOL_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_SPINNER_TOOL_ITEM, EphySpinnerToolItemClass)) + + +EPHY_IS_SPINNER_TOOL_ITEM +#define EPHY_IS_SPINNER_TOOL_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_SPINNER_TOOL_ITEM)) + + +EPHY_IS_SPINNER_TOOL_ITEM_CLASS +#define EPHY_IS_SPINNER_TOOL_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SPINNER_TOOL_ITEM)) + + +EPHY_SPINNER_TOOL_ITEM_GET_CLASS +#define EPHY_SPINNER_TOOL_ITEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SPINNER_TOOL_ITEM, EphySpinnerToolItemClass)) + + +EphySpinnerToolItem + + +EphySpinnerToolItemClass + + +EphySpinnerToolItemDetails + + +EphySpinnerToolItem +struct _EphySpinnerToolItem +{ + GtkToolItem parent; + + /*< private >*/ + EphySpinnerToolItemDetails *details; +}; + + +EphySpinnerToolItemClass +struct _EphySpinnerToolItemClass +{ + GtkToolItemClass parent_class; +}; + + +ephy_spinner_tool_item_get_type +GType +void + + +ephy_spinner_tool_item_new +GtkToolItem * +void + + +ephy_spinner_tool_item_set_spinning +void +EphySpinnerToolItem *item,gboolean spinning + + +EPHY_TYPE_NODE_SIGNAL_TYPE +#define EPHY_TYPE_NODE_SIGNAL_TYPE ephy_node_signal_type_get_type() + + +ephy_node_signal_type_get_type +GType +void + + +EPHY_TYPE_PASSWORD_DIALOG_FLAGS +#define EPHY_TYPE_PASSWORD_DIALOG_FLAGS ephy_password_dialog_flags_get_type() + + +ephy_password_dialog_flags_get_type +GType +void + + +EPHY_TYPE_STATE_WINDOW_FLAGS +#define EPHY_TYPE_STATE_WINDOW_FLAGS ephy_state_window_flags_get_type() + + +ephy_state_window_flags_get_type +GType +void + + +EGG_TYPE_TB_MODEL_FLAGS +#define EGG_TYPE_TB_MODEL_FLAGS egg_tb_model_flags_get_type() + + +egg_tb_model_flags_get_type +GType +void + + +EGG_TYPE_TB_MODEL_NAME_FLAGS +#define EGG_TYPE_TB_MODEL_NAME_FLAGS egg_tb_model_name_flags_get_type() + + +egg_tb_model_name_flags_get_type +GType +void + + +EPHY_TYPE_URI_CHECK_TYPE +#define EPHY_TYPE_URI_CHECK_TYPE ad_uri_check_type_get_type() + + +ad_uri_check_type_get_type +GType +void + + +EPHY_TYPE_EMBED_NET_STATE +#define EPHY_TYPE_EMBED_NET_STATE ephy_embed_net_state_get_type() + + +ephy_embed_net_state_get_type +GType +void + + +EPHY_TYPE_EMBED_CHROME +#define EPHY_TYPE_EMBED_CHROME ephy_embed_chrome_get_type() + + +ephy_embed_chrome_get_type +GType +void + + +EPHY_TYPE_EMBED_LOAD_FLAGS +#define EPHY_TYPE_EMBED_LOAD_FLAGS ephy_embed_load_flags_get_type() + + +ephy_embed_load_flags_get_type +GType +void + + +EPHY_TYPE_EMBED_PRINT_PREVIEW_NAV_TYPE +#define EPHY_TYPE_EMBED_PRINT_PREVIEW_NAV_TYPE ephy_embed_print_preview_nav_type_get_type() + + +ephy_embed_print_preview_nav_type_get_type +GType +void + + +EPHY_TYPE_EMBED_SECURITY_LEVEL +#define EPHY_TYPE_EMBED_SECURITY_LEVEL ephy_embed_security_level_get_type() + + +ephy_embed_security_level_get_type +GType +void + + +EPHY_TYPE_EMBED_DOCUMENT_TYPE +#define EPHY_TYPE_EMBED_DOCUMENT_TYPE ephy_embed_document_type_get_type() + + +ephy_embed_document_type_get_type +GType +void + + +EPHY_TYPE_EMBED_NAVIGATION_FLAGS +#define EPHY_TYPE_EMBED_NAVIGATION_FLAGS ephy_embed_navigation_flags_get_type() + + +ephy_embed_navigation_flags_get_type +GType +void + + +EPHY_TYPE_EMBED_ADDRESS_EXPIRE +#define EPHY_TYPE_EMBED_ADDRESS_EXPIRE ephy_embed_address_expire_get_type() + + +ephy_embed_address_expire_get_type +GType +void + + +EPHY_TYPE_EMBED_EVENT_CONTEXT +#define EPHY_TYPE_EMBED_EVENT_CONTEXT ephy_embed_event_context_get_type() + + +ephy_embed_event_context_get_type +GType +void + + +EPHY_TYPE_EMBED_PERSIST_FLAGS +#define EPHY_TYPE_EMBED_PERSIST_FLAGS ephy_embed_persist_flags_get_type() + + +ephy_embed_persist_flags_get_type +GType +void + + +EPHY_TYPE_PERMISSION +#define EPHY_TYPE_PERMISSION ephy_permission_get_type() + + +ephy_permission_get_type +GType +void + + +EPHY_TYPE_DBUS_BUS +#define EPHY_TYPE_DBUS_BUS ephy_dbus_bus_get_type() + + +ephy_dbus_bus_get_type +GType +void + + +EPHY_TYPE_LINK_FLAGS +#define EPHY_TYPE_LINK_FLAGS ephy_link_flags_get_type() + + +ephy_link_flags_get_type +GType +void + + +EPHY_TYPE_SESSION_COMMAND +#define EPHY_TYPE_SESSION_COMMAND ephy_session_command_get_type() + + +ephy_session_command_get_type +GType +void + + +EPHY_TYPE_NEW_TAB_FLAGS +#define EPHY_TYPE_NEW_TAB_FLAGS ephy_new_tab_flags_get_type() + + +ephy_new_tab_flags_get_type +GType +void + + +EPHY_TYPE_NAVIGATION_DIRECTION +#define EPHY_TYPE_NAVIGATION_DIRECTION ephy_navigation_direction_get_type() + + +ephy_navigation_direction_get_type +GType +void + + +org_gnome_Epiphany_load_session +gboolean +DBusGProxy *proxy, const char * IN_SessionFilename, const guint IN_Timestamp, GError **error){return dbus_g_proxy_call (proxy, "loadSession", error, G_TYPE_STRING, IN_SessionFilename, G_TYPE_UINT, IN_Timestamp, G_TYPE_INVALID, G_TYPE_INVALID + + +org_gnome_Epiphany_load_session_reply +void +DBusGProxy *proxy, GError *error, gpointer userdata + + +org_gnome_Epiphany_load_session_async +DBusGProxyCall * +DBusGProxy *proxy, const char * IN_SessionFilename, const guint IN_Timestamp, org_gnome_Epiphany_load_session_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 + + +dbus_g_proxy_begin_call +return +proxy, "loadSession", org_gnome_Epiphany_load_session_async_callback, stuff, g_free, G_TYPE_STRING, IN_SessionFilename, G_TYPE_UINT, IN_Timestamp, G_TYPE_INVALID + + +org_gnome_Epiphany_load_ur_ilist +gboolean +DBusGProxy *proxy, const char ** IN_URIs, const char * IN_Options, const guint IN_Timestamp, GError **error){return dbus_g_proxy_call (proxy, "loadURIList", error, G_TYPE_STRV, IN_URIs, G_TYPE_STRING, IN_Options, G_TYPE_UINT, IN_Timestamp, G_TYPE_INVALID, G_TYPE_INVALID + + +org_gnome_Epiphany_load_ur_ilist_reply +void +DBusGProxy *proxy, GError *error, gpointer userdata + + +org_gnome_Epiphany_load_ur_ilist_async +DBusGProxyCall * +DBusGProxy *proxy, const char ** IN_URIs, const char * IN_Options, const guint IN_Timestamp, org_gnome_Epiphany_load_ur_ilist_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 + + +dbus_g_proxy_begin_call +return +proxy, "loadURIList", org_gnome_Epiphany_load_ur_ilist_async_callback, stuff, g_free, G_TYPE_STRV, IN_URIs, G_TYPE_STRING, IN_Options, G_TYPE_UINT, IN_Timestamp, G_TYPE_INVALID + + +org_gnome_Epiphany_open_bookmarks_editor +gboolean +DBusGProxy *proxy, const guint IN_Timestamp, GError **error){return dbus_g_proxy_call (proxy, "openBookmarksEditor", error, G_TYPE_UINT, IN_Timestamp, G_TYPE_INVALID, G_TYPE_INVALID + + +org_gnome_Epiphany_open_bookmarks_editor_reply +void +DBusGProxy *proxy, GError *error, gpointer userdata + + +org_gnome_Epiphany_open_bookmarks_editor_async +DBusGProxyCall * +DBusGProxy *proxy, const guint IN_Timestamp, org_gnome_Epiphany_open_bookmarks_editor_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 + + +dbus_g_proxy_begin_call +return +proxy, "openBookmarksEditor", org_gnome_Epiphany_open_bookmarks_editor_async_callback, stuff, g_free, G_TYPE_UINT, IN_Timestamp, G_TYPE_INVALID + + +g_marshal_value_peek_boolean +#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) + + +g_marshal_value_peek_char +#define g_marshal_value_peek_char(v) g_value_get_char (v) + + +g_marshal_value_peek_uchar +#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) + + +g_marshal_value_peek_int +#define g_marshal_value_peek_int(v) g_value_get_int (v) + + +g_marshal_value_peek_uint +#define g_marshal_value_peek_uint(v) g_value_get_uint (v) + + +g_marshal_value_peek_long +#define g_marshal_value_peek_long(v) g_value_get_long (v) + + +g_marshal_value_peek_ulong +#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) + + +g_marshal_value_peek_int64 +#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) + + +g_marshal_value_peek_uint64 +#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) + + +g_marshal_value_peek_enum +#define g_marshal_value_peek_enum(v) g_value_get_enum (v) + + +g_marshal_value_peek_flags +#define g_marshal_value_peek_flags(v) g_value_get_flags (v) + + +g_marshal_value_peek_float +#define g_marshal_value_peek_float(v) g_value_get_float (v) + + +g_marshal_value_peek_double +#define g_marshal_value_peek_double(v) g_value_get_double (v) + + +g_marshal_value_peek_string +#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) + + +g_marshal_value_peek_param +#define g_marshal_value_peek_param(v) g_value_get_param (v) + + +g_marshal_value_peek_boxed +#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) + + +g_marshal_value_peek_pointer +#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) + + +g_marshal_value_peek_object +#define g_marshal_value_peek_object(v) g_value_get_object (v) + + +g_marshal_value_peek_boolean +#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int + + +g_marshal_value_peek_char +#define g_marshal_value_peek_char(v) (v)->data[0].v_int + + +g_marshal_value_peek_uchar +#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint + + +g_marshal_value_peek_int +#define g_marshal_value_peek_int(v) (v)->data[0].v_int + + +g_marshal_value_peek_uint +#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint + + +g_marshal_value_peek_long +#define g_marshal_value_peek_long(v) (v)->data[0].v_long + + +g_marshal_value_peek_ulong +#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong + + +g_marshal_value_peek_int64 +#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 + + +g_marshal_value_peek_uint64 +#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 + + +g_marshal_value_peek_enum +#define g_marshal_value_peek_enum(v) (v)->data[0].v_long + + +g_marshal_value_peek_flags +#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong + + +g_marshal_value_peek_float +#define g_marshal_value_peek_float(v) (v)->data[0].v_float + + +g_marshal_value_peek_double +#define g_marshal_value_peek_double(v) (v)->data[0].v_double + + +g_marshal_value_peek_string +#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer + + +g_marshal_value_peek_param +#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer + + +g_marshal_value_peek_boxed +#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer + + +g_marshal_value_peek_pointer +#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer + + +g_marshal_value_peek_object +#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer + + +dbus_glib_marshal_ephy_activation_BOOLEAN__STRING_UINT_POINTER +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +dbus_glib_marshal_ephy_activation_BOOLEAN__STRING_UINT_POINTER +void +GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_UINT_POINTER) (gpointer data1,gpointer arg_1,guint arg_2,gpointer arg_3,gpointer data2 + + +dbus_glib_marshal_ephy_activation_BOOLEAN__BOXED_STRING_UINT_POINTER +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +dbus_glib_marshal_ephy_activation_BOOLEAN__BOXED_STRING_UINT_POINTER +void +GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_STRING_UINT_POINTER) (gpointer data1,gpointer arg_1,gpointer arg_2,guint arg_3,gpointer arg_4,gpointer data2 + + +dbus_glib_marshal_ephy_activation_BOOLEAN__UINT_POINTER +void +GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data + + +dbus_glib_marshal_ephy_activation_BOOLEAN__UINT_POINTER +void +GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__UINT_POINTER) (gpointer data1,guint arg_1,gpointer arg_2,gpointer data2 + + +EPHY_TYPE_BOOKMARK_PROPERTY +#define EPHY_TYPE_BOOKMARK_PROPERTY ephy_bookmark_property_get_type() + + +ephy_bookmark_property_get_type +GType +void + --- epiphany-browser-2.21.4.orig/doc/reference/sgml.stamp +++ epiphany-browser-2.21.4/doc/reference/sgml.stamp @@ -0,0 +1 @@ +timestamp \ No newline at end of file --- epiphany-browser-2.21.4.orig/doc/reference/epiphany-unused.txt +++ epiphany-browser-2.21.4/doc/reference/epiphany-unused.txt @@ -0,0 +1,836 @@ +Activate +ActivateLink +AdUriCheckType +AppendToStream +ApplyChromeMask +AttachListeners +Cancel +CertsManagerDialog +CertsManagerDialogClass +CertsManagerDialogPrivate +ChildFocusIn +ChildFocusOut +CloseStream +ContentFinishedLoading +ContentStateChange +ContextMenu +ConvertUTF16toUTF8 +CreateErrorPage +CreateRecoverPage +CreateWindow +DBUS_API_SUBJECT_TO_CHANGE +Destroy +DestroyJob +DetachListeners +DoDialog +EGG_TYPE_TB_MODEL_FLAGS +EGG_TYPE_TB_MODEL_NAME_FLAGS +EPHY_ABOUT_EPIPHANY_CLASSNAME +EPHY_ABOUT_EPIPHANY_CONTRACTID +EPHY_ABOUT_MODULE_CID +EPHY_ABOUT_NETERROR_CLASSNAME +EPHY_ABOUT_NETERROR_CONTRACTID +EPHY_ABOUT_RECOVER_CLASSNAME +EPHY_ABOUT_RECOVER_CONTRACTID +EPHY_ADBLOCK +EPHY_ADBLOCK_GET_IFACE +EPHY_ADBLOCK_IFACE +EPHY_ADBLOCK_MANAGER +EPHY_ADBLOCK_MANAGER_CLASS +EPHY_ADBLOCK_MANAGER_GET_CLASS +EPHY_BASE_EMBED +EPHY_BASE_EMBED_CLASS +EPHY_BASE_EMBED_GET_CLASS +EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE +EPHY_BOOKMARK_ACTION_NAME_BUFFER_SIZE +EPHY_BOOKMARK_ACTION_NAME_FORMAT +EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG +EPHY_BOOKMARK_ACTION_NAME_PRINTF +EPHY_BOOKMARK_ACTION_NAME_STRDUP_PRINTF +EPHY_BOOKMARK_FACTORY_ACTION +EPHY_BOOKMARK_FACTORY_ACTION_CLASS +EPHY_BOOKMARK_FACTORY_ACTION_GET_CLASS +EPHY_CERTIFICATE_MANAGER +EPHY_CERTIFICATE_MANAGER_GET_IFACE +EPHY_CERTIFICATE_MANAGER_IFACE +EPHY_CERTS_MANAGER_DIALOG +EPHY_CERTS_MANAGER_DIALOG_CLASS +EPHY_CERTS_MANAGER_DIALOG_GET_CLASS +EPHY_COOKIEPROMPTSERVICE_CID +EPHY_COOKIEPROMPTSERVICE_CLASSNAME +EPHY_COOKIEPROMPTSERVICE_CONTRACTID +EPHY_DBUS +EPHY_DBUS_CLASS +EPHY_DBUS_ERROR_QUARK +EPHY_DBUS_GET_CLASS +EPHY_EMBED_CHROME_ALL +EPHY_EMBED_CONTAINER +EPHY_EMBED_CONTAINER_GET_IFACE +EPHY_EMBED_CONTAINER_IFACE +EPHY_EMBED_FIND +EPHY_EMBED_FIND_GET_IFACE +EPHY_EMBED_FIND_IFACE +EPHY_FIND_TOOLBAR +EPHY_FIND_TOOLBAR_CLASS +EPHY_FIND_TOOLBAR_GET_CLASS +EPHY_HOME_ACTION +EPHY_HOME_ACTION_CLASS +EPHY_HOME_ACTION_GET_CLASS +EPHY_ICON_ENTRY +EPHY_ICON_ENTRY_CLASS +EPHY_ICON_ENTRY_GET_CLASS +EPHY_IS_ADBLOCK +EPHY_IS_ADBLOCK_IFACE +EPHY_IS_ADBLOCK_MANAGER +EPHY_IS_ADBLOCK_MANAGER_CLASS +EPHY_IS_BASE_EMBED +EPHY_IS_BASE_EMBED_CLASS +EPHY_IS_BOOKMARK_FACTORY_ACTION +EPHY_IS_BOOKMARK_FACTORY_ACTION_CLASS +EPHY_IS_CERTIFICATE_MANAGER +EPHY_IS_CERTIFICATE_MANAGER_IFACE +EPHY_IS_CERTS_MANAGER_DIALOG +EPHY_IS_CERTS_MANAGER_DIALOG_CLASS +EPHY_IS_DBUS +EPHY_IS_DBUS_CLASS +EPHY_IS_EMBED_CONTAINER +EPHY_IS_EMBED_CONTAINER_IFACE +EPHY_IS_EMBED_FIND +EPHY_IS_EMBED_FIND_IFACE +EPHY_IS_FIND_TOOLBAR +EPHY_IS_FIND_TOOLBAR_CLASS +EPHY_IS_HOME_ACTION +EPHY_IS_HOME_ACTION_CLASS +EPHY_IS_ICON_ENTRY +EPHY_IS_ICON_ENTRY_CLASS +EPHY_IS_LINK_ACTION +EPHY_IS_LINK_ACTION_CLASS +EPHY_IS_LINK_ACTION_GROUP +EPHY_IS_LINK_ACTION_GROUP_CLASS +EPHY_IS_LOADER +EPHY_IS_LOADER_IFACE +EPHY_IS_LOCKDOWN +EPHY_IS_LOCKDOWN_CLASS +EPHY_IS_MODULE +EPHY_IS_MODULE_CLASS +EPHY_IS_NET_MONITOR +EPHY_IS_NET_MONITOR_CLASS +EPHY_IS_PASSWORD_DIALOG +EPHY_IS_PASSWORD_DIALOG_CLASS +EPHY_IS_PYTHON_EXTENSION +EPHY_IS_PYTHON_EXTENSION_CLASS +EPHY_IS_PYTHON_LOADER +EPHY_IS_PYTHON_LOADER_CLASS +EPHY_IS_RELATED_ACTION +EPHY_IS_RELATED_ACTION_CLASS +EPHY_IS_SHLIB_LOADER +EPHY_IS_SHLIB_LOADER_CLASS +EPHY_IS_SPELL_CHECK +EPHY_IS_SPELL_CHECK_CLASS +EPHY_IS_SPINNER_TOOL_ITEM +EPHY_IS_SPINNER_TOOL_ITEM_CLASS +EPHY_IS_TOOLBAR_EDITOR +EPHY_IS_TOOLBAR_EDITOR_CLASS +EPHY_IS_TOPICS_ENTRY +EPHY_IS_TOPICS_ENTRY_CLASS +EPHY_IS_TOPICS_PALETTE +EPHY_IS_TOPICS_PALETTE_CLASS +EPHY_IS_TOPIC_FACTORY_ACTION +EPHY_IS_TOPIC_FACTORY_ACTION_CLASS +EPHY_IS_X509_CERT +EPHY_IS_X509_CERT_IFACE +EPHY_LINK_ACTION +EPHY_LINK_ACTION_CLASS +EPHY_LINK_ACTION_GET_CLASS +EPHY_LINK_ACTION_GROUP +EPHY_LINK_ACTION_GROUP_CLASS +EPHY_LINK_ACTION_GROUP_GET_CLASS +EPHY_LOADER +EPHY_LOADER_GET_IFACE +EPHY_LOADER_IFACE +EPHY_LOCKDOWN +EPHY_LOCKDOWN_CLASS +EPHY_LOCKDOWN_GET_CLASS +EPHY_MODULE +EPHY_MODULE_CLASS +EPHY_MODULE_GET_CLASS +EPHY_NET_MONITOR +EPHY_NET_MONITOR_CLASS +EPHY_NET_MONITOR_GET_CLASS +EPHY_OPEN_TABS_ACTION_NAME_BUFFER_SIZE +EPHY_OPEN_TABS_ACTION_NAME_FORMAT +EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG +EPHY_OPEN_TABS_ACTION_NAME_PRINTF +EPHY_OPEN_TABS_ACTION_NAME_STRDUP_PRINTF +EPHY_PASSWORD_DIALOG +EPHY_PASSWORD_DIALOG_CLASS +EPHY_PASSWORD_DIALOG_FLAGS_DEFAULT +EPHY_PASSWORD_DIALOG_GET_CLASS +EPHY_PROMPT_SERVICE_CLASSNAME +EPHY_PROMPT_SERVICE_IID +EPHY_PYTHON_EXTENSION +EPHY_PYTHON_EXTENSION_CLASS +EPHY_PYTHON_EXTENSION_GET_CLASS +EPHY_PYTHON_LOADER +EPHY_PYTHON_LOADER_CLASS +EPHY_PYTHON_LOADER_GET_CLASS +EPHY_REDIRECTLISTENER_CID +EPHY_REDIRECTLISTENER_CLASSNAME +EPHY_RELATED_ACTION +EPHY_RELATED_ACTION_CLASS +EPHY_RELATED_ACTION_GET_CLASS +EPHY_SHLIB_LOADER +EPHY_SHLIB_LOADER_CLASS +EPHY_SHLIB_LOADER_GET_CLASS +EPHY_SIDEBAR_CID +EPHY_SIDEBAR_CLASSNAME +EPHY_SPELL_CHECK +EPHY_SPELL_CHECK_CLASS +EPHY_SPELL_CHECK_GET_CLASS +EPHY_SPINNER_TOOL_ITEM +EPHY_SPINNER_TOOL_ITEM_CLASS +EPHY_SPINNER_TOOL_ITEM_GET_CLASS +EPHY_TOOLBAR_EDITOR +EPHY_TOOLBAR_EDITOR_CLASS +EPHY_TOOLBAR_EDITOR_GET_CLASS +EPHY_TOPICS_ENTRY +EPHY_TOPICS_ENTRY_CLASS +EPHY_TOPICS_ENTRY_GET_CLASS +EPHY_TOPICS_PALETTE +EPHY_TOPICS_PALETTE_CLASS +EPHY_TOPICS_PALETTE_GET_CLASS +EPHY_TOPIC_ACTION_NAME_BUFFER_SIZE +EPHY_TOPIC_ACTION_NAME_FORMAT +EPHY_TOPIC_ACTION_NAME_FORMAT_ARG +EPHY_TOPIC_ACTION_NAME_PRINTF +EPHY_TOPIC_ACTION_NAME_STRDUP_PRINTF +EPHY_TOPIC_FACTORY_ACTION +EPHY_TOPIC_FACTORY_ACTION_CLASS +EPHY_TOPIC_FACTORY_ACTION_GET_CLASS +EPHY_TYPE_ADBLOCK +EPHY_TYPE_ADBLOCK_MANAGER +EPHY_TYPE_BASE_EMBED +EPHY_TYPE_BOOKMARK_FACTORY_ACTION +EPHY_TYPE_BOOKMARK_PROPERTY +EPHY_TYPE_CERTIFICATE_MANAGER +EPHY_TYPE_CERTS_MANAGER_DIALOG +EPHY_TYPE_DBUS +EPHY_TYPE_DBUS_BUS +EPHY_TYPE_EMBED_ADDRESS_EXPIRE +EPHY_TYPE_EMBED_CHROME +EPHY_TYPE_EMBED_CONTAINER +EPHY_TYPE_EMBED_DOCUMENT_TYPE +EPHY_TYPE_EMBED_EVENT_CONTEXT +EPHY_TYPE_EMBED_FIND +EPHY_TYPE_EMBED_LOAD_FLAGS +EPHY_TYPE_EMBED_NAVIGATION_FLAGS +EPHY_TYPE_EMBED_NET_STATE +EPHY_TYPE_EMBED_PERSIST_FLAGS +EPHY_TYPE_EMBED_PRINT_PREVIEW_NAV_TYPE +EPHY_TYPE_EMBED_SECURITY_LEVEL +EPHY_TYPE_FIND_TOOLBAR +EPHY_TYPE_HOME_ACTION +EPHY_TYPE_ICON_ENTRY +EPHY_TYPE_LINK_ACTION +EPHY_TYPE_LINK_ACTION_GROUP +EPHY_TYPE_LINK_FLAGS +EPHY_TYPE_LOADER +EPHY_TYPE_LOCKDOWN +EPHY_TYPE_MODULE +EPHY_TYPE_NAVIGATION_DIRECTION +EPHY_TYPE_NET_MONITOR +EPHY_TYPE_NEW_TAB_FLAGS +EPHY_TYPE_NODE_SIGNAL_TYPE +EPHY_TYPE_PASSWORD_DIALOG +EPHY_TYPE_PASSWORD_DIALOG_FLAGS +EPHY_TYPE_PERMISSION +EPHY_TYPE_PYTHON_EXTENSION +EPHY_TYPE_PYTHON_LOADER +EPHY_TYPE_RELATED_ACTION +EPHY_TYPE_SESSION_COMMAND +EPHY_TYPE_SHLIB_LOADER +EPHY_TYPE_SPELL_CHECK +EPHY_TYPE_SPINNER_TOOL_ITEM +EPHY_TYPE_STATE_WINDOW_FLAGS +EPHY_TYPE_TOOLBAR_EDITOR +EPHY_TYPE_TOPICS_ENTRY +EPHY_TYPE_TOPICS_PALETTE +EPHY_TYPE_TOPIC_FACTORY_ACTION +EPHY_TYPE_URI_CHECK_TYPE +EPHY_TYPE_X509_CERT +EPHY_X509_CERT +EPHY_X509_CERT_GET_IFACE +EPHY_X509_CERT_IFACE +EPT_COOKIE +EPT_IMAGE +EPT_POPUP +Emit +EphyAdBlock +EphyAdBlockIface +EphyAdBlockManager +EphyAdBlockManagerClass +EphyAdBlockManagerPrivate +EphyBaseEmbed +EphyBaseEmbedClass +EphyBaseEmbedPrivate +EphyBookmarkFactoryAction +EphyBookmarkFactoryActionClass +EphyCertificateManager +EphyCertificateManagerIface +EphyCookieManager +EphyCookieManagerIface +EphyDbus +EphyDbusBus +EphyDbusClass +EphyDbusPrivate +EphyEmbedAddressExpire +EphyEmbedContainer +EphyEmbedContainerIface +EphyEmbedDocumentType +EphyEmbedFind +EphyEmbedFindIface +EphyEmbedFindResult +EphyEmbedLoadFlags +EphyEmbedNavigationFlags +EphyEmbedNetState +EphyEmbedPersist +EphyEmbedPersistClass +EphyEmbedPersistFlags +EphyEmbedPersistPrivate +EphyEmbedPrintPreviewNavType +EphyEmbedSecurityLevel +EphyEmbedSingle +EphyEmbedSingleIface +EphyExtensionsManager +EphyExtensionsManagerClass +EphyExtensionsManagerPrivate +EphyFindToolbar +EphyFindToolbarClass +EphyFindToolbarPrivate +EphyHomeAction +EphyHomeActionClass +EphyIconEntry +EphyIconEntryClass +EphyIconEntryPrivate +EphyLinkAction +EphyLinkActionClass +EphyLinkActionGroup +EphyLinkActionGroupClass +EphyLoader +EphyLoaderIface +EphyLockdown +EphyLockdownClass +EphyLockdownPrivate +EphyModule +EphyNetMonitor +EphyNetMonitorClass +EphyNetMonitorPrivate +EphyNodeDbPrivate +EphyPasswordDialog +EphyPasswordDialogClass +EphyPasswordDialogFlags +EphyPasswordDialogPrivate +EphyPasswordManager +EphyPasswordManagerIface +EphyPermissionManager +EphyPermissionManagerIface +EphyPythonExtension +EphyPythonExtensionClass +EphyPythonExtensionPrivate +EphyPythonLoader +EphyPythonLoaderClass +EphyPythonLoaderPrivate +EphyRelatedAction +EphyRelatedActionClass +EphySession +EphySessionClass +EphySessionCommand +EphySessionPrivate +EphyShell +EphyShellClass +EphyShellPrivate +EphyShlibLoader +EphyShlibLoaderClass +EphyShlibLoaderPrivate +EphySpellCheck +EphySpellCheckClass +EphySpellCheckPrivate +EphySpinnerToolItem +EphySpinnerToolItemClass +EphySpinnerToolItemDetails +EphyToolbarEditor +EphyToolbarEditorClass +EphyToolbarEditorPrivate +EphyTopicFactoryAction +EphyTopicFactoryActionClass +EphyTopicsEntryPrivate +EphyTopicsPalettePrivate +EphyWindowClass +EphyWindowPrivate +EphyX509Cert +EphyX509CertIface +EphyX509CertType +ExamineCookies +ExamineRequest +ExamineResponse +Find +FindAgain +FindEmbed +FindGtkParent +FocusIn +FocusOut +GECKO_DOM_EVENT_STATIC_DEINIT +GECKO_DOM_EVENT_STATIC_INIT +GECKO_EMBED +GECKO_EMBED_CLASS +GECKO_EMBED_GET_CLASS +GECKO_EMBED_SINGLE +GECKO_EMBED_SINGLE_CLASS +GECKO_EMBED_SINGLE_GET_CLASS +GECKO_FORMSIGNINGDIALOGS_CID +GECKO_FORMSIGNINGDIALOGS_CLASSNAME +GECKO_IS_EMBED +GECKO_IS_EMBED_CLASS +GECKO_IS_EMBED_SINGLE +GECKO_IS_EMBED_SINGLE_CLASS +GECKO_PRINT_SERVICE_CLASSNAME +GECKO_PRINT_SERVICE_IID +GECKO_PRINT_SESSION_CLASSNAME +GECKO_PRINT_SESSION_IID +GECKO_PROMPT_SERVICE_CID +GECKO_PROMPT_SERVICE_CLASSNAME +GECKO_SPELL_CHECK_ENGINE_CLASSNAME +GECKO_SPELL_CHECK_ENGINE_CONTRACTID +GECKO_SPELL_CHECK_ENGINE_IID +GECKO_TYPE_DOM_EVENT +GECKO_TYPE_EMBED +GECKO_TYPE_EMBED_CHROME_FLAGS +GECKO_TYPE_EMBED_PROGRESS_FLAGS +GECKO_TYPE_EMBED_RELOAD_FLAGS +GECKO_TYPE_EMBED_SINGLE +GECKO_TYPE_EMBED_STATUS_ENUM +GTK_NSSSECURITYWARNINGDIALOGS_CID +GTK_NSSSECURITYWARNINGDIALOGS_CLASSNAME +GeckoDOMEvent +GeckoEmbed +GeckoEmbedChromeFlags +GeckoEmbedClass +GeckoEmbedPrivate +GeckoEmbedProgressFlags +GeckoEmbedReloadFlags +GeckoEmbedSignals +GeckoEmbedSingle +GeckoEmbedSingleClass +GeckoEmbedSinglePrivate +GeckoEmbedStatusEnum +GetAtkObjectForCurrentDocument +GetErrorMessage +GetGeckoEmbedForDOMWindow +GetGtkWindowForDOMWindow +GetIOService +GetListener +GetPIDOMWindow +GetSourceFile +HandleEvent +Hide +IsCalledFromScript +IsCurrentURI +IsOnline +JSContext +JobDone +JobError +JobStatusChanged +KeyPress +KeyUp +LaunchJobOnIdle +LoadCurrentURI +MOZILLA_EMBED_EVENT +MOZILLA_EMBED_EVENT_CLASS +MOZILLA_EMBED_EVENT_GET_CLASS +MOZILLA_EMBED_FIND +MOZILLA_EMBED_FIND_CLASS +MOZILLA_EMBED_FIND_GET_CLASS +MOZILLA_IS_EMBED_EVENT +MOZILLA_IS_EMBED_EVENT_CLASS +MOZILLA_IS_EMBED_FIND +MOZILLA_IS_EMBED_FIND_CLASS +MOZILLA_IS_X509_CERT +MOZILLA_IS_X509_CERT_CLASS +MOZILLA_TYPE_EMBED_EVENT +MOZILLA_TYPE_EMBED_FIND +MOZILLA_TYPE_X509_CERT +MOZILLA_X509_CERT +MOZILLA_X509_CERT_CLASS +MOZILLA_X509_CERT_GET_CLASS +MouseClick +MouseDblClick +MouseDown +MouseOut +MouseOver +MouseUp +MozillaEmbedEvent +MozillaEmbedEventClass +MozillaEmbedEventPrivate +MozillaEmbedFind +MozillaEmbedFindClass +MozillaEmbedFindPrivate +MozillaX509Cert +MozillaX509CertClass +MozillaX509CertPrivate +NS_FORWARD_NSIREQUEST +NewFileURI +NewURI +OpenStream +ParseURL +PrintUnattended +Realize +Redirect +ReleaseChildren +Reload +Resize +Response +SetChromeMask +SetEmbed +SetFindProperties +SetProgress +SetProgressText +SetSelectionAttention +SetSettings +SetURI +ShouldShow +Show +StartPrinting +TopLevelFocusIn +TopLevelFocusOut +Unrealize +WEBKIT_EMBED_FIND +WEBKIT_EMBED_FIND_CLASS +WEBKIT_EMBED_FIND_GET_CLASS +WEBKIT_IS_EMBED_FIND +WEBKIT_IS_EMBED_FIND_CLASS +WEBKIT_TYPE_EMBED_FIND +WebKitEmbedFind +WebKitEmbedFindClass +WebKitEmbedFindPrivate +Write +WritePage +ad_uri_check_type_get_type +certs_manager_dialog_get_type +certs_manager_dialog_new +dbus_g_proxy_begin_call +dbus_glib_marshal_ephy_activation_BOOLEAN__BOXED_STRING_UINT_POINTER +dbus_glib_marshal_ephy_activation_BOOLEAN__STRING_UINT_POINTER +dbus_glib_marshal_ephy_activation_BOOLEAN__UINT_POINTER +eel_strdup_strftime +egg_tb_model_flags_get_type +egg_tb_model_name_flags_get_type +ephy_action_change_sensitivity_flags +ephy_activation_load_session +ephy_activation_load_uri_list +ephy_activation_open_bookmarks_editor +ephy_adblock_edit_rule +ephy_adblock_get_type +ephy_adblock_manager_edit_rule +ephy_adblock_manager_get_type +ephy_adblock_manager_has_blocker +ephy_adblock_manager_set_blocker +ephy_adblock_manager_should_load +ephy_adblock_should_load +ephy_base_embed_get_type +ephy_base_embed_load_icon +ephy_base_embed_location_changed +ephy_base_embed_popups_manager_reset +ephy_base_embed_restore_zoom_level +ephy_base_embed_set_address +ephy_base_embed_set_icon_address +ephy_base_embed_set_link_message +ephy_base_embed_set_load_percent +ephy_base_embed_set_loading_title +ephy_base_embed_set_security_level +ephy_base_embed_set_title +ephy_base_embed_set_visibility +ephy_base_embed_update_from_net_state +ephy_bookmark_factory_action_get_type +ephy_bookmark_factory_action_new +ephy_bookmark_group_new +ephy_bookmark_property_get_type +ephy_bookmarks_ui_add_bookmark +ephy_bookmarks_ui_attach_toolbar_model +ephy_bookmarks_ui_attach_window +ephy_bookmarks_ui_detach_toolbar_model +ephy_bookmarks_ui_detach_window +ephy_bookmarks_ui_show_bookmark +ephy_certificate_manager_get_certificates +ephy_certificate_manager_get_type +ephy_certificate_manager_import +ephy_certificate_manager_remove_certificate +ephy_dbus_bus_get_type +ephy_dbus_error_quark +ephy_dbus_get_bus +ephy_dbus_get_default +ephy_dbus_get_proxy +ephy_dbus_get_type +ephy_embed_address_expire_get_type +ephy_embed_close +ephy_embed_container_add_child +ephy_embed_container_get_active_child +ephy_embed_container_get_children +ephy_embed_container_get_chrome +ephy_embed_container_get_is_popup +ephy_embed_container_get_type +ephy_embed_container_remove_child +ephy_embed_container_set_active_child +ephy_embed_document_type_get_type +ephy_embed_event_context_get_type +ephy_embed_find_activate_link +ephy_embed_find_find +ephy_embed_find_find_again +ephy_embed_find_get_type +ephy_embed_find_set_embed +ephy_embed_find_set_selection +ephy_embed_get_address +ephy_embed_get_document_type +ephy_embed_get_encoding +ephy_embed_get_icon +ephy_embed_get_icon_address +ephy_embed_get_is_blank +ephy_embed_get_load_percent +ephy_embed_get_load_status +ephy_embed_get_loading_title +ephy_embed_get_navigation_flags +ephy_embed_get_status_message +ephy_embed_get_typed_address +ephy_embed_get_visibility +ephy_embed_has_automatic_encoding +ephy_embed_load +ephy_embed_load_flags_get_type +ephy_embed_navigation_flags_get_type +ephy_embed_net_state_get_type +ephy_embed_page_scroll +ephy_embed_persist_flags_get_type +ephy_embed_persist_get_user_time +ephy_embed_persist_set_user_time +ephy_embed_ppv_navigation_get_type +ephy_embed_print_preview_nav_type_get_type +ephy_embed_scroll +ephy_embed_scroll_pixels +ephy_embed_security_level_get_type +ephy_embed_set_print_preview_mode +ephy_embed_set_typed_address +ephy_embed_shistory_copy +ephy_embed_show_page_certificate +ephy_embed_single_get_backend_name +ephy_embed_single_get_network_status +ephy_embed_single_init +ephy_embed_single_set_network_status +ephy_embed_utils_address_has_web_scheme +ephy_embed_utils_get_title_composite +ephy_embed_utils_link_message_parse +ephy_extensions_manager_get_extensions +ephy_extensions_manager_register +ephy_extensions_manager_startup +ephy_find_toolbar_close +ephy_find_toolbar_find_next +ephy_find_toolbar_find_previous +ephy_find_toolbar_get_text +ephy_find_toolbar_get_type +ephy_find_toolbar_new +ephy_find_toolbar_open +ephy_find_toolbar_request_close +ephy_find_toolbar_set_embed +ephy_home_action_get_type +ephy_icon_entry_get_entry +ephy_icon_entry_get_type +ephy_icon_entry_new +ephy_icon_entry_pack_widget +ephy_link_action_get_type +ephy_link_action_group_get_type +ephy_link_action_group_new +ephy_link_flags_get_type +ephy_loader_get_object +ephy_loader_get_type +ephy_loader_release_object +ephy_loader_type +ephy_lockdown_get_type +ephy_module_get_path +ephy_module_get_type +ephy_module_new +ephy_module_new_object +ephy_navigation_direction_get_type +ephy_net_monitor_get_net_status +ephy_net_monitor_get_type +ephy_net_monitor_new +ephy_new_tab_flags_get_type +ephy_node_signal_type_get_type +ephy_nodes_count_covered +ephy_nodes_covered +ephy_nodes_get_covered +ephy_nodes_get_covering +ephy_nodes_remove_covered +ephy_nodes_remove_not_covered +ephy_object_idle_unref +ephy_open_tabs_group_new +ephy_password_dialog_flags_get_type +ephy_password_dialog_get_domain +ephy_password_dialog_get_new_password +ephy_password_dialog_get_password +ephy_password_dialog_get_remember +ephy_password_dialog_get_type +ephy_password_dialog_get_username +ephy_password_dialog_get_username_entry +ephy_password_dialog_new +ephy_password_dialog_set_domain +ephy_password_dialog_set_label +ephy_password_dialog_set_password +ephy_password_dialog_set_remember +ephy_password_dialog_set_username +ephy_password_manager_add_password +ephy_password_manager_list_passwords +ephy_password_manager_remove_all_passwords +ephy_password_manager_remove_password +ephy_permission_get_type +ephy_permission_info_copy +ephy_permission_info_new +ephy_permission_manager_add_permission +ephy_permission_manager_clear_permissions +ephy_permission_manager_list_permissions +ephy_permission_manager_remove_permission +ephy_permission_manager_test_permission +ephy_print_utils_page_setup_new_from_file +ephy_print_utils_page_setup_new_from_key_file +ephy_print_utils_page_setup_to_file +ephy_print_utils_page_setup_to_key_file +ephy_python_extension_get_type +ephy_python_init +ephy_python_loader_get_type +ephy_python_schedule_gc +ephy_python_shutdown +ephy_related_action_get_type +ephy_related_action_new +ephy_session_command_get_type +ephy_session_queue_command +ephy_shell_get_default +ephy_shell_get_net_monitor +ephy_shell_new_tab_full +ephy_shlib_loader_get_type +ephy_signal_accumulator_object +ephy_signal_accumulator_string +ephy_spell_check_check_word +ephy_spell_check_free_suggestions +ephy_spell_check_get_default +ephy_spell_check_get_language +ephy_spell_check_get_suggestions +ephy_spell_check_get_type +ephy_spell_check_set_language +ephy_spinner_tool_item_get_type +ephy_spinner_tool_item_new +ephy_spinner_tool_item_set_spinning +ephy_state_window_flags_get_type +ephy_time_helpers_utf_friendly_time +ephy_toolbar_editor_get_type +ephy_toolbar_editor_show +ephy_topic_action_group_new +ephy_topic_factory_action_get_type +ephy_topic_factory_action_new +ephy_topics_entry_get_type +ephy_topics_entry_insert_topic +ephy_topics_entry_new +ephy_topics_palette_get_type +ephy_topics_palette_new +ephy_topics_palette_new_topic +ephy_window_get_context_event +ephy_window_get_find_toolbar +ephy_window_get_is_print_preview +ephy_window_get_ui_manager +ephy_x509_cert_get_title +ephy_x509_cert_get_type +g_marshal_value_peek_boolean +g_marshal_value_peek_boxed +g_marshal_value_peek_char +g_marshal_value_peek_double +g_marshal_value_peek_enum +g_marshal_value_peek_flags +g_marshal_value_peek_float +g_marshal_value_peek_int +g_marshal_value_peek_int64 +g_marshal_value_peek_long +g_marshal_value_peek_object +g_marshal_value_peek_param +g_marshal_value_peek_pointer +g_marshal_value_peek_string +g_marshal_value_peek_uchar +g_marshal_value_peek_uint +g_marshal_value_peek_uint64 +g_marshal_value_peek_ulong +g_timeout_add_seconds +gecko_dom_event_copy +gecko_dom_event_free +gecko_dom_event_get_I +gecko_dom_event_get_type +gecko_dom_event_new +gecko_embed_append_data +gecko_embed_can_go_back +gecko_embed_can_go_forward +gecko_embed_chrome_flags_get_type +gecko_embed_close_stream +gecko_embed_get_GeckoBrowser +gecko_embed_get_chrome_mask +gecko_embed_get_js_status +gecko_embed_get_link_message +gecko_embed_get_location +gecko_embed_get_nsIWebBrowser +gecko_embed_get_title +gecko_embed_get_type +gecko_embed_go_back +gecko_embed_go_forward +gecko_embed_load_url +gecko_embed_marshal_BOOLEAN__BOXED +gecko_embed_marshal_BOOLEAN__POINTER +gecko_embed_marshal_BOOLEAN__STRING +gecko_embed_marshal_VOID__INT_INT +gecko_embed_marshal_VOID__INT_UINT +gecko_embed_marshal_VOID__OBJECT_UINT +gecko_embed_marshal_VOID__POINTER_INT_POINTER +gecko_embed_marshal_VOID__POINTER_UINT +gecko_embed_marshal_VOID__STRING_INT_INT +gecko_embed_marshal_VOID__STRING_INT_UINT +gecko_embed_new +gecko_embed_open_stream +gecko_embed_progress_flags_get_type +gecko_embed_reload +gecko_embed_reload_flags_get_type +gecko_embed_render_data +gecko_embed_set_chrome_mask +gecko_embed_single_create_window +gecko_embed_single_get +gecko_embed_single_get_GeckoSingle +gecko_embed_single_get_type +gecko_embed_single_pop_startup +gecko_embed_single_push_startup +gecko_embed_single_set_app_components +gecko_embed_single_set_directory_service_provider +gecko_embed_status_enum_get_type +gecko_embed_stop_load +gecko_init +gecko_init_with_params +gecko_init_with_profile +gecko_reparent_to_offscreen +gecko_shutdown +mozilla_embed_event_get_type +mozilla_embed_event_new +mozilla_embed_event_set_property +mozilla_embed_find_get_type +mozilla_x509_cert_get_mozilla_cert +mozilla_x509_cert_get_type +mozilla_x509_cert_new +nsModuleComponentInfo +org_gnome_Epiphany_load_session +org_gnome_Epiphany_load_session_async +org_gnome_Epiphany_load_session_reply +org_gnome_Epiphany_load_ur_ilist +org_gnome_Epiphany_load_ur_ilist_async +org_gnome_Epiphany_load_ur_ilist_reply +org_gnome_Epiphany_open_bookmarks_editor +org_gnome_Epiphany_open_bookmarks_editor_async +org_gnome_Epiphany_open_bookmarks_editor_reply +webkit_embed_find_get_type --- epiphany-browser-2.21.4.orig/doc/reference/epiphany.prerequisites +++ epiphany-browser-2.21.4/doc/reference/epiphany.prerequisites @@ -0,0 +1 @@ +GtkFileChooser GtkWidget --- epiphany-browser-2.21.4.orig/doc/reference/epiphany.interfaces +++ epiphany-browser-2.21.4/doc/reference/epiphany.interfaces @@ -0,0 +1,21 @@ +GtkWidget AtkImplementorIface GtkBuildable +GtkContainer AtkImplementorIface GtkBuildable +GtkBin AtkImplementorIface GtkBuildable +GtkWindow AtkImplementorIface GtkBuildable +GtkDialog AtkImplementorIface GtkBuildable +GtkFileChooserDialog AtkImplementorIface GtkBuildable GtkFileChooser +EphyFileChooser AtkImplementorIface GtkBuildable GtkFileChooser +EphyWindow AtkImplementorIface GtkBuildable EphyLink EphyEmbedContainer +GtkToolItem AtkImplementorIface GtkBuildable +EphyLocationEntry AtkImplementorIface GtkBuildable +EphyZoomControl AtkImplementorIface GtkBuildable +GtkToolButton AtkImplementorIface GtkBuildable +EphyBaseEmbed AtkImplementorIface GtkBuildable EphyEmbed +MozillaEmbed AtkImplementorIface GtkBuildable EphyEmbed EphyCommandManager +GtkItem AtkImplementorIface GtkBuildable +GtkMenuItem AtkImplementorIface GtkBuildable +GtkImageMenuItem AtkImplementorIface GtkBuildable +GtkAction GtkBuildable +EphyZoomAction GtkBuildable +EphySession EphyExtension +GtkActionGroup GtkBuildable --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-node-db.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-node-db.xml @@ -273,14 +273,14 @@ Property Details -<anchor id="EphyNodeDb--immutable"/>The "<literal>immutable</literal>" property +<anchor id="EphyNodeDb--immutable"/>The <literal>"immutable"</literal> property EphyNodeDb:immutable "immutable" gboolean : Read / Write TRUE if no EphyNodes can be added, removed or modified from this EphyNodeDb Default value: FALSE -<anchor id="EphyNodeDb--name"/>The "<literal>name</literal>" property +<anchor id="EphyNodeDb--name"/>The <literal>"name"</literal> property EphyNodeDb:name "name" gchararray : Read / Write / Construct Only A string identifier unique to this EphyNodeDb @@ -292,4 +292,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-permission-manager.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-permission-manager.xml @@ -153,4 +153,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/tree_index.sgml +++ epiphany-browser-2.21.4/doc/reference/xml/tree_index.sgml @@ -0,0 +1,17 @@ + + + + GObject + GInitiallyUnowned + GtkObject + GtkWidget + GtkContainer + GtkBin + GtkWindow + EphyWindow + EphyNodeDb + GInterface + EphyEmbed + EphyCommandManager + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-embed.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-embed.xml @@ -776,7 +776,7 @@ Signal Details -<anchor id="EphyEmbed-close-request"/>The "close-request" signal +<anchor id="EphyEmbed-close-request"/>The <literal>"close-request"</literal> signal EphyEmbed::close-requestgboolean user_function (EphyEmbed *embed, gpointer user_data) : Run Last @@ -791,7 +791,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-content-blocked"/>The "content-blocked" signal +<anchor id="EphyEmbed-content-blocked"/>The <literal>"content-blocked"</literal> signal EphyEmbed::content-blockedvoid user_function (EphyEmbed *embed, gchar *uri, gpointer user_data) : Run Last @@ -808,7 +808,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-dom-content-loaded"/>The "dom-content-loaded" signal +<anchor id="EphyEmbed-dom-content-loaded"/>The <literal>"dom-content-loaded"</literal> signal EphyEmbed::dom-content-loadedvoid user_function (EphyEmbed *embed, gpointer arg1, gpointer user_data) : Run First @@ -824,7 +824,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-context-menu"/>The "ge-context-menu" signal +<anchor id="EphyEmbed-ge-context-menu"/>The <literal>"ge-context-menu"</literal> signal EphyEmbed::ge-context-menugboolean user_function (EphyEmbed *embed, GObject *event, gpointer user_data) : Run Last @@ -843,7 +843,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-document-type"/>The "ge-document-type" signal +<anchor id="EphyEmbed-ge-document-type"/>The <literal>"ge-document-type"</literal> signal EphyEmbed::ge-document-typevoid user_function (EphyEmbed *embed, EphyEmbedDocumentType type, gpointer user_data) : Run First @@ -860,7 +860,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-dom-mouse-click"/>The "ge-dom-mouse-click" signal +<anchor id="EphyEmbed-ge-dom-mouse-click"/>The <literal>"ge-dom-mouse-click"</literal> signal EphyEmbed::ge-dom-mouse-clickgboolean user_function (EphyEmbed *embed, GObject *event, gpointer user_data) : Run Last @@ -877,7 +877,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-dom-mouse-down"/>The "ge-dom-mouse-down" signal +<anchor id="EphyEmbed-ge-dom-mouse-down"/>The <literal>"ge-dom-mouse-down"</literal> signal EphyEmbed::ge-dom-mouse-downgboolean user_function (EphyEmbed *embed, GObject *event, gpointer user_data) : Run Last @@ -895,7 +895,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-favicon"/>The "ge-favicon" signal +<anchor id="EphyEmbed-ge-favicon"/>The <literal>"ge-favicon"</literal> signal EphyEmbed::ge-faviconvoid user_function (EphyEmbed *embed, gchar *address, gpointer user_data) : Run First @@ -913,7 +913,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-feed-link"/>The "ge-feed-link" signal +<anchor id="EphyEmbed-ge-feed-link"/>The <literal>"ge-feed-link"</literal> signal EphyEmbed::ge-feed-linkvoid user_function (EphyEmbed *embed, gchar *type, gchar *title, @@ -939,7 +939,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-modal-alert"/>The "ge-modal-alert" signal +<anchor id="EphyEmbed-ge-modal-alert"/>The <literal>"ge-modal-alert"</literal> signal EphyEmbed::ge-modal-alertgboolean user_function (EphyEmbed *embed, gpointer user_data) : Run Last @@ -956,7 +956,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-modal-alert-closed"/>The "ge-modal-alert-closed" signal +<anchor id="EphyEmbed-ge-modal-alert-closed"/>The <literal>"ge-modal-alert-closed"</literal> signal EphyEmbed::ge-modal-alert-closedvoid user_function (EphyEmbed *embed, gpointer user_data) : Run Last @@ -970,7 +970,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-new-window"/>The "ge-new-window" signal +<anchor id="EphyEmbed-ge-new-window"/>The <literal>"ge-new-window"</literal> signal EphyEmbed::ge-new-windowvoid user_function (EphyEmbed *embed, GtkWidget *new_embed, gpointer user_data) : Run First @@ -988,7 +988,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-popup-blocked"/>The "ge-popup-blocked" signal +<anchor id="EphyEmbed-ge-popup-blocked"/>The <literal>"ge-popup-blocked"</literal> signal EphyEmbed::ge-popup-blockedvoid user_function (EphyEmbed *embed, gchar *address, gchar *target, @@ -1014,7 +1014,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-search-key-press"/>The "ge-search-key-press" signal +<anchor id="EphyEmbed-ge-search-key-press"/>The <literal>"ge-search-key-press"</literal> signal EphyEmbed::ge-search-key-pressgboolean user_function (EphyEmbed *embed, GdkEvent *event, gpointer user_data) : Run Last @@ -1032,7 +1032,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-search-link"/>The "ge-search-link" signal +<anchor id="EphyEmbed-ge-search-link"/>The <literal>"ge-search-link"</literal> signal EphyEmbed::ge-search-linkvoid user_function (EphyEmbed *embed, gchar *type, gchar *title, @@ -1058,7 +1058,7 @@ user_data : user data set when the signal handler was connected. -<anchor id="EphyEmbed-ge-zoom-change"/>The "ge-zoom-change" signal +<anchor id="EphyEmbed-ge-zoom-change"/>The <literal>"ge-zoom-change"</literal> signal EphyEmbed::ge-zoom-changevoid user_function (EphyEmbed *embed, gfloat zoom, gpointer user_data) : Run Last @@ -1094,4 +1094,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-shell.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-shell.xml @@ -251,4 +251,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-embed-factory.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-embed-factory.xml @@ -68,4 +68,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-glade.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-glade.xml @@ -53,4 +53,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-extensions-manager.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-extensions-manager.xml @@ -93,4 +93,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-embed-single.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-embed-single.xml @@ -170,4 +170,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/object_index.sgml +++ epiphany-browser-2.21.4/doc/reference/xml/object_index.sgml @@ -0,0 +1,27 @@ + + + + + + + +EphyCommandManager +EphyEmbed +EphyNodeDb + + +EphyWindow +GInitiallyUnowned +GInterface + + +GObject +GtkBin +GtkContainer + + +GtkObject +GtkWidget +GtkWindow + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-password-manager.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-password-manager.xml @@ -149,4 +149,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-window.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-window.xml @@ -221,4 +221,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-session.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-session.xml @@ -133,7 +133,7 @@ session : -Returns : the list of open EphyWindow:s. +Returns : the list of open "s". @@ -176,4 +176,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/epiphany-doc.bottom +++ epiphany-browser-2.21.4/doc/reference/xml/epiphany-doc.bottom @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-embed-persist.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-embed-persist.xml @@ -441,4 +441,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-command-manager.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-command-manager.xml @@ -181,7 +181,7 @@ Signal Details -<anchor id="EphyCommandManager-command-changed"/>The "command-changed" signal +<anchor id="EphyCommandManager-command-changed"/>The <literal>"command-changed"</literal> signal EphyCommandManager::command-changedvoid user_function (EphyCommandManager *manager, gchar *command, gpointer user_data) : Run First @@ -205,4 +205,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/EphySingle.xml +++ epiphany-browser-2.21.4/doc/reference/xml/EphySingle.xml @@ -126,4 +126,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/EphyContentPolicy.xml +++ epiphany-browser-2.21.4/doc/reference/xml/EphyContentPolicy.xml @@ -68,4 +68,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/xml/ephy-cookie-manager.xml +++ epiphany-browser-2.21.4/doc/reference/xml/ephy-cookie-manager.xml @@ -182,4 +182,6 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/epiphany-undocumented.txt +++ epiphany-browser-2.21.4/doc/reference/epiphany-undocumented.txt @@ -0,0 +1,89 @@ +68% symbol docs coverage. +118 symbols documented. +25 symbols incomplete. +56 not documented. + + +Detach +EPHY_CONTENT_POLICY_CID +EPHY_CONTENT_POLICY_CLASSNAME +EPHY_CONTENT_POLICY_CONTRACTID +EPHY_COOKIE_MANAGER_IFACE +EPHY_IS_COOKIE_MANAGER_IFACE +EPHY_IS_PASSWORD_MANAGER_IFACE +EPHY_PASSWORD_MANAGER_IFACE +EPHY_TYPE_COOKIE +EPHY_TYPE_PASSWORD_INFO +EmitPermissionNotification +EphyCommandManager +EphyCommandManager::command-changed (manager) +EphyCommandManagerIface +EphyEmbed +EphyEmbed::close-request (embed) +EphyEmbed::content-blocked (embed) +EphyEmbed::dom-content-loaded (embed) +EphyEmbed::ge-context-menu (embed) +EphyEmbed::ge-document-type (embed) +EphyEmbed::ge-dom-mouse-click (embed) +EphyEmbed::ge-dom-mouse-down (embed) +EphyEmbed::ge-favicon (embed) +EphyEmbed::ge-feed-link (embed) +EphyEmbed::ge-modal-alert (embed) +EphyEmbed::ge-modal-alert-closed (embed) +EphyEmbed::ge-new-window (embed) +EphyEmbed::ge-popup-blocked (embed) +EphyEmbed::ge-search-key-press (embed) +EphyEmbed::ge-search-link (embed) +EphyEmbed::ge-zoom-change (embed) +EphyEmbedChrome (EPHY_EMBED_CHROME_BOOKMARKSBAR) +EphyEmbedIface +EphyNewTabFlags +EphyNodeDb +EphyPermissionInfo (qtype) +EphyWindow +Init +ephy_cookie_copy +ephy_cookie_manager_get_type +ephy_cookie_new +ephy_embed_can_go_back +ephy_embed_can_go_forward +ephy_embed_find_set_properties (search_string) +ephy_embed_get_title +ephy_extensions_manager_load (identifier) +ephy_extensions_manager_unload (identifier) +ephy_node_db_get_name +ephy_node_db_is_immutable +ephy_password_info_copy +ephy_password_info_free (info) +ephy_password_manager_get_type +ephy_session_add_window (session) +ephy_session_close +ephy_session_get_windows +ephy_session_load +ephy_session_save +ephy_shell +ephy_shell_get_bookmarks +ephy_shell_get_bookmarks_editor +ephy_shell_get_extensions_manager +ephy_shell_get_history_window +ephy_shell_get_pdm_dialog +ephy_shell_get_prefs_dialog +ephy_shell_get_toolbars_model +ephy_shell_new_tab (flags, Returns) +mozilla_cookie_to_ephy_cookie +mozilla_permission_to_ephy_permission + + +EphyContentPolicy:Long_Description +EphyContentPolicy:Short_Description +EphySingle:Short_Description +ephy-cookie-manager:Long_Description +ephy-cookie-manager:Short_Description +ephy-extensions-manager:Long_Description +ephy-extensions-manager:Short_Description +ephy-password-manager:Long_Description +ephy-password-manager:Short_Description +ephy-session:Long_Description +ephy-session:Short_Description +ephy-shell:Long_Description +ephy-shell:Short_Description --- epiphany-browser-2.21.4.orig/doc/reference/epiphany.signals +++ epiphany-browser-2.21.4/doc/reference/epiphany.signals @@ -0,0 +1,333 @@ + +EphyDialog::changed +void +fd +EphyDialog *ephydialog +gpointer arg1 + + + +EphyNodeFilter::changed +void +l +EphyNodeFilter *ephynodefilter + + + +EphyLocationEntry::get-location +gchar* +fl +EphyLocationEntry *ephylocationentry + + + +EphyLocationEntry::get-title +gchar* +fl +EphyLocationEntry *ephylocationentry + + + +EphyLocationEntry::lock-clicked +void +fl +EphyLocationEntry *ephylocationentry + + + +EphyLocationEntry::user-changed +void +fl +EphyLocationEntry *ephylocationentry + + + +EphyZoomAction::zoom-to-level +void +f +EphyZoomAction *ephyzoomaction +gfloat arg1 + + + +EphyZoomControl::zoom-to-level +void +l +EphyZoomControl *ephyzoomcontrol +gfloat arg1 + + + +EphyEmbed::close-request +gboolean +l +EphyEmbed *ephyembed + + + +EphyEmbed::content-blocked +void +l +EphyEmbed *ephyembed +gchar *arg1 + + + +EphyEmbed::dom-content-loaded +void +f +EphyEmbed *ephyembed +gpointer arg1 + + + +EphyEmbed::ge-context-menu +gboolean +l +EphyEmbed *ephyembed +GObject *arg1 + + + +EphyEmbed::ge-document-type +void +f +EphyEmbed *ephyembed +EphyEmbedDocumentType arg1 + + + +EphyEmbed::ge-dom-mouse-click +gboolean +l +EphyEmbed *ephyembed +GObject *arg1 + + + +EphyEmbed::ge-dom-mouse-down +gboolean +l +EphyEmbed *ephyembed +GObject *arg1 + + + +EphyEmbed::ge-favicon +void +f +EphyEmbed *ephyembed +gchar *arg1 + + + +EphyEmbed::ge-feed-link +void +f +EphyEmbed *ephyembed +gchar *arg1 +gchar *arg2 +gchar *arg3 + + + +EphyEmbed::ge-modal-alert +gboolean +l +EphyEmbed *ephyembed + + + +EphyEmbed::ge-modal-alert-closed +void +l +EphyEmbed *ephyembed + + + +EphyEmbed::ge-new-window +void +fl +EphyEmbed *ephyembed +GtkWidget *widget + + + +EphyEmbed::ge-popup-blocked +void +f +EphyEmbed *ephyembed +gchar *arg1 +gchar *arg2 +gchar *arg3 + + + +EphyEmbed::ge-search-key-press +gboolean +l +EphyEmbed *ephyembed +GdkEvent *event + + + +EphyEmbed::ge-search-link +void +f +EphyEmbed *ephyembed +gchar *arg1 +gchar *arg2 +gchar *arg3 + + + +EphyEmbed::ge-zoom-change +void +l +EphyEmbed *ephyembed +gfloat arg1 + + + +EphyCommandManager::command-changed +void +f +EphyCommandManager *ephycommandmanager +gchar *arg1 + + + +EphyDownload::changed +void +f +EphyDownload *ephydownload + + + +EphyEmbedPersist::cancelled +void +l +EphyEmbedPersist *ephyembedpersist + + + +EphyEmbedPersist::completed +void +l +EphyEmbedPersist *ephyembedpersist + + + +EphyEmbedSingle::add-search-engine +gboolean +l +EphyEmbedSingle *ephyembedsingle +gchar *arg1 +gchar *arg2 +gchar *arg3 + + + +EphyEmbedSingle::add-sidebar +gboolean +l +EphyEmbedSingle *ephyembedsingle +gchar *arg1 +gchar *arg2 + + + +EphyEmbedSingle::handle-content +gboolean +l +EphyEmbedSingle *ephyembedsingle +gchar *arg1 +gchar *arg2 + + + +EphyEmbedSingle::new-window +GtkWidget* +fl +EphyEmbedSingle *ephyembedsingle +GtkWidget *widget +EphyEmbedChrome arg1 + + + +EphyCookieManager::cookie-added +void +f +EphyCookieManager *ephycookiemanager +EphyCookie *arg1 + + + +EphyCookieManager::cookie-changed +void +f +EphyCookieManager *ephycookiemanager +EphyCookie *arg1 + + + +EphyCookieManager::cookie-deleted +void +f +EphyCookieManager *ephycookiemanager +EphyCookie *arg1 + + + +EphyCookieManager::cookie-rejected +void +f +EphyCookieManager *ephycookiemanager +gchar *arg1 + + + +EphyCookieManager::cookies-cleared +void +f +EphyCookieManager *ephycookiemanager + + + +EphyPermissionManager::permission-added +void +f +EphyPermissionManager *ephypermissionmanager +EphyPermissionInfo *arg1 + + + +EphyPermissionManager::permission-changed +void +f +EphyPermissionManager *ephypermissionmanager +EphyPermissionInfo *arg1 + + + +EphyPermissionManager::permission-deleted +void +f +EphyPermissionManager *ephypermissionmanager +EphyPermissionInfo *arg1 + + + +EphyPermissionManager::permissions-cleared +void +f +EphyPermissionManager *ephypermissionmanager + + + +EphyPasswordManager::passwords-changed +void +f +EphyPasswordManager *ephypasswordmanager + + --- epiphany-browser-2.21.4.orig/doc/reference/tmpl.stamp +++ epiphany-browser-2.21.4/doc/reference/tmpl.stamp @@ -0,0 +1 @@ +timestamp \ No newline at end of file --- epiphany-browser-2.21.4.orig/doc/reference/epiphany.hierarchy +++ epiphany-browser-2.21.4/doc/reference/epiphany.hierarchy @@ -0,0 +1,55 @@ +GObject + EphyDialog + DownloaderView + EphyEmbedDialog + GInitiallyUnowned + GtkObject + GtkWidget + GtkContainer + GtkBin + GtkWindow + GtkDialog + GtkFileChooserDialog + EphyFileChooser + EphyWindow + GtkToolItem + EphyLocationEntry + EphyZoomControl + GtkToolButton + EphyBaseEmbed + MozillaEmbed + GtkItem + GtkMenuItem + GtkImageMenuItem + GtkFileFilter + GtkTooltips + EphyNodeDb + EphyNodeFilter + GtkAction + EphyZoomAction + EphyDownload + EphyEmbedPersist + MozillaEmbedPersist + EphyEmbedShell + EphyShell + EphySession + GtkStyle + GdkDragContext + GtkTooltip + GdkScreen + GdkPixbuf + GtkActionGroup +GInterface + AtkImplementorIface + GtkBuildable + GtkFileChooser + EphyEmbed + EphyCommandManager + EphyEmbedEvent + EphyEmbedSingle + EphyCookieManager + EphyPermissionManager + EphyPasswordManager + EphyLink + EphyEmbedContainer + EphyExtension --- epiphany-browser-2.21.4.orig/doc/reference/tmpl/ephy-embed.sgml +++ epiphany-browser-2.21.4/doc/reference/tmpl/ephy-embed.sgml @@ -231,7 +231,6 @@ @: @: @: -@: @: @Param2: @Param3: --- epiphany-browser-2.21.4.orig/doc/reference/epiphany-decl-list.txt +++ epiphany-browser-2.21.4/doc/reference/epiphany-decl-list.txt @@ -0,0 +1,1769 @@ +
+ephy-home-action +EphyHomeAction +EphyHomeAction + +EPHY_HOME_ACTION +EPHY_IS_HOME_ACTION +EPHY_TYPE_HOME_ACTION +ephy_home_action_get_type +EPHY_HOME_ACTION_CLASS +EPHY_IS_HOME_ACTION_CLASS +EPHY_HOME_ACTION_GET_CLASS +
+ +
+ephy-find-toolbar +EphyFindToolbarPrivate +EphyFindToolbar +EphyFindToolbar +ephy_find_toolbar_new +ephy_find_toolbar_get_text +ephy_find_toolbar_set_embed +ephy_find_toolbar_find_next +ephy_find_toolbar_find_previous +ephy_find_toolbar_open +ephy_find_toolbar_close +ephy_find_toolbar_request_close + +EPHY_FIND_TOOLBAR +EPHY_IS_FIND_TOOLBAR +EPHY_TYPE_FIND_TOOLBAR +ephy_find_toolbar_get_type +EPHY_FIND_TOOLBAR_CLASS +EPHY_IS_FIND_TOOLBAR_CLASS +EPHY_FIND_TOOLBAR_GET_CLASS +
+ +
+ephy-extensions-manager +EphyExtensionsManagerPrivate +EphyExtensionsManager +EphyExtensionsManager +ephy_extensions_manager_startup +ephy_extensions_manager_load +ephy_extensions_manager_unload +ephy_extensions_manager_register +ephy_extensions_manager_get_extensions + +EPHY_EXTENSIONS_MANAGER +EPHY_IS_EXTENSIONS_MANAGER +EPHY_TYPE_EXTENSIONS_MANAGER +ephy_extensions_manager_get_type +EPHY_EXTENSIONS_MANAGER_CLASS +EPHY_IS_EXTENSIONS_MANAGER_CLASS +EPHY_EXTENSIONS_MANAGER_GET_CLASS +
+ +
+ephy-python-loader +EphyPythonLoaderPrivate +EphyPythonLoader +EphyPythonLoader + +EPHY_PYTHON_LOADER +EPHY_IS_PYTHON_LOADER +EPHY_TYPE_PYTHON_LOADER +ephy_python_loader_get_type +EPHY_PYTHON_LOADER_CLASS +EPHY_IS_PYTHON_LOADER_CLASS +EPHY_PYTHON_LOADER_GET_CLASS +
+ +
+ephy-net-monitor +EphyNetMonitorPrivate +EphyNetMonitor +EphyNetMonitor +ephy_net_monitor_new +ephy_net_monitor_get_net_status + +EPHY_NET_MONITOR +EPHY_IS_NET_MONITOR +EPHY_TYPE_NET_MONITOR +ephy_net_monitor_get_type +EPHY_NET_MONITOR_CLASS +EPHY_IS_NET_MONITOR_CLASS +EPHY_NET_MONITOR_GET_CLASS +
+ +
+ephy-lockdown +EphyLockdownPrivate +EphyLockdown +EphyLockdown + +EPHY_LOCKDOWN +EPHY_IS_LOCKDOWN +EPHY_TYPE_LOCKDOWN +ephy_lockdown_get_type +EPHY_LOCKDOWN_CLASS +EPHY_IS_LOCKDOWN_CLASS +EPHY_LOCKDOWN_GET_CLASS +
+ +
+ephy-session +EphySessionPrivate +EphySessionCommand +EphySession +EphySession +ephy_session_get_active_window +ephy_session_save +ephy_session_load +ephy_session_close +ephy_session_get_windows +ephy_session_add_window +ephy_session_remove_window +ephy_session_queue_command + +EPHY_SESSION +EPHY_IS_SESSION +EPHY_TYPE_SESSION +ephy_session_get_type +EPHY_SESSION_CLASS +EPHY_IS_SESSION_CLASS +EPHY_SESSION_GET_CLASS +
+ +
+ephy-toolbar-editor +EphyToolbarEditorPrivate +EphyToolbarEditor +EphyToolbarEditor +ephy_toolbar_editor_show + +EPHY_TOOLBAR_EDITOR +EPHY_IS_TOOLBAR_EDITOR +EPHY_TYPE_TOOLBAR_EDITOR +ephy_toolbar_editor_get_type +EPHY_TOOLBAR_EDITOR_CLASS +EPHY_IS_TOOLBAR_EDITOR_CLASS +EPHY_TOOLBAR_EDITOR_GET_CLASS +
+ +
+ephy-link-action +EPHY_TYPE_LINK_ACTION_GROUP +EPHY_LINK_ACTION_GROUP +EPHY_LINK_ACTION_GROUP_CLASS +EPHY_IS_LINK_ACTION_GROUP +EPHY_IS_LINK_ACTION_GROUP_CLASS +EPHY_LINK_ACTION_GROUP_GET_CLASS +EphyLinkAction +EphyLinkAction +EphyLinkActionGroup +EphyLinkActionGroup +ephy_link_action_group_get_type +ephy_link_action_group_new + +EPHY_LINK_ACTION +EPHY_IS_LINK_ACTION +EPHY_TYPE_LINK_ACTION +ephy_link_action_get_type +EPHY_LINK_ACTION_CLASS +EPHY_IS_LINK_ACTION_CLASS +EPHY_LINK_ACTION_GET_CLASS +
+ +
+ephy-cert-manager-dialog +CertsManagerDialogPrivate +CertsManagerDialog +CertsManagerDialog +certs_manager_dialog_new + +EPHY_CERTS_MANAGER_DIALOG +EPHY_IS_CERTS_MANAGER_DIALOG +EPHY_TYPE_CERTS_MANAGER_DIALOG +certs_manager_dialog_get_type +EPHY_CERTS_MANAGER_DIALOG_CLASS +EPHY_IS_CERTS_MANAGER_DIALOG_CLASS +EPHY_CERTS_MANAGER_DIALOG_GET_CLASS +
+ +
+ephy-dbus +DBUS_API_SUBJECT_TO_CHANGE +ephy_dbus_error_quark +EPHY_DBUS_ERROR_QUARK +EphyDbusPrivate +EphyDbusBus +EphyDbus +EphyDbus +ephy_dbus_get_default +ephy_dbus_get_bus +ephy_dbus_get_proxy + +EPHY_DBUS +EPHY_IS_DBUS +EPHY_TYPE_DBUS +ephy_dbus_get_type +EPHY_DBUS_CLASS +EPHY_IS_DBUS_CLASS +EPHY_DBUS_GET_CLASS +
+ +
+ephy-shell +EphyShellPrivate +ephy_shell +EphyNewTabFlags +EphyShell +EphyShell +ephy_shell_get_type +ephy_shell_get_default +ephy_shell_new_tab +ephy_shell_new_tab_full +ephy_shell_get_session +ephy_shell_get_net_monitor +ephy_shell_get_bookmarks +ephy_shell_get_toolbars_model +ephy_shell_get_extensions_manager +ephy_shell_get_bookmarks_editor +ephy_shell_get_history_window +ephy_shell_get_pdm_dialog +ephy_shell_get_prefs_dialog + +EPHY_SHELL +EPHY_IS_SHELL +EPHY_TYPE_SHELL +ephy_new_tab_flags_get_type +EPHY_SHELL_CLASS +EPHY_IS_SHELL_CLASS +EPHY_SHELL_GET_CLASS +
+ +
+ephy-python-extension +EphyPythonExtensionPrivate +EphyPythonExtension +EphyPythonExtension + +EPHY_PYTHON_EXTENSION +EPHY_IS_PYTHON_EXTENSION +EPHY_TYPE_PYTHON_EXTENSION +ephy_python_extension_get_type +EPHY_PYTHON_EXTENSION_CLASS +EPHY_IS_PYTHON_EXTENSION_CLASS +EPHY_PYTHON_EXTENSION_GET_CLASS +
+ +
+ephy-window +EphyWindowPrivate +EphyWindow +EphyWindow +ephy_window_new +ephy_window_new_with_chrome +ephy_window_get_ui_manager +ephy_window_get_toolbar +ephy_window_get_notebook +ephy_window_get_find_toolbar +ephy_window_get_statusbar +ephy_window_load_url +ephy_window_set_zoom +ephy_window_activate_location +ephy_window_get_is_print_preview +ephy_window_get_context_event + +EPHY_WINDOW +EPHY_IS_WINDOW +EPHY_TYPE_WINDOW +ephy_window_get_type +EPHY_WINDOW_CLASS +EPHY_IS_WINDOW_CLASS +EPHY_WINDOW_GET_CLASS +
+ +
+ephy-topic-factory-action +EphyTopicFactoryAction +EphyTopicFactoryAction +ephy_topic_factory_action_new + +EPHY_TOPIC_FACTORY_ACTION +EPHY_IS_TOPIC_FACTORY_ACTION +EPHY_TYPE_TOPIC_FACTORY_ACTION +ephy_topic_factory_action_get_type +EPHY_TOPIC_FACTORY_ACTION_CLASS +EPHY_IS_TOPIC_FACTORY_ACTION_CLASS +EPHY_TOPIC_FACTORY_ACTION_GET_CLASS +
+ +
+ephy-topics-entry +EphyTopicsEntryPrivate +ephy_topics_entry_new +ephy_topics_entry_insert_topic + +EPHY_TOPICS_ENTRY +EPHY_IS_TOPICS_ENTRY +EPHY_TYPE_TOPICS_ENTRY +ephy_topics_entry_get_type +EPHY_TOPICS_ENTRY_CLASS +EPHY_IS_TOPICS_ENTRY_CLASS +EPHY_TOPICS_ENTRY_GET_CLASS +
+ +
+ephy-bookmark-factory-action +EphyBookmarkFactoryAction +EphyBookmarkFactoryAction +ephy_bookmark_factory_action_new + +EPHY_BOOKMARK_FACTORY_ACTION +EPHY_IS_BOOKMARK_FACTORY_ACTION +EPHY_TYPE_BOOKMARK_FACTORY_ACTION +ephy_bookmark_factory_action_get_type +EPHY_BOOKMARK_FACTORY_ACTION_CLASS +EPHY_IS_BOOKMARK_FACTORY_ACTION_CLASS +EPHY_BOOKMARK_FACTORY_ACTION_GET_CLASS +
+ +
+ephy-topics-palette +EphyTopicsPalettePrivate +ephy_topics_palette_new +ephy_topics_palette_new_topic + +EPHY_TOPICS_PALETTE +EPHY_IS_TOPICS_PALETTE +EPHY_TYPE_TOPICS_PALETTE +ephy_topics_palette_get_type +EPHY_TOPICS_PALETTE_CLASS +EPHY_IS_TOPICS_PALETTE_CLASS +EPHY_TOPICS_PALETTE_GET_CLASS +
+ +
+ephy-related-action +EphyRelatedAction +EphyRelatedAction +ephy_related_action_new + +EPHY_RELATED_ACTION +EPHY_IS_RELATED_ACTION +EPHY_TYPE_RELATED_ACTION +ephy_related_action_get_type +EPHY_RELATED_ACTION_CLASS +EPHY_IS_RELATED_ACTION_CLASS +EPHY_RELATED_ACTION_GET_CLASS +
+ +
+ephy-embed-single +EPHY_EMBED_SINGLE_IFACE +EPHY_IS_EMBED_SINGLE_IFACE +EphyEmbedSingle +EphyEmbedSingleIface +ephy_embed_single_init +ephy_embed_single_open_window +ephy_embed_single_clear_cache +ephy_embed_single_clear_auth_cache +ephy_embed_single_set_network_status +ephy_embed_single_get_network_status +ephy_embed_single_get_font_list +ephy_embed_single_get_backend_name + +EPHY_EMBED_SINGLE +EPHY_IS_EMBED_SINGLE +EPHY_TYPE_EMBED_SINGLE +ephy_embed_single_get_type +EPHY_EMBED_SINGLE_GET_IFACE +
+ +
+ephy-x509-cert +EphyX509CertType +EPHY_X509_CERT_IFACE +EPHY_IS_X509_CERT_IFACE +EphyX509Cert +EphyX509CertIface +ephy_x509_cert_get_title + +EPHY_X509_CERT +EPHY_IS_X509_CERT +EPHY_TYPE_X509_CERT +ephy_x509_cert_get_type +EPHY_X509_CERT_GET_IFACE +
+ +
+ephy-cookie-manager +EPHY_COOKIE_MANAGER_IFACE +EPHY_IS_COOKIE_MANAGER_IFACE +EPHY_TYPE_COOKIE +EphyCookieManager +EphyCookieManagerIface +ephy_cookie_new +ephy_cookie_copy +ephy_cookie_free +ephy_cookie_manager_get_type +ephy_cookie_manager_list_cookies +ephy_cookie_manager_remove_cookie +ephy_cookie_manager_clear + +EPHY_COOKIE_MANAGER +EPHY_IS_COOKIE_MANAGER +EPHY_TYPE_COOKIE_MANAGER +ephy_cookie_get_type +EPHY_COOKIE_MANAGER_GET_IFACE +
+ +
+ephy-embed-find +EPHY_EMBED_FIND_IFACE +EPHY_IS_EMBED_FIND_IFACE +EphyEmbedFind +EphyEmbedFindIface +EphyEmbedFindResult +ephy_embed_find_set_embed +ephy_embed_find_set_properties +ephy_embed_find_find +ephy_embed_find_find_again +ephy_embed_find_set_selection +ephy_embed_find_activate_link + +EPHY_EMBED_FIND +EPHY_IS_EMBED_FIND +EPHY_TYPE_EMBED_FIND +ephy_embed_find_get_type +EPHY_EMBED_FIND_GET_IFACE +
+ +
+ephy-embed +EPHY_EMBED_IFACE +EPHY_IS_EMBED_IFACE +EphyEmbed +EphyEmbedIface +EphyEmbedNetState +EphyEmbedChrome +EphyEmbedLoadFlags +EPHY_EMBED_CHROME_ALL +EphyEmbedPrintPreviewNavType +EphyEmbedSecurityLevel +EphyEmbedDocumentType +EphyEmbedNavigationFlags +EphyEmbedAddressExpire +ephy_embed_chrome_get_type +ephy_embed_ppv_navigation_get_type +ephy_embed_security_level_get_type +ephy_embed_document_type_get_type +ephy_embed_get_type +ephy_embed_load_url +ephy_embed_load +ephy_embed_stop_load +ephy_embed_reload +ephy_embed_get_title +ephy_embed_get_location +ephy_embed_get_link_message +ephy_embed_get_js_status +ephy_embed_can_go_back +ephy_embed_can_go_forward +ephy_embed_can_go_up +ephy_embed_get_go_up_list +ephy_embed_go_back +ephy_embed_go_forward +ephy_embed_go_up +ephy_embed_shistory_n_items +ephy_embed_shistory_get_nth +ephy_embed_shistory_get_pos +ephy_embed_shistory_go_nth +ephy_embed_shistory_copy +ephy_embed_get_security_level +ephy_embed_show_page_certificate +ephy_embed_set_zoom +ephy_embed_get_zoom +ephy_embed_scroll +ephy_embed_page_scroll +ephy_embed_scroll_pixels +ephy_embed_get_document_type +ephy_embed_get_load_percent +ephy_embed_get_load_status +ephy_embed_get_navigation_flags +ephy_embed_get_typed_address +ephy_embed_set_typed_address +ephy_embed_get_address +ephy_embed_get_status_message +ephy_embed_get_icon +ephy_embed_get_icon_address +ephy_embed_get_is_blank +ephy_embed_get_loading_title +ephy_embed_get_visibility +ephy_embed_get_encoding +ephy_embed_has_automatic_encoding +ephy_embed_set_encoding +ephy_embed_print +ephy_embed_set_print_preview_mode +ephy_embed_print_preview_n_pages +ephy_embed_print_preview_navigate +ephy_embed_close +ephy_embed_has_modified_forms + +EPHY_EMBED +EPHY_IS_EMBED +EPHY_TYPE_EMBED +ephy_embed_net_state_get_type +EPHY_EMBED_GET_IFACE +
+ +
+ephy-base-embed +EphyBaseEmbedPrivate +EphyBaseEmbed +EphyBaseEmbed +ephy_base_embed_set_title +ephy_base_embed_set_loading_title +ephy_base_embed_set_address +ephy_base_embed_location_changed +ephy_base_embed_load_icon +ephy_base_embed_set_icon_address +ephy_base_embed_set_link_message +ephy_base_embed_set_security_level +ephy_base_embed_restore_zoom_level +ephy_base_embed_update_from_net_state +ephy_base_embed_set_load_percent +ephy_base_embed_popups_manager_reset +ephy_base_embed_set_visibility + +EPHY_BASE_EMBED +EPHY_IS_BASE_EMBED +EPHY_TYPE_BASE_EMBED +ephy_base_embed_get_type +EPHY_BASE_EMBED_CLASS +EPHY_IS_BASE_EMBED_CLASS +EPHY_BASE_EMBED_GET_CLASS +
+ +
+ephy-adblock-manager +EphyAdBlockManagerPrivate +EphyAdBlockManager +EphyAdBlockManager +ephy_adblock_manager_should_load +ephy_adblock_manager_set_blocker +ephy_adblock_manager_edit_rule +ephy_adblock_manager_has_blocker + +EPHY_ADBLOCK_MANAGER +EPHY_IS_ADBLOCK_MANAGER +EPHY_TYPE_ADBLOCK_MANAGER +ephy_adblock_manager_get_type +EPHY_ADBLOCK_MANAGER_CLASS +EPHY_IS_ADBLOCK_MANAGER_CLASS +EPHY_ADBLOCK_MANAGER_GET_CLASS +
+ +
+ephy-certificate-manager +EPHY_CERTIFICATE_MANAGER_IFACE +EPHY_IS_CERTIFICATE_MANAGER_IFACE +EphyCertificateManager +EphyCertificateManagerIface +ephy_certificate_manager_get_certificates +ephy_certificate_manager_remove_certificate +ephy_certificate_manager_import + +EPHY_CERTIFICATE_MANAGER +EPHY_IS_CERTIFICATE_MANAGER +EPHY_TYPE_CERTIFICATE_MANAGER +ephy_certificate_manager_get_type +EPHY_CERTIFICATE_MANAGER_GET_IFACE +
+ +
+ephy-password-manager +EPHY_PASSWORD_MANAGER_IFACE +EPHY_IS_PASSWORD_MANAGER_IFACE +EPHY_TYPE_PASSWORD_INFO +EphyPasswordManager +EphyPasswordManagerIface +ephy_password_info_new +ephy_password_info_copy +ephy_password_info_free +ephy_password_manager_get_type +ephy_password_manager_add_password +ephy_password_manager_remove_password +ephy_password_manager_remove_all_passwords +ephy_password_manager_list_passwords + +EPHY_PASSWORD_MANAGER +EPHY_IS_PASSWORD_MANAGER +EPHY_TYPE_PASSWORD_MANAGER +ephy_password_info_get_type +EPHY_PASSWORD_MANAGER_GET_IFACE +
+ +
+ephy-embed-persist +EphyEmbedPersistPrivate +EphyEmbedPersistFlags +EphyEmbedPersist +EphyEmbedPersist +ephy_embed_persist_get_type +ephy_embed_persist_save +ephy_embed_persist_cancel +ephy_embed_persist_set_dest +ephy_embed_persist_set_embed +ephy_embed_persist_set_fc_title +ephy_embed_persist_set_fc_parent +ephy_embed_persist_set_flags +ephy_embed_persist_set_max_size +ephy_embed_persist_set_persist_key +ephy_embed_persist_set_source +ephy_embed_persist_set_user_time +ephy_embed_persist_get_dest +ephy_embed_persist_get_embed +ephy_embed_persist_get_fc_title +ephy_embed_persist_get_fc_parent +ephy_embed_persist_get_flags +ephy_embed_persist_get_max_size +ephy_embed_persist_get_persist_key +ephy_embed_persist_get_source +ephy_embed_persist_get_user_time +ephy_embed_persist_to_string + +EPHY_EMBED_PERSIST +EPHY_IS_EMBED_PERSIST +EPHY_TYPE_EMBED_PERSIST +ephy_embed_persist_flags_get_type +EPHY_EMBED_PERSIST_CLASS +EPHY_IS_EMBED_PERSIST_CLASS +EPHY_EMBED_PERSIST_GET_CLASS +
+ +
+ephy-adblock +EPHY_ADBLOCK_IFACE +EPHY_IS_ADBLOCK_IFACE +AdUriCheckType +EphyAdBlock +EphyAdBlockIface +ephy_adblock_should_load +ephy_adblock_edit_rule + +EPHY_ADBLOCK +EPHY_IS_ADBLOCK +EPHY_TYPE_ADBLOCK +ephy_adblock_get_type +EPHY_ADBLOCK_GET_IFACE +
+ +
+ephy-embed-container +EPHY_EMBED_CONTAINER_IFACE +EPHY_IS_EMBED_CONTAINER_IFACE +EphyEmbedContainer +EphyEmbedContainerIface +ephy_embed_container_add_child +ephy_embed_container_set_active_child +ephy_embed_container_remove_child +ephy_embed_container_get_active_child +ephy_embed_container_get_children +ephy_embed_container_get_is_popup +ephy_embed_container_get_chrome + +EPHY_EMBED_CONTAINER +EPHY_IS_EMBED_CONTAINER +EPHY_TYPE_EMBED_CONTAINER +ephy_embed_container_get_type +EPHY_EMBED_CONTAINER_GET_IFACE +
+ +
+ephy-command-manager +EPHY_COMMAND_MANAGER_IFACE +EPHY_IS_COMMAND_MANAGER_IFACE +EphyCommandManager +EphyCommandManagerIface +ephy_command_manager_do_command +ephy_command_manager_can_do_command + +EPHY_COMMAND_MANAGER +EPHY_IS_COMMAND_MANAGER +EPHY_TYPE_COMMAND_MANAGER +ephy_command_manager_get_type +EPHY_COMMAND_MANAGER_GET_IFACE +
+ +
+ephy-permission-manager +EPHY_PERMISSION_MANAGER_IFACE +EPHY_IS_PERMISSION_MANAGER_IFACE +EPHY_TYPE_PERMISSION_INFO +EPT_COOKIE +EPT_IMAGE +EPT_POPUP +EphyPermission +EphyPermissionInfo +EphyPermissionManager +EphyPermissionManagerIface +ephy_permission_info_get_type +ephy_permission_info_new +ephy_permission_info_copy +ephy_permission_info_free +ephy_permission_manager_get_type +ephy_permission_manager_add_permission +ephy_permission_manager_remove_permission +ephy_permission_manager_clear_permissions +ephy_permission_manager_test_permission +ephy_permission_manager_list_permissions + +EPHY_PERMISSION_MANAGER +EPHY_IS_PERMISSION_MANAGER +EPHY_TYPE_PERMISSION_MANAGER +ephy_permission_get_type +EPHY_PERMISSION_MANAGER_GET_IFACE +
+ +
+gecko-embed-single +GeckoEmbedSinglePrivate +GeckoEmbedSingle +GeckoEmbedSingle +gecko_embed_single_get +gecko_embed_single_push_startup +gecko_embed_single_pop_startup + +GECKO_EMBED_SINGLE +GECKO_IS_EMBED_SINGLE +GECKO_TYPE_EMBED_SINGLE +gecko_embed_single_get_type +GECKO_EMBED_SINGLE_CLASS +GECKO_IS_EMBED_SINGLE_CLASS +GECKO_EMBED_SINGLE_GET_CLASS +
+ +
+gecko-embed +GeckoEmbedPrivate +GeckoEmbed +GeckoEmbed +gecko_embed_new +gecko_embed_load_url +gecko_embed_stop_load +gecko_embed_can_go_back +gecko_embed_can_go_forward +gecko_embed_go_back +gecko_embed_go_forward +gecko_embed_render_data +gecko_embed_open_stream +gecko_embed_append_data +gecko_embed_close_stream +gecko_embed_get_link_message +gecko_embed_get_js_status +gecko_embed_get_title +gecko_embed_get_location +gecko_embed_reload +gecko_embed_set_chrome_mask +gecko_embed_get_chrome_mask + +GECKO_EMBED +GECKO_IS_EMBED +GECKO_TYPE_EMBED +gecko_embed_get_type +GECKO_EMBED_CLASS +GECKO_IS_EMBED_CLASS +GECKO_EMBED_GET_CLASS +
+ +
+mozilla-embed-find +MozillaEmbedFindPrivate +MozillaEmbedFind +MozillaEmbedFind + +MOZILLA_EMBED_FIND +MOZILLA_IS_EMBED_FIND +MOZILLA_TYPE_EMBED_FIND +mozilla_embed_find_get_type +MOZILLA_EMBED_FIND_CLASS +MOZILLA_IS_EMBED_FIND_CLASS +MOZILLA_EMBED_FIND_GET_CLASS +
+ +
+mozilla-embed-event +MozillaEmbedEventPrivate +MozillaEmbedEvent +MozillaEmbedEvent +mozilla_embed_event_new +mozilla_embed_event_set_property + +MOZILLA_EMBED_EVENT +MOZILLA_IS_EMBED_EVENT +MOZILLA_TYPE_EMBED_EVENT +mozilla_embed_event_get_type +MOZILLA_EMBED_EVENT_CLASS +MOZILLA_IS_EMBED_EVENT_CLASS +MOZILLA_EMBED_EVENT_GET_CLASS +
+ +
+mozilla-embed-find +MozillaEmbedFindPrivate +MozillaEmbedFind +MozillaEmbedFind + +MOZILLA_EMBED_FIND +MOZILLA_IS_EMBED_FIND +MOZILLA_TYPE_EMBED_FIND +mozilla_embed_find_get_type +MOZILLA_EMBED_FIND_CLASS +MOZILLA_IS_EMBED_FIND_CLASS +MOZILLA_EMBED_FIND_GET_CLASS +
+ +
+mozilla-embed-event +MozillaEmbedEventPrivate +MozillaEmbedEvent +MozillaEmbedEvent +mozilla_embed_event_new +mozilla_embed_event_set_property + +MOZILLA_EMBED_EVENT +MOZILLA_IS_EMBED_EVENT +MOZILLA_TYPE_EMBED_EVENT +mozilla_embed_event_get_type +MOZILLA_EMBED_EVENT_CLASS +MOZILLA_IS_EMBED_EVENT_CLASS +MOZILLA_EMBED_EVENT_GET_CLASS +
+ +
+mozilla-x509-cert +MozillaX509CertPrivate +MozillaX509Cert +MozillaX509Cert +mozilla_x509_cert_new +mozilla_x509_cert_get_mozilla_cert + +MOZILLA_X509_CERT +MOZILLA_IS_X509_CERT +MOZILLA_TYPE_X509_CERT +mozilla_x509_cert_get_type +MOZILLA_X509_CERT_CLASS +MOZILLA_IS_X509_CERT_CLASS +MOZILLA_X509_CERT_GET_CLASS +
+ +
+webkit-embed-find +WebKitEmbedFindPrivate +WebKitEmbedFind +WebKitEmbedFind + +WEBKIT_EMBED_FIND +WEBKIT_IS_EMBED_FIND +WEBKIT_TYPE_EMBED_FIND +webkit_embed_find_get_type +WEBKIT_EMBED_FIND_CLASS +WEBKIT_IS_EMBED_FIND_CLASS +WEBKIT_EMBED_FIND_GET_CLASS +
+ +
+ephy-module +EphyModule +ephy_module_new +ephy_module_get_path +ephy_module_new_object + +EPHY_MODULE +EPHY_IS_MODULE +EPHY_TYPE_MODULE +ephy_module_get_type +EPHY_MODULE_CLASS +EPHY_IS_MODULE_CLASS +EPHY_MODULE_GET_CLASS +
+ +
+ephy-node-db +EphyNodeDb +EphyNodeDbPrivate +ephy_node_db_new +ephy_node_db_load_from_file +ephy_node_db_write_to_xml_safe +ephy_node_db_get_name +ephy_node_db_is_immutable +ephy_node_db_set_immutable +ephy_node_db_get_node_from_id + +EPHY_NODE_DB +EPHY_IS_NODE_DB +EPHY_TYPE_NODE_DB +ephy_node_db_get_type +EPHY_NODE_DB_CLASS +EPHY_IS_NODE_DB_CLASS +EPHY_NODE_DB_GET_CLASS +
+ +
+ephy-password-dialog +EphyPasswordDialogPrivate +EphyPasswordDialog +EphyPasswordDialog +EphyPasswordDialogFlags +EPHY_PASSWORD_DIALOG_FLAGS_DEFAULT +ephy_password_dialog_new +ephy_password_dialog_set_remember +ephy_password_dialog_get_remember +ephy_password_dialog_set_label +ephy_password_dialog_get_username_entry +ephy_password_dialog_get_username +ephy_password_dialog_set_username +ephy_password_dialog_get_domain +ephy_password_dialog_set_domain +ephy_password_dialog_get_password +ephy_password_dialog_set_password +ephy_password_dialog_get_new_password + +EPHY_PASSWORD_DIALOG +EPHY_IS_PASSWORD_DIALOG +EPHY_TYPE_PASSWORD_DIALOG +ephy_password_dialog_get_type +EPHY_PASSWORD_DIALOG_CLASS +EPHY_IS_PASSWORD_DIALOG_CLASS +EPHY_PASSWORD_DIALOG_GET_CLASS +
+ +
+ephy-shlib-loader +EphyShlibLoaderPrivate +EphyShlibLoader +EphyShlibLoader + +EPHY_SHLIB_LOADER +EPHY_IS_SHLIB_LOADER +EPHY_TYPE_SHLIB_LOADER +ephy_shlib_loader_get_type +EPHY_SHLIB_LOADER_CLASS +EPHY_IS_SHLIB_LOADER_CLASS +EPHY_SHLIB_LOADER_GET_CLASS +
+ +
+ephy-spell-check +EphySpellCheckPrivate +EphySpellCheck +EphySpellCheck +ephy_spell_check_get_default +ephy_spell_check_check_word +ephy_spell_check_get_suggestions +ephy_spell_check_free_suggestions +ephy_spell_check_set_language +ephy_spell_check_get_language + +EPHY_SPELL_CHECK +EPHY_IS_SPELL_CHECK +EPHY_TYPE_SPELL_CHECK +ephy_spell_check_get_type +EPHY_SPELL_CHECK_CLASS +EPHY_IS_SPELL_CHECK_CLASS +EPHY_SPELL_CHECK_GET_CLASS +
+ +
+ephy-loader +EPHY_LOADER_IFACE +EPHY_IS_LOADER_IFACE +EphyLoader +EphyLoaderIface +ephy_loader_type +ephy_loader_get_object +ephy_loader_release_object + +EPHY_LOADER +EPHY_IS_LOADER +EPHY_TYPE_LOADER +ephy_loader_get_type +EPHY_LOADER_GET_IFACE +
+ +
+ephy-icon-entry +EphyIconEntryPrivate +EphyIconEntry +EphyIconEntry +ephy_icon_entry_new +ephy_icon_entry_pack_widget +ephy_icon_entry_get_entry + +EPHY_ICON_ENTRY +EPHY_IS_ICON_ENTRY +EPHY_TYPE_ICON_ENTRY +ephy_icon_entry_get_type +EPHY_ICON_ENTRY_CLASS +EPHY_IS_ICON_ENTRY_CLASS +EPHY_ICON_ENTRY_GET_CLASS +
+ +
+ephy-spinner-tool-item +EphySpinnerToolItemDetails +EphySpinnerToolItem +EphySpinnerToolItem +ephy_spinner_tool_item_new +ephy_spinner_tool_item_set_spinning + +EPHY_SPINNER_TOOL_ITEM +EPHY_IS_SPINNER_TOOL_ITEM +EPHY_TYPE_SPINNER_TOOL_ITEM +ephy_spinner_tool_item_get_type +EPHY_SPINNER_TOOL_ITEM_CLASS +EPHY_IS_SPINNER_TOOL_ITEM_CLASS +EPHY_SPINNER_TOOL_ITEM_GET_CLASS +
+ +
+languages +
+ +
+ephy-activation +ephy_activation_load_uri_list +ephy_activation_load_session +ephy_activation_open_bookmarks_editor +
+ +
+ephy-python +ephy_python_init +ephy_python_shutdown +ephy_python_schedule_gc +
+ +
+ephy-action-helper +ephy_action_change_sensitivity_flags +
+ +
+ephy-bookmarks-ui +EPHY_BOOKMARKS_UI_ACTION_NAME_BUFFER_SIZE +EPHY_BOOKMARK_ACTION_NAME_BUFFER_SIZE +EPHY_BOOKMARK_ACTION_NAME_FORMAT +EPHY_BOOKMARK_ACTION_NAME_FORMAT_ARG +EPHY_BOOKMARK_ACTION_NAME_PRINTF +EPHY_BOOKMARK_ACTION_NAME_STRDUP_PRINTF +EPHY_TOPIC_ACTION_NAME_BUFFER_SIZE +EPHY_TOPIC_ACTION_NAME_FORMAT +EPHY_TOPIC_ACTION_NAME_FORMAT_ARG +EPHY_TOPIC_ACTION_NAME_PRINTF +EPHY_TOPIC_ACTION_NAME_STRDUP_PRINTF +EPHY_OPEN_TABS_ACTION_NAME_BUFFER_SIZE +EPHY_OPEN_TABS_ACTION_NAME_FORMAT +EPHY_OPEN_TABS_ACTION_NAME_FORMAT_ARG +EPHY_OPEN_TABS_ACTION_NAME_PRINTF +EPHY_OPEN_TABS_ACTION_NAME_STRDUP_PRINTF +ephy_bookmarks_ui_attach_window +ephy_bookmarks_ui_detach_window +ephy_bookmarks_ui_attach_toolbar_model +ephy_bookmarks_ui_detach_toolbar_model +ephy_bookmarks_ui_add_bookmark +ephy_bookmarks_ui_show_bookmark +
+ +
+ephy-topic-action-group +ephy_topic_action_group_new +
+ +
+ephy-bookmark-action-group +ephy_bookmark_group_new +
+ +
+ephy-nodes-cover +ephy_nodes_remove_covered +ephy_nodes_remove_not_covered +ephy_nodes_count_covered +ephy_nodes_covered +ephy_nodes_get_covered +ephy_nodes_get_covering +
+ +
+ephy-open-tabs-action +ephy_open_tabs_group_new +
+ +
+ephy-embed-factory +ephy_embed_factory_new_object +
+ +
+ephy-embed-utils +ephy_embed_utils_link_message_parse +ephy_embed_utils_get_title_composite +ephy_embed_utils_address_has_web_scheme +
+ +
+gecko-embed-types +GeckoEmbedProgressFlags +GeckoEmbedStatusEnum +GeckoEmbedReloadFlags +GeckoEmbedChromeFlags +
+ +
+gecko-dom-event +GECKO_TYPE_DOM_EVENT +GeckoDOMEvent +gecko_dom_event_get_type +gecko_dom_event_copy +gecko_dom_event_free +
+ +
+EmbedWindowCreator +
+ +
+gecko-init +gecko_init +gecko_init_with_profile +gecko_shutdown +
+ +
+GeckoBrowser +Init +Realize +Unrealize +Show +Hide +Resize +Destroy +SetURI +LoadCurrentURI +Reload +SetChromeMask +ApplyChromeMask +OpenStream +AppendToStream +CloseStream +ContentStateChange +ContentFinishedLoading +TopLevelFocusIn +TopLevelFocusOut +ChildFocusIn +ChildFocusOut +GetAtkObjectForCurrentDocument +GetListener +AttachListeners +DetachListeners +GetPIDOMWindow +
+ +
+GeckoSingle +
+ +
+gecko-embed-private +gecko_embed_get_nsIWebBrowser +gecko_embed_get_GeckoBrowser +
+ +
+gecko-dom-event-internal +gecko_dom_event_get_I +
+ +
+EmbedContentListener +Init +
+ +
+gecko-embed-single-private +nsModuleComponentInfo +gecko_embed_single_get_GeckoSingle +gecko_embed_single_set_directory_service_provider +gecko_embed_single_set_app_components +gecko_embed_single_create_window +
+ +
+EmbedProgress +Init +IsCurrentURI +
+ +
+gecko-embed-marshal +gecko_embed_marshal_BOOLEAN__BOXED +gecko_embed_marshal_BOOLEAN__POINTER +gecko_embed_marshal_BOOLEAN__STRING +gecko_embed_marshal_VOID__INT_INT +gecko_embed_marshal_VOID__INT_UINT +gecko_embed_marshal_VOID__OBJECT_UINT +gecko_embed_marshal_VOID__POINTER_INT_POINTER +gecko_embed_marshal_VOID__POINTER_UINT +gecko_embed_marshal_VOID__STRING_INT_INT +gecko_embed_marshal_VOID__STRING_INT_UINT +
+ +
+EmbedEventListener +HandleEvent +KeyUp +KeyPress +MouseDown +MouseUp +MouseClick +MouseDblClick +MouseOver +MouseOut +Activate +FocusIn +FocusOut +ContextMenu +Emit +
+ +
+gecko-embed-type-builtins +GECKO_TYPE_EMBED_PROGRESS_FLAGS +gecko_embed_progress_flags_get_type +GECKO_TYPE_EMBED_STATUS_ENUM +gecko_embed_status_enum_get_type +GECKO_TYPE_EMBED_RELOAD_FLAGS +gecko_embed_reload_flags_get_type +GECKO_TYPE_EMBED_CHROME_FLAGS +gecko_embed_chrome_flags_get_type +
+ +
+gecko-dom-event-private +GeckoDOMEvent +GECKO_DOM_EVENT_STATIC_INIT +GECKO_DOM_EVENT_STATIC_DEINIT +gecko_dom_event_new +
+ +
+gecko-init-private +gecko_reparent_to_offscreen +
+ +
+gecko-embed-signals +GeckoEmbedSignals +
+ +
+EmbedWindow +Init +CreateWindow +ReleaseChildren +
+ +
+gecko-init-internal +gecko_init_with_params +
+ +
+EphySingle +Init +Detach +IsOnline +EmitPermissionNotification +ExamineResponse +ExamineRequest +ExamineCookies +mozilla_cookie_to_ephy_cookie +mozilla_permission_to_ephy_permission +
+ +
+EphyFind +SetEmbed +SetFindProperties +SetSelectionAttention +Find +FindAgain +ActivateLink +
+ +
+EphyDirectoryProvider +
+ +
+GeckoCookiePromptService +EPHY_COOKIEPROMPTSERVICE_CID +EPHY_COOKIEPROMPTSERVICE_CLASSNAME +EPHY_COOKIEPROMPTSERVICE_CONTRACTID +
+ +
+GeckoPrintSession +GECKO_PRINT_SESSION_IID +GECKO_PRINT_SESSION_CLASSNAME +SetSettings +GetSourceFile +Cancel +StartPrinting +JobStatusChanged +JobDone +JobError +SetProgress +SetProgressText +LaunchJobOnIdle +DestroyJob +
+ +
+EphyContentPolicy +nsModuleComponentInfo +EPHY_CONTENT_POLICY_CONTRACTID +EPHY_CONTENT_POLICY_CLASSNAME +EPHY_CONTENT_POLICY_CID +
+ +
+EphyHistoryListener +EPHY_REDIRECTLISTENER_CID +EPHY_REDIRECTLISTENER_CLASSNAME +Init +
+ +
+GeckoPromptService +GECKO_PROMPT_SERVICE_CID +GECKO_PROMPT_SERVICE_CLASSNAME +
+ +
+EphyAboutModule +EPHY_ABOUT_MODULE_CID +EPHY_ABOUT_NETERROR_CONTRACTID +EPHY_ABOUT_NETERROR_CLASSNAME +EPHY_ABOUT_EPIPHANY_CONTRACTID +EPHY_ABOUT_EPIPHANY_CLASSNAME +EPHY_ABOUT_RECOVER_CONTRACTID +EPHY_ABOUT_RECOVER_CLASSNAME +Redirect +ParseURL +GetErrorMessage +CreateErrorPage +CreateRecoverPage +WritePage +Write +
+ +
+GtkNSSSecurityWarningDialogs +GTK_NSSSECURITYWARNINGDIALOGS_CLASSNAME +GTK_NSSSECURITYWARNINGDIALOGS_CID +DoDialog +
+ +
+EphyRedirectChannel +NS_FORWARD_NSIREQUEST +
+ +
+GeckoPrintService +GECKO_PRINT_SERVICE_IID +GECKO_PRINT_SERVICE_CLASSNAME +PrintUnattended +
+ +
+GeckoSpellCheckEngine +GECKO_SPELL_CHECK_ENGINE_IID +GECKO_SPELL_CHECK_ENGINE_CONTRACTID +GECKO_SPELL_CHECK_ENGINE_CLASSNAME +
+ +
+EphySidebar +nsModuleComponentInfo +EPHY_SIDEBAR_CLASSNAME +EPHY_SIDEBAR_CID +
+ +
+GeckoFormSigningDialog +GECKO_FORMSIGNINGDIALOGS_CID +GECKO_FORMSIGNINGDIALOGS_CLASSNAME +
+ +
+ggeAutoSurvivalArea +
+ +
+GeckoUtils +GetGeckoEmbedForDOMWindow +GetGtkWindowForDOMWindow +
+ +
+EphyUtils +GetIOService +NewURI +NewFileURI +FindEmbed +FindGtkParent +ConvertUTF16toUTF8 +IsCalledFromScript +
+ +
+AutoJSContextStack +JSContext +Init +
+ +
+EphyBadCertRejector +
+ +
+ggeAutoModalDialog +ShouldShow +Response +
+ +
+AutoWindowModalState +
+ +
+GeckoCookiePromptService +EPHY_COOKIEPROMPTSERVICE_CID +EPHY_COOKIEPROMPTSERVICE_CLASSNAME +EPHY_COOKIEPROMPTSERVICE_CONTRACTID +
+ +
+EphyUtils +GetIOService +NewURI +NewFileURI +FindEmbed +FindGtkParent +ConvertUTF16toUTF8 +IsCalledFromScript +
+ +
+GeckoPrintSession +GECKO_PRINT_SESSION_IID +GECKO_PRINT_SESSION_CLASSNAME +SetSettings +GetSourceFile +Cancel +StartPrinting +JobStatusChanged +JobDone +JobError +SetProgress +SetProgressText +LaunchJobOnIdle +DestroyJob +
+ +
+AutoJSContextStack +JSContext +Init +
+ +
+EphyBadCertRejector +
+ +
+EphySingle +Init +Detach +IsOnline +EmitPermissionNotification +ExamineResponse +ExamineRequest +ExamineCookies +mozilla_cookie_to_ephy_cookie +mozilla_permission_to_ephy_permission +
+ +
+EphyContentPolicy +nsModuleComponentInfo +EPHY_CONTENT_POLICY_CONTRACTID +EPHY_CONTENT_POLICY_CLASSNAME +EPHY_CONTENT_POLICY_CID +
+ +
+EphyFind +SetEmbed +SetFindProperties +SetSelectionAttention +Find +FindAgain +ActivateLink +
+ +
+EphyHistoryListener +EPHY_REDIRECTLISTENER_CID +EPHY_REDIRECTLISTENER_CLASSNAME +Init +
+ +
+EphyAboutModule +EPHY_ABOUT_MODULE_CID +EPHY_ABOUT_NETERROR_CONTRACTID +EPHY_ABOUT_NETERROR_CLASSNAME +EPHY_ABOUT_EPIPHANY_CONTRACTID +EPHY_ABOUT_EPIPHANY_CLASSNAME +EPHY_ABOUT_RECOVER_CONTRACTID +EPHY_ABOUT_RECOVER_CLASSNAME +Redirect +ParseURL +GetErrorMessage +CreateErrorPage +CreateRecoverPage +WritePage +Write +
+ +
+GtkNSSSecurityWarningDialogs +GTK_NSSSECURITYWARNINGDIALOGS_CLASSNAME +GTK_NSSSECURITYWARNINGDIALOGS_CID +DoDialog +
+ +
+EphyRedirectChannel +NS_FORWARD_NSIREQUEST +
+ +
+GeckoPrintService +GECKO_PRINT_SERVICE_IID +GECKO_PRINT_SERVICE_CLASSNAME +PrintUnattended +
+ +
+GeckoSpellCheckEngine +GECKO_SPELL_CHECK_ENGINE_IID +GECKO_SPELL_CHECK_ENGINE_CONTRACTID +GECKO_SPELL_CHECK_ENGINE_CLASSNAME +
+ +
+AutoWindowModalState +
+ +
+EphySidebar +nsModuleComponentInfo +EPHY_SIDEBAR_CLASSNAME +EPHY_SIDEBAR_CID +
+ +
+EphyDirectoryProvider +
+ +
+GeckoFormSigningDialog +GECKO_FORMSIGNINGDIALOGS_CID +GECKO_FORMSIGNINGDIALOGS_CLASSNAME +
+ +
+EphyPromptService +EPHY_PROMPT_SERVICE_IID +EPHY_PROMPT_SERVICE_CLASSNAME +
+ +
+ephy-time-helpers +eel_strdup_strftime +ephy_time_helpers_utf_friendly_time +
+ +
+ephy-object-helpers +ephy_object_idle_unref +
+ +
+ephy-glib-compat +g_timeout_add_seconds +
+ +
+ephy-signal-accumulator +ephy_signal_accumulator_object +ephy_signal_accumulator_string +
+ +
+ephy-print-utils +ephy_print_utils_page_setup_new_from_file +ephy_print_utils_page_setup_new_from_key_file +ephy_print_utils_page_setup_to_file +ephy_print_utils_page_setup_to_key_file +
+ +
+ephy-lib-type-builtins +EPHY_TYPE_NODE_SIGNAL_TYPE +ephy_node_signal_type_get_type +EPHY_TYPE_PASSWORD_DIALOG_FLAGS +ephy_password_dialog_flags_get_type +EPHY_TYPE_STATE_WINDOW_FLAGS +ephy_state_window_flags_get_type +
+ +
+stamp-ephy-lib-type-builtins +
+ +
+stamp-ephy-marshal +
+ +
+stamp-eggmarshalers +
+ +
+eggtypebuiltins +EGG_TYPE_TB_MODEL_FLAGS +egg_tb_model_flags_get_type +EGG_TYPE_TB_MODEL_NAME_FLAGS +egg_tb_model_name_flags_get_type +
+ +
+stamp-eggtypebuiltins +
+ +
+ephy-embed-type-builtins +EPHY_TYPE_URI_CHECK_TYPE +ad_uri_check_type_get_type +EPHY_TYPE_EMBED_NET_STATE +ephy_embed_net_state_get_type +EPHY_TYPE_EMBED_CHROME +ephy_embed_chrome_get_type +EPHY_TYPE_EMBED_LOAD_FLAGS +ephy_embed_load_flags_get_type +EPHY_TYPE_EMBED_PRINT_PREVIEW_NAV_TYPE +ephy_embed_print_preview_nav_type_get_type +EPHY_TYPE_EMBED_SECURITY_LEVEL +ephy_embed_security_level_get_type +EPHY_TYPE_EMBED_DOCUMENT_TYPE +ephy_embed_document_type_get_type +EPHY_TYPE_EMBED_NAVIGATION_FLAGS +ephy_embed_navigation_flags_get_type +EPHY_TYPE_EMBED_ADDRESS_EXPIRE +ephy_embed_address_expire_get_type +EPHY_TYPE_EMBED_EVENT_CONTEXT +ephy_embed_event_context_get_type +EPHY_TYPE_EMBED_PERSIST_FLAGS +ephy_embed_persist_flags_get_type +EPHY_TYPE_PERMISSION +ephy_permission_get_type +
+ +
+stamp-ephy-embed-type-builtins +
+ +
+ephy-type-builtins +EPHY_TYPE_DBUS_BUS +ephy_dbus_bus_get_type +EPHY_TYPE_LINK_FLAGS +ephy_link_flags_get_type +EPHY_TYPE_SESSION_COMMAND +ephy_session_command_get_type +EPHY_TYPE_NEW_TAB_FLAGS +ephy_new_tab_flags_get_type +EPHY_TYPE_NAVIGATION_DIRECTION +ephy_navigation_direction_get_type +
+ +
+stamp-ephy-type-builtins +
+ +
+ephy-dbus-client-bindings +org_gnome_Epiphany_load_session +org_gnome_Epiphany_load_session_reply +org_gnome_Epiphany_load_session_async +dbus_g_proxy_begin_call +org_gnome_Epiphany_load_ur_ilist +org_gnome_Epiphany_load_ur_ilist_reply +org_gnome_Epiphany_load_ur_ilist_async +org_gnome_Epiphany_open_bookmarks_editor +org_gnome_Epiphany_open_bookmarks_editor_reply +org_gnome_Epiphany_open_bookmarks_editor_async +
+ +
+stamp-ephy-dbus-client-bindings +
+ +
+ephy-dbus-server-bindings +g_marshal_value_peek_boolean +g_marshal_value_peek_char +g_marshal_value_peek_uchar +g_marshal_value_peek_int +g_marshal_value_peek_uint +g_marshal_value_peek_long +g_marshal_value_peek_ulong +g_marshal_value_peek_int64 +g_marshal_value_peek_uint64 +g_marshal_value_peek_enum +g_marshal_value_peek_flags +g_marshal_value_peek_float +g_marshal_value_peek_double +g_marshal_value_peek_string +g_marshal_value_peek_param +g_marshal_value_peek_boxed +g_marshal_value_peek_pointer +g_marshal_value_peek_object +dbus_glib_marshal_ephy_activation_BOOLEAN__STRING_UINT_POINTER +dbus_glib_marshal_ephy_activation_BOOLEAN__BOXED_STRING_UINT_POINTER +dbus_glib_marshal_ephy_activation_BOOLEAN__UINT_POINTER +
+ +
+stamp-ephy-dbus-server-bindings +
+ +
+ephy-bookmarks-type-builtins +EPHY_TYPE_BOOKMARK_PROPERTY +ephy_bookmark_property_get_type +
+ +
+stamp-ephy-bookmarks-type-builtins +
+ --- epiphany-browser-2.21.4.orig/doc/reference/html.stamp +++ epiphany-browser-2.21.4/doc/reference/html.stamp @@ -0,0 +1 @@ +timestamp --- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-EphyEmbedSingle.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-EphyEmbedSingle.html @@ -3,12 +3,12 @@ EphyEmbedSingle - + - + @@ -22,16 +22,16 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description
@@ -43,12 +43,12 @@ -void ephy_embed_single_clear_cache (EphyEmbedSingle *single); -void ephy_embed_single_clear_auth_cache (EphyEmbedSingle *single); -GList* ephy_embed_single_get_font_list (EphyEmbedSingle *single, +void ephy_embed_single_clear_cache (EphyEmbedSingle *single); +void ephy_embed_single_clear_auth_cache (EphyEmbedSingle *single); +GList* ephy_embed_single_get_font_list (EphyEmbedSingle *single, const char *lang_group); -GtkWidget* ephy_embed_single_open_window (EphyEmbedSingle *single, - EphyEmbed *parent, +GtkWidget* ephy_embed_single_open_window (EphyEmbedSingle *single, + EphyEmbed *parent, const char *address, const char *name, const char *features); @@ -56,7 +56,7 @@
-

Description

+

Description

While Epiphany is running, its global embed_shell variable (an EphyEmbedShell) holds a reference to an EphyEmbedSingle. The only class which implements @@ -66,7 +66,7 @@

-

Example 2. Acquiring an EphyEmbedSingle

+

Example 2. Acquiring an EphyEmbedSingle

#include <ephy-embed-shell.h>
 #include <ephy-embed-single.h>
 
@@ -81,15 +81,15 @@
 

 Since there is only one EphyEmbedShell, there is only one EphyEmbedSingle. It
 is used to perform browser-related actions which do not refer to an individual
-EphyEmbed.
+EphyEmbed.
-

Details

+

Details

-

+

ephy_embed_single_clear_cache ()

-
void                ephy_embed_single_clear_cache       (EphyEmbedSingle *single);
+
void                ephy_embed_single_clear_cache       (EphyEmbedSingle *single);

Clears the Mozilla cache (temporarily saved web pages).

@@ -98,7 +98,7 @@

-EphyEmbedSingle +EphyEmbedSingle

EphyEmbedSingle — An interface to the global embedded browser
- + @@ -106,9 +106,9 @@
-

+

ephy_embed_single_clear_auth_cache ()

-
void                ephy_embed_single_clear_auth_cache  (EphyEmbedSingle *single);
+
void                ephy_embed_single_clear_auth_cache  (EphyEmbedSingle *single);

Clears the Mozilla HTTP authentication cache.

@@ -126,7 +126,7 @@
single :

single :

 the EphyEmbedSingle
- + @@ -134,9 +134,9 @@
-

+

ephy_embed_single_get_font_list ()

-
GList*              ephy_embed_single_get_font_list     (EphyEmbedSingle *single,
+
GList*              ephy_embed_single_get_font_list     (EphyEmbedSingle *single,
                                                          const char *lang_group);

 

 Returns the list of fonts matching lang_group, or all fonts if lang_group
@@ -152,17 +152,17 @@
- + - + - + @@ -171,10 +171,10 @@
-

+

ephy_embed_single_open_window ()

-
GtkWidget*          ephy_embed_single_open_window       (EphyEmbedSingle *single,
-                                                         EphyEmbed *parent,
+
GtkWidget*          ephy_embed_single_open_window       (EphyEmbedSingle *single,
+                                                         EphyEmbed *parent,
                                                          const char *address,
                                                          const char *name,
                                                          const char *features);

@@ -189,36 +189,36 @@
- + - - + - + - + - + - - + @@ -226,6 +226,11 @@
single :

single :

 the EphyEmbedSingle
single :

single :

 the EphyEmbedSingle
lang_group :

lang_group :

 a mozilla font language group name, or NULL
Returns :

Returns :

 a list of font names
single :

single :

 the EphyEmbedSingle
parent : the requested window's parent EphyEmbed +

parent :

 the requested window's parent EphyEmbed
address :

address :

 the URL to load
name :

name :

 a name for the window
features :

features :

 a Javascript features string
Returns : the new embed. This is either a EphyEmbed, or, when features specified +

Returns :

 the new embed. This is either a EphyEmbed, or, when features specified "chrome", a GtkMozEmbed. -NOTE: Use ephy_shell_new_tab() unless this handling of the features string is +NOTE: Use ephy_shell_new_tab() unless this handling of the features string is required.
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/EphyTab.html +++ epiphany-browser-2.21.4/doc/reference/html/EphyTab.html @@ -3,12 +3,12 @@ EphyTab - + - + @@ -22,22 +22,22 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description  |  - Object Hierarchy + Object Hierarchy  |  - Implemented Interfaces + Implemented Interfaces  |  - Properties + Properties
@@ -49,23 +49,23 @@ - EphyTab; -EphyTab* ephy_tab_new (void); -EphyEmbed* ephy_tab_get_embed (EphyTab *tab); -EphyTab* ephy_tab_for_embed (EphyEmbed *embed); -const char* ephy_tab_get_icon_address (EphyTab *tab); -EphyEmbedSecurityLevel ephy_tab_get_security_level (EphyTab *tab); -const char* ephy_tab_get_title (EphyTab *tab); -float ephy_tab_get_zoom (EphyTab *tab); -gboolean ephy_tab_get_load_status (EphyTab *tab); -int ephy_tab_get_load_percent (EphyTab *tab); -const char* ephy_tab_get_link_message (EphyTab *tab); -const char* ephy_tab_get_status_message (EphyTab *tab); + EphyTab; +EphyTab* ephy_tab_new (void); +EphyEmbed* ephy_tab_get_embed (EphyTab *tab); +EphyTab* ephy_tab_for_embed (EphyEmbed *embed); +const char* ephy_tab_get_icon_address (EphyTab *tab); +EphyEmbedSecurityLevel ephy_tab_get_security_level (EphyTab *tab); +const char* ephy_tab_get_title (EphyTab *tab); +float ephy_tab_get_zoom (EphyTab *tab); +gboolean ephy_tab_get_load_status (EphyTab *tab); +int ephy_tab_get_load_percent (EphyTab *tab); +const char* ephy_tab_get_link_message (EphyTab *tab); +const char* ephy_tab_get_status_message (EphyTab *tab);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
@@ -78,59 +78,59 @@
-

Implemented Interfaces

+

Implemented Interfaces

EphyTab implements AtkImplementorIface, GtkBuildable and EphyLink.

-

Properties

+

Properties

 
-  "address"                  gchararray            : Read
-  "document-type"            EphyEmbedDocumentType  : Read
-  "hidden-popup-count"       gint                  : Read
-  "icon"                     GdkPixbuf             : Read
-  "icon-address"             gchararray            : Read / Write
-  "load-progress"            gint                  : Read
-  "load-status"              gboolean              : Read
-  "message"                  gchararray            : Read
-  "navigation"               EphyTabNavigationFlags  : Read
-  "popups-allowed"           gboolean              : Read / Write
-  "security-level"           EphyEmbedSecurityLevel  : Read
-  "title"                    gchararray            : Read
-  "typed-address"            gchararray            : Read / Write
-  "visibility"               gboolean              : Read
-  "zoom"                     gfloat                : Read
+  "address"                  gchararray            : Read
+  "document-type"            EphyEmbedDocumentType  : Read
+  "hidden-popup-count"       gint                  : Read
+  "icon"                     GdkPixbuf             : Read
+  "icon-address"             gchararray            : Read / Write
+  "load-progress"            gint                  : Read
+  "load-status"              gboolean              : Read
+  "message"                  gchararray            : Read
+  "navigation"               EphyTabNavigationFlags  : Read
+  "popups-allowed"           gboolean              : Read / Write
+  "security-level"           EphyEmbedSecurityLevel  : Read
+  "title"                    gchararray            : Read
+  "typed-address"            gchararray            : Read / Write
+  "visibility"               gboolean              : Read
+  "zoom"                     gfloat                : Read
-

Description

+

Description

-Each EphyWindow contains a GtkNotebook which holds one or more EphyTab:s. -An EphyTab is basically a container for an EphyEmbed. +Each EphyWindow contains a GtkNotebook which holds one or more EphyTab:s. +An EphyTab is basically a container for an EphyEmbed.

-To retrieve an EphyTab's parent EphyWindow, use gtk_widget_get_toplevel(). +To retrieve an EphyTab's parent EphyWindow, use gtk_widget_get_toplevel().

-

Details

+

Details

-

+

EphyTab

-
typedef struct _EphyTab EphyTab;
+
typedef struct _EphyTab EphyTab;

-

+

ephy_tab_new ()

-
EphyTab*            ephy_tab_new                        (void);
+
EphyTab*            ephy_tab_new                        (void);

-Equivalent to g_object_new(), but returns an EphyTab so you don't have to +Equivalent to g_object_new(), but returns an EphyTab so you don't have to cast it.

@@ -138,19 +138,19 @@

-EphyTab +EphyTab

EphyTab — Represents an Epiphany tab
- - +
Returns : a new EphyTab +

Returns :

 a new EphyTab
-

+

ephy_tab_get_embed ()

-
EphyEmbed*          ephy_tab_get_embed                  (EphyTab *tab);
+
EphyEmbed*          ephy_tab_get_embed                  (EphyTab *tab);

-Returns tab's EphyEmbed.

+Returns tab's EphyEmbed.

@@ -158,13 +158,13 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : - tab's EphyEmbed +

Returns :

+ tab's EphyEmbed @@ -172,11 +172,11 @@
-

+

ephy_tab_for_embed ()

-
EphyTab*            ephy_tab_for_embed                  (EphyEmbed *embed);
+
EphyTab*            ephy_tab_for_embed                  (EphyEmbed *embed);

-Returns the EphyTab which holds embed.

+Returns the EphyTab which holds embed.

@@ -184,13 +184,13 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : - the EphyTab which holds embed +

Returns :

+ the EphyTab which holds embed @@ -198,9 +198,9 @@
-

+

ephy_tab_get_icon_address ()

-
const char*         ephy_tab_get_icon_address           (EphyTab *tab);
+
const char*         ephy_tab_get_icon_address           (EphyTab *tab);

Returns a URL which points to tab's site icon.

@@ -210,12 +210,12 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : +

Returns :

the URL of tab's site icon @@ -224,9 +224,9 @@
-

+

ephy_tab_get_security_level ()

-
EphyEmbedSecurityLevel ephy_tab_get_security_level      (EphyTab *tab);
+
EphyEmbedSecurityLevel ephy_tab_get_security_level      (EphyTab *tab);

Returns the security level of the webpage loaded in tab.

@@ -236,12 +236,12 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : +

Returns :

tab's loaded page's security level @@ -250,9 +250,9 @@
-

+

ephy_tab_get_title ()

-
const char*         ephy_tab_get_title                  (EphyTab *tab);
+
const char*         ephy_tab_get_title                  (EphyTab *tab);

Returns the title of the web page loaded in tab.

@@ -262,12 +262,12 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : +

Returns :

tab's loaded web page's title. Will never be NULL. @@ -276,9 +276,9 @@
-

+

ephy_tab_get_zoom ()

-
float               ephy_tab_get_zoom                   (EphyTab *tab);
+
float               ephy_tab_get_zoom                   (EphyTab *tab);

Returns the zoom level of the web page loaded in tab. A return value of 1.0 corresponds to 100% zoom (normal size).

@@ -289,12 +289,12 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : +

Returns :

tab's loaded page's zoom level @@ -303,9 +303,9 @@
-

+

ephy_tab_get_load_status ()

-
gboolean            ephy_tab_get_load_status            (EphyTab *tab);
+
gboolean            ephy_tab_get_load_status            (EphyTab *tab);

Returns whether the web page in tab has finished loading. A web page is only finished loading after all images, styles, and other dependencies have @@ -317,12 +317,12 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : +

Returns :

TRUE if the page is still loading, FALSE if complete @@ -331,9 +331,9 @@
-

+

ephy_tab_get_load_percent ()

-
int                 ephy_tab_get_load_percent           (EphyTab *tab);
+
int                 ephy_tab_get_load_percent           (EphyTab *tab);

Returns the page load percentage (displayed in the progressbar).

@@ -343,12 +343,12 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : +

Returns :

a percentage from 0 to 100. @@ -357,11 +357,11 @@
-

+

ephy_tab_get_link_message ()

-
const char*         ephy_tab_get_link_message           (EphyTab *tab);
+
const char*         ephy_tab_get_link_message           (EphyTab *tab);

-Returns the message displayed in tab's EphyWindow's EphyStatusbar when +Returns the message displayed in tab's EphyWindow's EphyStatusbar when the user hovers the mouse over a hyperlink.

@@ -369,7 +369,7 @@ g_strdup() if it must be stored.

-Listen to the "link_message" signal on the tab's EphyEmbed to be notified +Listen to the "link_message" signal on the tab's EphyEmbed to be notified when the link message changes.

@@ -378,12 +378,12 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : +

Returns :

The current link statusbar message @@ -392,14 +392,14 @@
-

+

ephy_tab_get_status_message ()

-
const char*         ephy_tab_get_status_message         (EphyTab *tab);
+
const char*         ephy_tab_get_status_message         (EphyTab *tab);

-Returns the message displayed in tab's EphyWindow's +Returns the message displayed in tab's EphyWindow's EphyStatusbar. If the user is hovering the mouse over a hyperlink, this function will return the same value as -ephy_tab_get_link_message(). Otherwise, it will return a network +ephy_tab_get_link_message(). Otherwise, it will return a network status message, or NULL.

@@ -415,12 +415,12 @@ -tab : - an EphyTab +

tab :

+ an EphyTab -Returns : +

Returns :

The current statusbar message @@ -429,123 +429,123 @@
-

Property Details

+

Property Details

-

+

The "address" property

-
  "address"                  gchararray            : Read
+
  "address"                  gchararray            : Read

The tab's address.

Default value: ""

-

+

The "document-type" property

-
  "document-type"            EphyEmbedDocumentType  : Read
+
  "document-type"            EphyEmbedDocumentType  : Read

The tab's documen type.

Default value: EPHY_EMBED_DOCUMENT_HTML

-

+

The "hidden-popup-count" property

-
  "hidden-popup-count"       gint                  : Read
+
  "hidden-popup-count"       gint                  : Read

The tab's number of blocked popup windows.

Allowed values: >= 0

Default value: 0

-

+

The "icon" property

-
  "icon"                     GdkPixbuf             : Read
+
  "icon"                     GdkPixbuf             : Read

The tab icon's.

-

+

The "icon-address" property

-
  "icon-address"             gchararray            : Read / Write
+
  "icon-address"             gchararray            : Read / Write

The tab icon's address.

Default value: NULL

-

+

The "load-progress" property

-
  "load-progress"            gint                  : Read
+
  "load-progress"            gint                  : Read

The tab's load progress in percent.

Allowed values: [0,100]

Default value: 0

-

+

The "load-status" property

-
  "load-status"              gboolean              : Read
+
  "load-status"              gboolean              : Read

The tab's load status.

Default value: FALSE

-

+

The "message" property

-
  "message"                  gchararray            : Read
+
  "message"                  gchararray            : Read

The tab's statusbar message.

Default value: NULL

-

+

The "navigation" property

-
  "navigation"               EphyTabNavigationFlags  : Read
+
  "navigation"               EphyTabNavigationFlags  : Read

The tab's navigation flags.

-

+

The "popups-allowed" property

-
  "popups-allowed"           gboolean              : Read / Write
+
  "popups-allowed"           gboolean              : Read / Write

Whether popup windows are to be displayed.

Default value: FALSE

-

+

The "security-level" property

-
  "security-level"           EphyEmbedSecurityLevel  : Read
+
  "security-level"           EphyEmbedSecurityLevel  : Read

The tab's security level.

Default value: EPHY_EMBED_STATE_IS_UNKNOWN

-

+

The "title" property

-
  "title"                    gchararray            : Read
+
  "title"                    gchararray            : Read

The tab's title.

Default value: "Blank page"

-

+

The "typed-address" property

-
  "typed-address"            gchararray            : Read / Write
+
  "typed-address"            gchararray            : Read / Write

The typed address.

Default value: ""

-

+

The "visibility" property

-
  "visibility"               gboolean              : Read
+
  "visibility"               gboolean              : Read

The tab's visibility.

Default value: TRUE

-

+

The "zoom" property

-
  "zoom"                     gfloat                : Read
+
  "zoom"                     gfloat                : Read

The tab's zoom.

Allowed values: [0.707107,4]

Default value: 1

--- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-EphyPermissionManager.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-EphyPermissionManager.html @@ -3,12 +3,12 @@ EphyPermissionManager - + - + @@ -22,16 +22,16 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description
@@ -43,14 +43,14 @@ - EphyPermissionInfo; -enum EphyPermission; -void ephy_permission_info_free (EphyPermissionInfo *info); + EphyPermissionInfo; +enum EphyPermission; +void ephy_permission_info_free (EphyPermissionInfo *info);
-

Description

+

Description

The EphyPermissionManager keeps a list of websites and their permissions. For example, the user may want a certain website to display images but block @@ -61,7 +61,7 @@ Use ephy_permission_manager_add() to set permissions for a website, ephy_permission_manager_remove() to remove the permissions, and ephy_permission_manager_test() to test them. Note that -ephy_permission_manager_test() may return EPHY_PERMISSION_DEFAULT, which +ephy_permission_manager_test() may return EPHY_PERMISSION_DEFAULT, which means the caller might need to find the default permission some other way.

@@ -81,15 +81,15 @@ Though the word "host" is used in many function descriptions, Mozilla does not act as one would expect. Always pass a URL to any functions which need have a "host" parameter. However, the "host" in an -EphyPermissionInfo is a simple DNS hostname. +EphyPermissionInfo is a simple DNS hostname.

-

Details

+

Details

-

+

EphyPermissionInfo

-
typedef struct {
+
typedef struct {
 	char *host;
 	GQuark qtype;
 	EphyPermission permission;
@@ -102,18 +102,18 @@
- + - + - - + @@ -122,9 +122,9 @@
-

+

enum EphyPermission

-
typedef enum
+
typedef enum
 {
 	EPHY_PERMISSION_ALLOWED,
 	EPHY_PERMISSION_DENIED,
@@ -138,19 +138,19 @@
- + - + - + - + Implemented Interfaces

-EphyPermissionManager +EphyPermissionManager

EphyPermissionManager — Sets webpages' cookie, image and popup permissions.
char *host;

char *host;

 The hostname of the website to which this permission applies.
GQuark qtype;

GQuark qtype;
EphyPermission permission;An EphyPermission (either allow or deny). +

EphyPermission permission;

An EphyPermission (either allow or deny).
EPHY_PERMISSION_ALLOWED

EPHY_PERMISSION_ALLOWED

 The website is unconditionally allowed to perform the desired action.
EPHY_PERMISSION_DENIED

EPHY_PERMISSION_DENIED

 The website is unconditionally denied to perform the desired action.
EPHY_PERMISSION_DEFAULT

EPHY_PERMISSION_DEFAULT

 The user has not set a preference for this particular website; the caller should therefore fall back to default settings. @@ -162,9 +162,9 @@
-

+

ephy_permission_info_free ()

-
void                ephy_permission_info_free           (EphyPermissionInfo *info);
+
void                ephy_permission_info_free           (EphyPermissionInfo *info);

Frees info.

@@ -173,13 +173,18 @@

- - +
info : an EphyPermissionInfo +

info :

 an EphyPermissionInfo
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/index.html +++ epiphany-browser-2.21.4/doc/reference/html/index.html @@ -3,10 +3,10 @@ Epiphany Reference Manual - + - + --- epiphany-browser-2.21.4.orig/doc/reference/html/EphyWindow.html +++ epiphany-browser-2.21.4/doc/reference/html/EphyWindow.html @@ -3,12 +3,12 @@ EphyWindow - + - + @@ -22,20 +22,20 @@ 		Epiphany Reference Manual Next
Top +
Top  |  - Description + Description  |  - Object Hierarchy + Object Hierarchy  |  - Implemented Interfaces
@@ -47,23 +47,23 @@ - EphyWindow; -EphyWindow* ephy_window_new (void); -EphyWindow* ephy_window_new_with_chrome (EphyEmbedChrome chrome, + EphyWindow; +EphyWindow* ephy_window_new (void); +EphyWindow* ephy_window_new_with_chrome (EphyEmbedChrome chrome, gboolean is_popup); -GtkWidget* ephy_window_get_notebook (EphyWindow *window); -GtkWidget* ephy_window_get_toolbar (EphyWindow *window); -GtkWidget* ephy_window_get_statusbar (EphyWindow *window); -void ephy_window_set_zoom (EphyWindow *window, +GtkWidget* ephy_window_get_notebook (EphyWindow *window); +GtkWidget* ephy_window_get_toolbar (EphyWindow *window); +GtkWidget* ephy_window_get_statusbar (EphyWindow *window); +void ephy_window_set_zoom (EphyWindow *window, float zoom); -void ephy_window_activate_location (EphyWindow *window); -void ephy_window_load_url (EphyWindow *window, +void ephy_window_activate_location (EphyWindow *window); +void ephy_window_load_url (EphyWindow *window, const char *url);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
@@ -77,58 +77,48 @@
-

Implemented Interfaces

+

Implemented Interfaces

EphyWindow implements AtkImplementorIface, GtkBuildable, EphyLink and EphyEmbedContainer.

-

Description

+

Description

-An EphyWindow is what the user sees when opening Epiphany. Think of each -EphyWindow as a giant container which holds many useful items: +An EphyWindow is what the user sees when opening Epiphany. Think of each +EphyWindow as a giant container which holds many useful items:

-You can also perform simple manipulations of an EphyWindow's active EphyEmbed. -These are restricted to ephy_window_set_zoom() and ephy_window_load_url(). +You can also perform simple manipulations of an EphyWindow's active EphyEmbed. +These are restricted to ephy_window_set_zoom() and ephy_window_load_url().

-

Details

+

Details

-

+

EphyWindow

-
typedef struct _EphyWindow EphyWindow;
+
typedef struct _EphyWindow EphyWindow;

-

+

ephy_window_new ()

-
EphyWindow*         ephy_window_new                     (void);
+
EphyWindow*         ephy_window_new                     (void);

-Equivalent to g_object_new() but returns an EphyWindow so you don't have +Equivalent to g_object_new() but returns an EphyWindow so you don't have to cast it.

@@ -136,20 +126,20 @@

-EphyWindow +EphyWindow

EphyWindow — Represents an Epiphany window.
- - +
Returns : a new EphyWindow +

Returns :

 a new EphyWindow
-

+

ephy_window_new_with_chrome ()

-
EphyWindow*         ephy_window_new_with_chrome         (EphyEmbedChrome chrome,
+
EphyWindow*         ephy_window_new_with_chrome         (EphyEmbedChrome chrome,
                                                          gboolean is_popup);

 

-Identical to ephy_window_new(), but allows you to specify a chrome.

+Identical to ephy_window_new(), but allows you to specify a chrome.

 

 
 

@@ -157,18 +147,18 @@
 
 
 
-chrome :
- an EphyEmbedChrome
+
chrome :

+ an EphyEmbedChrome
 
 
 
-is_popup :
+
is_popup :

  whether the new window is a popup window
 
 
 
-Returns :
- a new EphyWindow
+
Returns :

+ a new EphyWindow
 
 
 
@@ -176,9 +166,9 @@
-

+

ephy_window_get_notebook ()

-
GtkWidget*          ephy_window_get_notebook            (EphyWindow *window);
+
GtkWidget*          ephy_window_get_notebook            (EphyWindow *window);

Returns the GtkNotebook used by this window.

@@ -188,12 +178,12 @@ -window : - an EphyWindow +

window :

+ an EphyWindow -Returns : +

Returns :

the window's GtkNotebook @@ -202,9 +192,9 @@
-

+

ephy_window_get_toolbar ()

-
GtkWidget*          ephy_window_get_toolbar             (EphyWindow *window);
+
GtkWidget*          ephy_window_get_toolbar             (EphyWindow *window);

Returns this window's toolbar as an EggEditableToolbar.

@@ -214,12 +204,12 @@ -window : - an EphyWindow +

window :

+ an EphyWindow -Returns : +

Returns :

an EggEditableToolbar @@ -228,9 +218,9 @@
-

+

ephy_window_get_statusbar ()

-
GtkWidget*          ephy_window_get_statusbar           (EphyWindow *window);
+
GtkWidget*          ephy_window_get_statusbar           (EphyWindow *window);

Returns this window's statusbar as an EphyStatusbar.

@@ -240,12 +230,12 @@ -window : - an EphyWindow +

window :

+ an EphyWindow -Returns : +

Returns :

This window's statusbar @@ -254,12 +244,12 @@
-

+

ephy_window_set_zoom ()

-
void                ephy_window_set_zoom                (EphyWindow *window,
+
void                ephy_window_set_zoom                (EphyWindow *window,
                                                          float zoom);

 

-Sets the zoom on window's active EphyEmbed. A zoom of 1.0 corresponds to
+Sets the zoom on window's active EphyEmbed. A zoom of 1.0 corresponds to
 100% zoom (normal size).

 

 
@@ -268,12 +258,12 @@
 
 
 
-window :
- an EphyWindow
+
window :

+ an EphyWindow
 
 
 
-zoom :
+
zoom :

  the desired zoom level
 
 
@@ -282,9 +272,9 @@
-

+

ephy_window_activate_location ()

-
void                ephy_window_activate_location       (EphyWindow *window);
+
void                ephy_window_activate_location       (EphyWindow *window);

Activates the location entry on window's toolbar.

@@ -293,21 +283,21 @@

- - +
window : an EphyWindow +

window :

 an EphyWindow
-

+

ephy_window_load_url ()

-
void                ephy_window_load_url                (EphyWindow *window,
+
void                ephy_window_load_url                (EphyWindow *window,
                                                          const char *url);

 

 Loads a new url in the active tab of window.
-Unlike ephy_embed_load_url(), this function activates
+Unlike ephy_embed_load_url(), this function activates
 the embed.

 

 
@@ -316,12 +306,12 @@
 
 
 
-window :
- a EphyWindow
+
window :

+ a EphyWindow
 
 
 
-url :
+
url :

  the url to load
 
 
@@ -329,6 +319,11 @@
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-EphyExtensionsManager.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-EphyExtensionsManager.html @@ -3,12 +3,12 @@ EphyExtensionsManager - + - + @@ -22,16 +22,16 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description
@@ -43,25 +43,25 @@ -void ephy_extensions_manager_load (EphyExtensionsManager *manager, +void ephy_extensions_manager_load (EphyExtensionsManager *manager, const char *identifier); -void ephy_extensions_manager_unload (EphyExtensionsManager *manager, +void ephy_extensions_manager_unload (EphyExtensionsManager *manager, const char *identifier);
-

Description

+

Description

-

Details

+

Details

-

+

ephy_extensions_manager_load ()

-
void                ephy_extensions_manager_load        (EphyExtensionsManager *manager,
+
void                ephy_extensions_manager_load        (EphyExtensionsManager *manager,
                                                          const char *identifier);

 

 Loads the name extension.

@@ -72,12 +72,12 @@
- + - + - + - +

-EphyExtensionsManager +EphyExtensionsManager

EphyExtensionsManager
manager :

manager :

 an EphyExtensionsManager
identifier :

identifier :

 @@ -88,9 +88,9 @@
-

+

ephy_extensions_manager_unload ()

-
void                ephy_extensions_manager_unload      (EphyExtensionsManager *manager,
+
void                ephy_extensions_manager_unload      (EphyExtensionsManager *manager,
                                                          const char *identifier);

 

 Unloads the extension specified by name.
@@ -106,12 +106,12 @@
manager :

manager :

 an EphyExtensionsManager
identifier :

identifier :

 @@ -121,6 +121,11 @@
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/ch01.html +++ epiphany-browser-2.21.4/doc/reference/html/ch01.html @@ -3,12 +3,12 @@ Epiphany - + - + @@ -23,7 +23,7 @@

-Epiphany

+Epiphany
EphyPermissionManager — Sets webpages' cookie, image and popup permissions. --- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany.devhelp +++ epiphany-browser-2.21.4/doc/reference/html/epiphany.devhelp @@ -26,6 +26,8 @@ + + @@ -35,6 +37,8 @@ + + @@ -108,15 +112,21 @@ + + + + + + @@ -136,7 +146,11 @@ + + + + @@ -147,8 +161,14 @@ + + + + + + @@ -159,6 +179,8 @@ + + @@ -166,6 +188,8 @@ + + @@ -173,6 +197,8 @@ + + @@ -184,5 +210,7 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/html/EphyEmbed.html +++ epiphany-browser-2.21.4/doc/reference/html/EphyEmbed.html @@ -3,12 +3,12 @@ EphyEmbed - + - + @@ -22,20 +22,20 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description  |  - Object Hierarchy + Object Hierarchy  |  - Signals + Signals
@@ -47,57 +47,57 @@ - EphyEmbed; - EphyEmbedIface; -enum EphyEmbedChrome; -void ephy_embed_load_url (EphyEmbed *embed, + EphyEmbed; + EphyEmbedIface; +enum EphyEmbedChrome; +void ephy_embed_load_url (EphyEmbed *embed, const char *url); -void ephy_embed_stop_load (EphyEmbed *embed); -void ephy_embed_reload (EphyEmbed *embed, +void ephy_embed_stop_load (EphyEmbed *embed); +void ephy_embed_reload (EphyEmbed *embed, gboolean force); -const char* ephy_embed_get_title (EphyEmbed *embed); -char* ephy_embed_get_location (EphyEmbed *embed, +const char* ephy_embed_get_title (EphyEmbed *embed); +char* ephy_embed_get_location (EphyEmbed *embed, gboolean toplevel); -const char* ephy_embed_get_link_message (EphyEmbed *embed); -char* ephy_embed_get_js_status (EphyEmbed *embed); -gboolean ephy_embed_can_go_back (EphyEmbed *embed); -gboolean ephy_embed_can_go_forward (EphyEmbed *embed); -gboolean ephy_embed_can_go_up (EphyEmbed *embed); -GSList* ephy_embed_get_go_up_list (EphyEmbed *embed); -void ephy_embed_go_back (EphyEmbed *embed); -void ephy_embed_go_forward (EphyEmbed *embed); -void ephy_embed_go_up (EphyEmbed *embed); -int ephy_embed_shistory_n_items (EphyEmbed *embed); -void ephy_embed_shistory_get_nth (EphyEmbed *embed, +const char* ephy_embed_get_link_message (EphyEmbed *embed); +char* ephy_embed_get_js_status (EphyEmbed *embed); +gboolean ephy_embed_can_go_back (EphyEmbed *embed); +gboolean ephy_embed_can_go_forward (EphyEmbed *embed); +gboolean ephy_embed_can_go_up (EphyEmbed *embed); +GSList* ephy_embed_get_go_up_list (EphyEmbed *embed); +void ephy_embed_go_back (EphyEmbed *embed); +void ephy_embed_go_forward (EphyEmbed *embed); +void ephy_embed_go_up (EphyEmbed *embed); +int ephy_embed_shistory_n_items (EphyEmbed *embed); +void ephy_embed_shistory_get_nth (EphyEmbed *embed, int nth, gboolean is_relative, char **url, char **title); -int ephy_embed_shistory_get_pos (EphyEmbed *embed); -void ephy_embed_shistory_go_nth (EphyEmbed *embed, +int ephy_embed_shistory_get_pos (EphyEmbed *embed); +void ephy_embed_shistory_go_nth (EphyEmbed *embed, int nth); -void ephy_embed_get_security_level (EphyEmbed *embed, +void ephy_embed_get_security_level (EphyEmbed *embed, EphyEmbedSecurityLevel *level, char **description); -void ephy_embed_set_zoom (EphyEmbed *embed, +void ephy_embed_set_zoom (EphyEmbed *embed, float zoom); -float ephy_embed_get_zoom (EphyEmbed *embed); -void ephy_embed_find_set_properties (EphyEmbedFind *find, +float ephy_embed_get_zoom (EphyEmbed *embed); +void ephy_embed_find_set_properties (EphyEmbedFind *find, const char *search_string, gboolean case_sensitive); -void ephy_embed_set_encoding (EphyEmbed *embed, +void ephy_embed_set_encoding (EphyEmbed *embed, const char *encoding); -void ephy_embed_print (EphyEmbed *embed); -int ephy_embed_print_preview_n_pages (EphyEmbed *embed); -void ephy_embed_print_preview_navigate (EphyEmbed *embed, +void ephy_embed_print (EphyEmbed *embed); +int ephy_embed_print_preview_n_pages (EphyEmbed *embed); +void ephy_embed_print_preview_navigate (EphyEmbed *embed, EphyEmbedPrintPreviewNavType type, int page); -gboolean ephy_embed_has_modified_forms (EphyEmbed *embed); +gboolean ephy_embed_has_modified_forms (EphyEmbed *embed);
-

Object Hierarchy

+

Object Hierarchy

 
   GInterface
@@ -105,36 +105,36 @@
-

Signals

+

Signals

 
-  "close-request"                                  : Run Last
-  "content-blocked"                                : Run Last
-  "dom-content-loaded"                             : Run First
-  "ge-context-menu"                                : Run Last
-  "ge-document-type"                               : Run First
-  "ge-dom-mouse-click"                             : Run Last
-  "ge-dom-mouse-down"                              : Run Last
-  "ge-favicon"                                     : Run First
-  "ge-feed-link"                                   : Run First
-  "ge-modal-alert"                                 : Run Last
-  "ge-modal-alert-closed"                          : Run Last
-  "ge-new-window"                                  : Run First
-  "ge-popup-blocked"                               : Run First
-  "ge-search-key-press"                            : Run Last
-  "ge-search-link"                                 : Run First
-  "ge-zoom-change"                                 : Run Last
+  "close-request"                                  : Run Last
+  "content-blocked"                                : Run Last
+  "dom-content-loaded"                             : Run First
+  "ge-context-menu"                                : Run Last
+  "ge-document-type"                               : Run First
+  "ge-dom-mouse-click"                             : Run Last
+  "ge-dom-mouse-down"                              : Run Last
+  "ge-favicon"                                     : Run First
+  "ge-feed-link"                                   : Run First
+  "ge-modal-alert"                                 : Run Last
+  "ge-modal-alert-closed"                          : Run Last
+  "ge-new-window"                                  : Run First
+  "ge-popup-blocked"                               : Run First
+  "ge-search-key-press"                            : Run Last
+  "ge-search-link"                                 : Run First
+  "ge-zoom-change"                                 : Run Last
-

Description

+

Description

-Each EphyTab contains an EphyEmbed. An EphyEmbed is an interface; right now -it is only implemented by MozillaEmbed, but whenever possible, EphyEmbed's +Each EphyTab contains an EphyEmbed. An EphyEmbed is an interface; right now +it is only implemented by MozillaEmbed, but whenever possible, EphyEmbed's functions should be used instead of their MozillaEmbed equivalents.

-EphyEmbed's most important functions can be divided into sets: +EphyEmbed's most important functions can be divided into sets:

  • Functions which affect navigation
    • @@ -144,29 +144,29 @@

The first two sets of functions are self-explanitory.

The session history functions are used to traverse the embedded browser's -history. Each EphyEmbed remembers a history of the web pages it has visited. +history. Each EphyEmbed remembers a history of the web pages it has visited. There can be a maximum limit, however; for MozillaEmbed, this limit is determined by Mozilla's browser.sessionhistory.max_entries preference. Because -of this limit, ephy_embed_shistory_n_items() will not necessarily return the +of this limit, ephy_embed_shistory_n_items() will not necessarily return the number of web pages visited in the embed's lifetime; likewise, -ephy_embed_shistory_go_nth() will not always return to the user's home page +ephy_embed_shistory_go_nth() will not always return to the user's home page when called with a 0 argument.

-

Details

+

Details

-

+

EphyEmbed

-
typedef struct _EphyEmbed EphyEmbed;
+
typedef struct _EphyEmbed EphyEmbed;

-

+

EphyEmbedIface

-
typedef struct {
+
typedef struct {
 	GTypeInterface base_iface;
 
 	int	 (* context_menu)	(EphyEmbed *embed,
@@ -292,9 +292,9 @@
-

+

enum EphyEmbedChrome

-
typedef enum
+
typedef enum
 {
 	EPHY_EMBED_CHROME_MENUBAR	= 1 << 0,
 	EPHY_EMBED_CHROME_TOOLBAR	= 1 << 1,
@@ -304,35 +304,35 @@
 

 

 Determines which aspects of the user interface should be displayed. Most of the
-time, an EphyEmbed's chrome will simply be EPHY_EMBED_CHROME_DEFAULT. However,
+time, an EphyEmbed's chrome will simply be EPHY_EMBED_CHROME_DEFAULT. However,
 windows opened with JavaScript often use a nonstandard chrome.

-EphyEmbed +EphyEmbed

EphyEmbed — An interface to the widget displaying web pages
- + - + - + - + @@ -342,9 +342,9 @@
-

+

ephy_embed_load_url ()

-
void                ephy_embed_load_url                 (EphyEmbed *embed,
+
void                ephy_embed_load_url                 (EphyEmbed *embed,
                                                          const char *url);

 

 Loads a new web page in embed.

@@ -355,12 +355,12 @@
- - + - + @@ -369,9 +369,9 @@
-

+

ephy_embed_stop_load ()

-
void                ephy_embed_stop_load                (EphyEmbed *embed);
+
void                ephy_embed_stop_load                (EphyEmbed *embed);

If embed is loading, stops it from continuing.

@@ -380,17 +380,17 @@

EPHY_EMBED_CHROME_MENUBAR

EPHY_EMBED_CHROME_MENUBAR

 -TRUE for the EphyEmbed's containing EphyWindow +TRUE for the EphyEmbed's containing EphyWindow to display its menubar.
EPHY_EMBED_CHROME_TOOLBAR

EPHY_EMBED_CHROME_TOOLBAR

 -TRUE for the EphyEmbed's containing EphyWindow +TRUE for the EphyEmbed's containing EphyWindow to display its toolbars.
EPHY_EMBED_CHROME_STATUSBAR

EPHY_EMBED_CHROME_STATUSBAR

 -TRUE for the EphyEmbed's containing EphyWindow +TRUE for the EphyEmbed's containing EphyWindow to display its statusbar.
EPHY_EMBED_CHROME_BOOKMARKSBAR

EPHY_EMBED_CHROME_BOOKMARKSBAR
embed : an EphyEmbed +

embed :

 an EphyEmbed
url :

url :

 a URL
- - +
embed : an EphyEmbed +

embed :

 an EphyEmbed
-

+

ephy_embed_reload ()

-
void                ephy_embed_reload                   (EphyEmbed *embed,
+
void                ephy_embed_reload                   (EphyEmbed *embed,
                                                          gboolean force);

 

 Reloads the web page being displayed in embed.
@@ -405,12 +405,12 @@
 
 
 
-embed :
- an EphyEmbed
+
embed :

+ an EphyEmbed
 
 
 
-force :
+
force :

  TRUE to bypass cache
 
 
@@ -419,9 +419,9 @@
-

+

ephy_embed_get_title ()

-
const char*         ephy_embed_get_title                (EphyEmbed *embed);
+
const char*         ephy_embed_get_title                (EphyEmbed *embed);

@@ -431,12 +431,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

the title of the web page displayed in embed @@ -445,9 +445,9 @@
-

+

ephy_embed_get_location ()

-
char*               ephy_embed_get_location             (EphyEmbed *embed,
+
char*               ephy_embed_get_location             (EphyEmbed *embed,
                                                          gboolean toplevel);

 

 Returns the URL of the web page displayed in embed.
@@ -464,17 +464,17 @@
 
 
 
-embed :
- an EphyEmbed
+
embed :

+ an EphyEmbed
 
 
 
-toplevel :
+
toplevel :

  FALSE to return the location of the focused frame only
 
 
 
-Returns :
+
Returns :

  the URL of the web page displayed in embed
 
 
@@ -483,9 +483,9 @@
-

+

ephy_embed_get_link_message ()

-
const char*         ephy_embed_get_link_message         (EphyEmbed *embed);
+
const char*         ephy_embed_get_link_message         (EphyEmbed *embed);

When the user is hovering the mouse over a hyperlink, returns the URL of the hyperlink.

@@ -496,12 +496,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

the URL of the link over which the mouse is hovering @@ -510,9 +510,9 @@
-

+

ephy_embed_get_js_status ()

-
char*               ephy_embed_get_js_status            (EphyEmbed *embed);
+
char*               ephy_embed_get_js_status            (EphyEmbed *embed);

Displays the message JavaScript is attempting to display in the statusbar.

@@ -525,12 +525,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

a message from JavaScript meant to be displayed in the statusbar @@ -540,9 +540,9 @@
-

+

ephy_embed_can_go_back ()

-
gboolean            ephy_embed_can_go_back              (EphyEmbed *embed);
+
gboolean            ephy_embed_can_go_back              (EphyEmbed *embed);

@@ -552,12 +552,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

TRUE if embed can return to a previously-visited location @@ -566,9 +566,9 @@
-

+

ephy_embed_can_go_forward ()

-
gboolean            ephy_embed_can_go_forward           (EphyEmbed *embed);
+
gboolean            ephy_embed_can_go_forward           (EphyEmbed *embed);

@@ -578,12 +578,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

TRUE if embed has gone back, and can thus go forward again @@ -592,9 +592,9 @@
-

+

ephy_embed_can_go_up ()

-
gboolean            ephy_embed_can_go_up                (EphyEmbed *embed);
+
gboolean            ephy_embed_can_go_up                (EphyEmbed *embed);

Returns whether embed can travel to a higher-level directory on the server. For example, for http://www.example.com/subdir/index.html, returns TRUE; for @@ -606,12 +606,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

TRUE if embed can browse to a higher-level directory @@ -620,9 +620,9 @@
-

+

ephy_embed_get_go_up_list ()

-
GSList*             ephy_embed_get_go_up_list           (EphyEmbed *embed);
+
GSList*             ephy_embed_get_go_up_list           (EphyEmbed *embed);

Returns a list of (char *) URLs to higher-level directories on the same server, in order of deepest to shallowest. For example, given @@ -636,12 +636,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

a list of URLs higher up in embed's web page's directory hierarchy @@ -651,9 +651,9 @@
-

+

ephy_embed_go_back ()

-
void                ephy_embed_go_back                  (EphyEmbed *embed);
+
void                ephy_embed_go_back                  (EphyEmbed *embed);

Causes embed to return to the previously-visited web page.

@@ -662,17 +662,17 @@

- - +
embed : an EphyEmbed +

embed :

 an EphyEmbed
-

+

ephy_embed_go_forward ()

-
void                ephy_embed_go_forward               (EphyEmbed *embed);
+
void                ephy_embed_go_forward               (EphyEmbed *embed);

If embed has returned to a previously-visited web page, proceed forward to the next page.

@@ -682,17 +682,17 @@
- - +
embed : an EphyEmbed +

embed :

 an EphyEmbed
-

+

ephy_embed_go_up ()

-
void                ephy_embed_go_up                    (EphyEmbed *embed);
+
void                ephy_embed_go_up                    (EphyEmbed *embed);

Moves embed one level up in its web page's directory hierarchy.

@@ -701,17 +701,17 @@

- - +
embed : an EphyEmbed +

embed :

 an EphyEmbed
-

+

ephy_embed_shistory_n_items ()

-
int                 ephy_embed_shistory_n_items         (EphyEmbed *embed);
+
int                 ephy_embed_shistory_n_items         (EphyEmbed *embed);

Returns the number of items in embed's history. In other words, returns the number of pages embed has visited. @@ -726,12 +726,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

the number of items in embed's history @@ -740,9 +740,9 @@
-

+

ephy_embed_shistory_get_nth ()

-
void                ephy_embed_shistory_get_nth         (EphyEmbed *embed,
+
void                ephy_embed_shistory_get_nth         (EphyEmbed *embed,
                                                          int nth,
                                                          gboolean is_relative,
                                                          char **url,
@@ -759,27 +759,27 @@
 
 
 
-embed :
- an EphyEmbed
+
embed :

+ an EphyEmbed
 
 
 
-nth :
+
nth :

  index of the desired page in embed's browser history
 
 
 
-is_relative :
+
is_relative :

  if TRUE, add embed's current history position to nth
 
 
 
-url :
+
url :

  returned value of the history entry's URL
 
 
 
-title :
+
title :

  returned value of the history entry's title
 
 
@@ -788,13 +788,13 @@
-

+

ephy_embed_shistory_get_pos ()

-
int                 ephy_embed_shistory_get_pos         (EphyEmbed *embed);
+
int                 ephy_embed_shistory_get_pos         (EphyEmbed *embed);

Returns embed's current position in its history. If the user never uses the "Back" button, this number will be the same as the return value of -ephy_embed_shistory_n_items().

+ephy_embed_shistory_n_items().

@@ -802,12 +802,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

embed's current position in its history @@ -816,9 +816,9 @@
-

+

ephy_embed_shistory_go_nth ()

-
void                ephy_embed_shistory_go_nth          (EphyEmbed *embed,
+
void                ephy_embed_shistory_go_nth          (EphyEmbed *embed,
                                                          int nth);

 

 Opens the webpage at location nth in embed's history.

@@ -829,12 +829,12 @@
 
 
 
-embed :
- an EphyEmbed
+
embed :

+ an EphyEmbed
 
 
 
-nth :
+
nth :

  desired history index
 
 
@@ -843,9 +843,9 @@
-

+

ephy_embed_get_security_level ()

-
void                ephy_embed_get_security_level       (EphyEmbed *embed,
+
void                ephy_embed_get_security_level       (EphyEmbed *embed,
                                                          EphyEmbedSecurityLevel *level,
                                                          char **description);

 

@@ -858,17 +858,17 @@
 
 
 
-embed :
- an EphyEmbed
+
embed :

+ an EphyEmbed
 
 
 
-level :
+
level :

  return value of security level
 
 
 
-description :
+
description :

  return value of the description of the security level
 
 
@@ -877,9 +877,9 @@
-

+

ephy_embed_set_zoom ()

-
void                ephy_embed_set_zoom                 (EphyEmbed *embed,
+
void                ephy_embed_set_zoom                 (EphyEmbed *embed,
                                                          float zoom);

 

 Sets the zoom level for a web page.
@@ -895,12 +895,12 @@
 
 
 
-embed :
- an EphyEmbed
+
embed :

+ an EphyEmbed
 
 
 
-zoom :
+
zoom :

  the new zoom level
 
 
@@ -909,9 +909,9 @@
-

+

ephy_embed_get_zoom ()

-
float               ephy_embed_get_zoom                 (EphyEmbed *embed);
+
float               ephy_embed_get_zoom                 (EphyEmbed *embed);

Returns the zoom level of embed. A zoom of 1.0 corresponds to 100% (normal size).

@@ -922,12 +922,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

the zoom level of embed @@ -936,9 +936,9 @@
-

+

ephy_embed_find_set_properties ()

-
void                ephy_embed_find_set_properties      (EphyEmbedFind *find,
+
void                ephy_embed_find_set_properties      (EphyEmbedFind *find,
                                                          const char *search_string,
                                                          gboolean case_sensitive);

 

@@ -950,17 +950,17 @@
 
 
 
-find :
+
find :

  an EphyEmbedFind
 
 
 
-search_string :
+
search_string :

 
 
 
 
-case_sensitive :
+
case_sensitive :

  TRUE for "case sensitive" to be set
 
 
@@ -969,9 +969,9 @@
-

+

ephy_embed_set_encoding ()

-
void                ephy_embed_set_encoding             (EphyEmbed *embed,
+
void                ephy_embed_set_encoding             (EphyEmbed *embed,
                                                          const char *encoding);

 

 Sets embed's character encoding to encoding. These cryptic encoding
@@ -987,12 +987,12 @@
 
 
 
-embed :
- an EphyEmbed
+
embed :

+ an EphyEmbed
 
 
 
-encoding :
+
encoding :

  the desired encoding
 
 
@@ -1001,9 +1001,9 @@
-

+

ephy_embed_print ()

-
void                ephy_embed_print                    (EphyEmbed *embed);
+
void                ephy_embed_print                    (EphyEmbed *embed);

Sends a document to the printer.

@@ -1012,17 +1012,17 @@

- - +
embed : an EphyEmbed +

embed :

 an EphyEmbed
-

+

ephy_embed_print_preview_n_pages ()

-
int                 ephy_embed_print_preview_n_pages    (EphyEmbed *embed);
+
int                 ephy_embed_print_preview_n_pages    (EphyEmbed *embed);

Returns the number of pages which would appear in embed's loaded document if it were to be printed.

@@ -1033,12 +1033,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

the number of pages in embed's loaded document @@ -1047,9 +1047,9 @@
-

+

ephy_embed_print_preview_navigate ()

-
void                ephy_embed_print_preview_navigate   (EphyEmbed *embed,
+
void                ephy_embed_print_preview_navigate   (EphyEmbed *embed,
                                                          EphyEmbedPrintPreviewNavType type,
                                                          int page);

 

@@ -1061,17 +1061,17 @@
 
 
 
-embed :
- an EphyEmbed
+
embed :

+ an EphyEmbed
 
 
 
-type :
+
type :

  an EphyPrintPreviewNavType which determines where to navigate
 
 
 
-page :
+
page :

  if type is EPHY_EMBED_PRINTPREVIEW_GOTO_PAGENUM, the desired page number
 
 
@@ -1080,9 +1080,9 @@
-

+

ephy_embed_has_modified_forms ()

-
gboolean            ephy_embed_has_modified_forms       (EphyEmbed *embed);
+
gboolean            ephy_embed_has_modified_forms       (EphyEmbed *embed);

Returns TRUE if the user has modified <input> or <textarea> values in embed's loaded document.

@@ -1093,12 +1093,12 @@ -embed : - an EphyEmbed +

embed :

+ an EphyEmbed -Returns : +

Returns :

TRUE if embed has user-modified forms @@ -1107,11 +1107,11 @@
-

Signal Details

+

Signal Details

-

-The "close-request" signal

-
gboolean            user_function                      (EphyEmbed *embed,
+

+The "close-request" signal

+
gboolean            user_function                      (EphyEmbed *embed,
                                                         gpointer   user_data)      : Run Last

 

 The ::close signal is emitted when the embed request closing.
@@ -1124,12 +1124,12 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1137,9 +1137,9 @@
-

-The "content-blocked" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "content-blocked" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         gchar     *uri,
                                                         gpointer   user_data)      : Run Last

 

@@ -1151,17 +1151,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-uri :
+
uri :

  blocked URI 
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1169,9 +1169,9 @@
-

-The "dom-content-loaded" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "dom-content-loaded" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         gpointer   arg1,
                                                         gpointer   user_data)      : Run First

 

@@ -1185,12 +1185,12 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1198,9 +1198,9 @@
-

-The "ge-context-menu" signal

-
gboolean            user_function                      (EphyEmbed *embed,
+

+The "ge-context-menu" signal

+
gboolean            user_function                      (EphyEmbed *embed,
                                                         GObject   *event,
                                                         gpointer   user_data)      : Run Last

 

@@ -1214,17 +1214,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-event :
+
event :

  the EphyEmbedEvent which triggered this signal
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1232,9 +1232,9 @@
-

-The "ge-document-type" signal

-
void                user_function                      (EphyEmbed            *embed,
+

+The "ge-document-type" signal

+
void                user_function                      (EphyEmbed            *embed,
                                                         EphyEmbedDocumentType type,
                                                         gpointer              user_data)      : Run First

 

@@ -1246,17 +1246,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-type :
+
type :

  the new document type
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1264,9 +1264,9 @@
-

-The "ge-dom-mouse-click" signal

-
gboolean            user_function                      (EphyEmbed *embed,
+

+The "ge-dom-mouse-click" signal

+
gboolean            user_function                      (EphyEmbed *embed,
                                                         GObject   *event,
                                                         gpointer   user_data)      : Run Last

 

@@ -1278,17 +1278,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-event :
+
event :

  the EphyEmbedEvent which triggered this signal
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1296,9 +1296,9 @@
-

-The "ge-dom-mouse-down" signal

-
gboolean            user_function                      (EphyEmbed *embed,
+

+The "ge-dom-mouse-down" signal

+
gboolean            user_function                      (EphyEmbed *embed,
                                                         GObject   *event,
                                                         gpointer   user_data)      : Run Last

 

@@ -1311,17 +1311,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-event :
+
event :

  the EphyEmbedEvent which triggered this signal
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1329,9 +1329,9 @@
-

-The "ge-favicon" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "ge-favicon" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         gchar     *address,
                                                         gpointer   user_data)      : Run First

 

@@ -1344,17 +1344,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-address :
+
address :

  the URL to embed's web site's favicon
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1362,9 +1362,9 @@
-

-The "ge-feed-link" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "ge-feed-link" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         gchar     *type,
                                                         gchar     *title,
                                                         gchar     *address,
@@ -1379,27 +1379,27 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-type :
+
type :

  the mime-type of the news feed
 
 
 
-title :
+
title :

  the title of the news feed
 
 
 
-address :
+
address :

  the URL to embed's web site's news feed
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1407,9 +1407,9 @@
-

-The "ge-modal-alert" signal

-
gboolean            user_function                      (EphyEmbed *embed,
+

+The "ge-modal-alert" signal

+
gboolean            user_function                      (EphyEmbed *embed,
                                                         gpointer   user_data)      : Run Last

 

 The ::ge-modal-alert signal is emitted when a DOM event will open a
@@ -1424,12 +1424,12 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1437,9 +1437,9 @@
-

-The "ge-modal-alert-closed" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "ge-modal-alert-closed" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         gpointer   user_data)      : Run Last

 

 The ::ge-modal-alert-closed signal is emitted when a modal alert put up by a
@@ -1451,12 +1451,12 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1464,9 +1464,9 @@
-

-The "ge-new-window" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "ge-new-window" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         GtkWidget *new_embed,
                                                         gpointer   user_data)      : Run First

 

@@ -1479,17 +1479,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-new_embed :
- the newly opened EphyEmbed
+
new_embed :

+ the newly opened EphyEmbed
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1497,9 +1497,9 @@
-

-The "ge-popup-blocked" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "ge-popup-blocked" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         gchar     *address,
                                                         gchar     *target,
                                                         gchar     *features,
@@ -1514,27 +1514,27 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-address :
+
address :

  The requested URL
 
 
 
-target :
+
target :

  The requested window name, e.g. "_blank"
 
 
 
-features :
+
features :

  The requested features: for example, "height=400,width=200"
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1542,9 +1542,9 @@
-

-The "ge-search-key-press" signal

-
gboolean            user_function                      (EphyEmbed *embed,
+

+The "ge-search-key-press" signal

+
gboolean            user_function                      (EphyEmbed *embed,
                                                         GdkEvent  *event,
                                                         gpointer   user_data)      : Run Last

 

@@ -1557,17 +1557,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-event :
+
event :

  the GdkEventKey which triggered this signal
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1575,9 +1575,9 @@
-

-The "ge-search-link" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "ge-search-link" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         gchar     *type,
                                                         gchar     *title,
                                                         gchar     *address,
@@ -1592,27 +1592,27 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-type :
+
type :

  the mime-type of the search description
 
 
 
-title :
+
title :

  the title of the news feed
 
 
 
-address :
+
address :

  the URL to embed's web site's search description
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1620,9 +1620,9 @@
-

-The "ge-zoom-change" signal

-
void                user_function                      (EphyEmbed *embed,
+

+The "ge-zoom-change" signal

+
void                user_function                      (EphyEmbed *embed,
                                                         gfloat     zoom,
                                                         gpointer   user_data)      : Run Last

 

@@ -1640,17 +1640,17 @@
 
 
 
-embed :
+
embed :

 
 
 
 
-zoom :
+
zoom :

  embed's new zoom level
 
 
 
-user_data :
+
user_data :

 user data set when the signal handler was connected.
 
 
@@ -1658,13 +1658,18 @@
-

See Also

+

See Also

-Using EphyEmbed instead of MozillaEmbed is good practice. However, using a +Using EphyEmbed instead of MozillaEmbed is good practice. However, using a MozillaEmbed or even a GtkMozEmbed may be necessary in certain cases (this can be done by casting).

+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany.devhelp2 +++ epiphany-browser-2.21.4/doc/reference/html/epiphany.devhelp2 @@ -26,6 +26,8 @@ + + @@ -35,6 +37,8 @@ + + @@ -108,15 +112,21 @@ + + + + + + @@ -136,7 +146,11 @@ + + + + @@ -147,8 +161,14 @@ + + + + + + @@ -159,6 +179,8 @@ + + @@ -166,6 +188,8 @@ + + @@ -173,6 +197,8 @@ + + @@ -184,5 +210,7 @@ + + --- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-ephy-session.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-ephy-session.html @@ -3,12 +3,12 @@ ephy-session - + - + @@ -22,16 +22,16 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description
@@ -43,33 +43,33 @@ -EphyWindow* ephy_session_get_active_window (EphySession *session); -gboolean ephy_session_save (EphySession *session, +EphyWindow* ephy_session_get_active_window (EphySession *session); +gboolean ephy_session_save (EphySession *session, const char *filename); -gboolean ephy_session_load (EphySession *session, +gboolean ephy_session_load (EphySession *session, const char *filename, guint32 user_time); -void ephy_session_close (EphySession *session); -GList* ephy_session_get_windows (EphySession *session); -void ephy_session_add_window (EphySession *session, +void ephy_session_close (EphySession *session); +GList* ephy_session_get_windows (EphySession *session); +void ephy_session_add_window (EphySession *session, GtkWindow *window); -void ephy_session_remove_window (EphySession *session, +void ephy_session_remove_window (EphySession *session, GtkWindow *window);
-

Description

+

Description

-

Details

+

Details

-

+

ephy_session_get_active_window ()

-
EphyWindow*         ephy_session_get_active_window      (EphySession *session);
+
EphyWindow*         ephy_session_get_active_window      (EphySession *session);

Get the current active browser window. Use it when you need to take an action (like opening an url) on @@ -81,12 +81,12 @@

- + - + @@ -95,9 +95,9 @@
-

+

ephy_session_save ()

-
gboolean            ephy_session_save                   (EphySession *session,
+
gboolean            ephy_session_save                   (EphySession *session,
                                                          const char *filename);

 

 
@@ -106,17 +106,17 @@
- + - + - + - + - + - + - + - + Description

-ephy-session +ephy-session

ephy-session
session :

session :

 a EphySession
Returns :

Returns :

 the current active non-popup browser window, or NULL of there is none.
session :

session :
filename :

filename :
Returns :

Returns :

 @@ -127,9 +127,9 @@
-

+

ephy_session_load ()

-
gboolean            ephy_session_load                   (EphySession *session,
+
gboolean            ephy_session_load                   (EphySession *session,
                                                          const char *filename,
                                                          guint32 user_time);

 

@@ -139,22 +139,22 @@
session :

session :
filename :

filename :
user_time :

user_time :
Returns :

Returns :

 @@ -165,16 +165,16 @@
-

+

ephy_session_close ()

-
void                ephy_session_close                  (EphySession *session);
+
void                ephy_session_close                  (EphySession *session);

- + - + - - + @@ -210,12 +210,12 @@
-

+

ephy_session_add_window ()

-
void                ephy_session_add_window             (EphySession *session,
+
void                ephy_session_add_window             (EphySession *session,
                                                          GtkWindow *window);

 

-Add a tool window to the session. EphyWindow take care of adding
+Add a tool window to the session. EphyWindow take care of adding
 itself to session.

 

 
@@ -224,13 +224,13 @@
- + - - + @@ -238,9 +238,9 @@
-

+

ephy_session_remove_window ()

-
void                ephy_session_remove_window          (EphySession *session,
+
void                ephy_session_remove_window          (EphySession *session,
                                                          GtkWindow *window);

 

 Remove a tool window from the session.

@@ -251,12 +251,12 @@
- + - + @@ -265,6 +265,11 @@
session :

session :

 @@ -184,9 +184,9 @@
-

+

ephy_session_get_windows ()

-
GList*              ephy_session_get_windows            (EphySession *session);
+
GList*              ephy_session_get_windows            (EphySession *session);

@@ -196,13 +196,13 @@

session :

session :
Returns : the list of open EphyWindow:s. +

Returns :

 the list of open "s".
session :

session :
window : a EphyWindow +

window :

 a EphyWindow
session :

session :

 a EphySession.
window :

window :

 a GtkWindow, which must be either the bookmarks editor or the history window.
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-ephy-password-manager.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-ephy-password-manager.html @@ -3,12 +3,12 @@ ephy-password-manager - + - + @@ -22,16 +22,16 @@ 		Epiphany Reference Manual Next
Top +
Top  |  - Description
@@ -43,30 +43,30 @@ -#define EPHY_PASSWORD_MANAGER_IFACE (k) -#define EPHY_IS_PASSWORD_MANAGER_IFACE (k) -#define EPHY_TYPE_PASSWORD_INFO -EphyPasswordInfo* ephy_password_info_new (const char *host, +#define EPHY_PASSWORD_MANAGER_IFACE (k) +#define EPHY_IS_PASSWORD_MANAGER_IFACE (k) +#define EPHY_TYPE_PASSWORD_INFO +EphyPasswordInfo* ephy_password_info_new (const char *host, const char *username, const char *password); -EphyPasswordInfo* ephy_password_info_copy (const EphyPasswordInfo *info); -void ephy_password_info_free (EphyPasswordInfo *info); -GType ephy_password_manager_get_type (void); +EphyPasswordInfo* ephy_password_info_copy (const EphyPasswordInfo *info); +void ephy_password_info_free (EphyPasswordInfo *info); +GType ephy_password_manager_get_type (void);
-

Description

+

Description

-

Details

+

Details

-

+

EPHY_PASSWORD_MANAGER_IFACE()

-
#define EPHY_PASSWORD_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIface))
+
#define EPHY_PASSWORD_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIface))
 

 

 
@@ -74,7 +74,7 @@

-ephy-password-manager +ephy-password-manager

ephy-password-manager
- + - + Description
k :

k :

 @@ -84,9 +84,9 @@
-

+

EPHY_IS_PASSWORD_MANAGER_IFACE()

-
#define EPHY_IS_PASSWORD_MANAGER_IFACE(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PASSWORD_MANAGER))
+
#define EPHY_IS_PASSWORD_MANAGER_IFACE(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PASSWORD_MANAGER))
 

 

 
@@ -94,7 +94,7 @@
 

-
+
-
+
-
+
-
+
-
+
@@ -152,9 +152,9 @@
 

-

+

 ephy_password_info_copy ()

-
EphyPasswordInfo*   ephy_password_info_copy             (const EphyPasswordInfo *info);

+
EphyPasswordInfo*   ephy_password_info_copy             (const EphyPasswordInfo *info);

 

 

 

@@ -164,12 +164,12 @@
 

-
+
-
+
@@ -178,9 +178,9 @@
 

-

+

 ephy_password_info_free ()

-
void                ephy_password_info_free             (EphyPasswordInfo *info);

+
void                ephy_password_info_free             (EphyPasswordInfo *info);

 

 Frees info.

 

@@ -189,7 +189,7 @@
 

 
 
k :
k :

 
 
 
@@ -104,9 +104,9 @@
 
 

 

-

+

 EPHY_TYPE_PASSWORD_INFO

-
#define EPHY_TYPE_PASSWORD_INFO			(ephy_password_info_get_type ())
+
#define EPHY_TYPE_PASSWORD_INFO			(ephy_password_info_get_type ())
 

 

 
@@ -114,9 +114,9 @@
 

 

 

-

+

 ephy_password_info_new ()

-
EphyPasswordInfo*   ephy_password_info_new              (const char *host,
+
EphyPasswordInfo*   ephy_password_info_new              (const char *host,
                                                          const char *username,
                                                          const char *password);

 

@@ -128,22 +128,22 @@
 

 
 
host :
host :

  a host name
 
 

 
username :
username :

  a user name
 
 

 
password :
password :

  a password, or NULL
 
 

 
Returns :
Returns :

  the new password info.
 
 

 
 
 
 
info :
info :

  a EphyPasswordInfo
 
 

 
Returns :
Returns :

  a copy of info
 
 

 
 

-
+
@@ -197,16 +197,16 @@
 

-

+

 ephy_password_manager_get_type ()

-
GType               ephy_password_manager_get_type      (void);

+
GType               ephy_password_manager_get_type      (void);

 

 
 

 

 
 
info :
info :

 
 
 

 
 

-
+

 
 
Returns :
Returns :

 
 
 
@@ -215,6 +215,11 @@
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-ephy-cookie-manager.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-ephy-cookie-manager.html @@ -3,12 +3,12 @@ ephy-cookie-manager - + - + @@ -22,16 +22,16 @@ 		Epiphany Reference Manual Next
Top +
Top  |  - Description
@@ -43,32 +43,32 @@ -#define EPHY_COOKIE_MANAGER_IFACE (k) -#define EPHY_IS_COOKIE_MANAGER_IFACE (k) -#define EPHY_TYPE_COOKIE -EphyCookie* ephy_cookie_new (void); -EphyCookie* ephy_cookie_copy (const EphyCookie *cookie); -void ephy_cookie_free (EphyCookie *cookie); -GType ephy_cookie_manager_get_type (void); -GList* ephy_cookie_manager_list_cookies (EphyCookieManager *manager); -void ephy_cookie_manager_remove_cookie (EphyCookieManager *manager, +#define EPHY_COOKIE_MANAGER_IFACE (k) +#define EPHY_IS_COOKIE_MANAGER_IFACE (k) +#define EPHY_TYPE_COOKIE +EphyCookie* ephy_cookie_new (void); +EphyCookie* ephy_cookie_copy (const EphyCookie *cookie); +void ephy_cookie_free (EphyCookie *cookie); +GType ephy_cookie_manager_get_type (void); +GList* ephy_cookie_manager_list_cookies (EphyCookieManager *manager); +void ephy_cookie_manager_remove_cookie (EphyCookieManager *manager, const EphyCookie *cookie); -void ephy_cookie_manager_clear (EphyCookieManager *manager); +void ephy_cookie_manager_clear (EphyCookieManager *manager);
-

Description

+

Description

-

Details

+

Details

-

+

EPHY_COOKIE_MANAGER_IFACE()

-
#define EPHY_COOKIE_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIface))
+
#define EPHY_COOKIE_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIface))
 

 

 
@@ -76,7 +76,7 @@

-ephy-cookie-manager +ephy-cookie-manager

ephy-cookie-manager
- + - + Signals
k :

k :

 @@ -86,9 +86,9 @@
-

+

EPHY_IS_COOKIE_MANAGER_IFACE()

-
#define EPHY_IS_COOKIE_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COOKIE_MANAGER))
+
#define EPHY_IS_COOKIE_MANAGER_IFACE(k)		(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COOKIE_MANAGER))
 

 

 
@@ -96,7 +96,7 @@
 

-
+
-
+                  Description

 
 
k :
k :

 
 
 
@@ -106,9 +106,9 @@
 
 

 

-

+

 EPHY_TYPE_COOKIE

-
#define EPHY_TYPE_COOKIE			(ephy_cookie_get_type ())
+
#define EPHY_TYPE_COOKIE			(ephy_cookie_get_type ())
 

 

 
@@ -116,9 +116,9 @@
 

 

 

-

+

 ephy_cookie_new ()

-
EphyCookie*         ephy_cookie_new                     (void);

+
EphyCookie*         ephy_cookie_new                     (void);

 

 

 

@@ -127,7 +127,7 @@
 

-
+
@@ -135,9 +135,9 @@
 

-

+

 ephy_cookie_copy ()

-
EphyCookie*         ephy_cookie_copy                    (const EphyCookie *cookie);

+
EphyCookie*         ephy_cookie_copy                    (const EphyCookie *cookie);

 

 

 

@@ -147,12 +147,12 @@
 

-
+
-
+
@@ -161,9 +161,9 @@
 

-

+

 ephy_cookie_free ()

-
void                ephy_cookie_free                    (EphyCookie *cookie);

+
void                ephy_cookie_free                    (EphyCookie *cookie);

 

 Frees cookie.

 

@@ -172,7 +172,7 @@
 

 
 
Returns :
Returns :

  a new EphyCookie.
 
 

 
 
 
 
cookie :
cookie :

  a EphyCookie
 
 

 
Returns :
Returns :

  a copy of cookie.
 
 

 
 

-
+
@@ -180,16 +180,16 @@
 

-

+

 ephy_cookie_manager_get_type ()

-
GType               ephy_cookie_manager_get_type        (void);

+
GType               ephy_cookie_manager_get_type        (void);

 

 
 

 

 
 
cookie :
cookie :

  a EphyCookie
 
 

 
 

-
+
-
+
-
+
@@ -225,9 +225,9 @@
 

-

+

 ephy_cookie_manager_remove_cookie ()

-
void                ephy_cookie_manager_remove_cookie   (EphyCookieManager *manager,
+
void                ephy_cookie_manager_remove_cookie   (EphyCookieManager *manager,
                                                          const EphyCookie *cookie);

 

 Removes cookie from the cookies database. You must free cookie yourself.

@@ -238,12 +238,12 @@
 

-
+
-
+
@@ -252,9 +252,9 @@
 

-

+

 ephy_cookie_manager_clear ()

-
void                ephy_cookie_manager_clear           (EphyCookieManager *manager);

+
void                ephy_cookie_manager_clear           (EphyCookieManager *manager);

 

 Clears the cookies database.

 

@@ -263,13 +263,18 @@
 

 
 
Returns :
Returns :

 
 
 
@@ -199,9 +199,9 @@
 
 

 

-

+

 ephy_cookie_manager_list_cookies ()

-
GList*              ephy_cookie_manager_list_cookies    (EphyCookieManager *manager);

+
GList*              ephy_cookie_manager_list_cookies    (EphyCookieManager *manager);

 

 Lists all cookies in the cookies database.

 

@@ -211,12 +211,12 @@
 

 
 
manager :
manager :

  the EphyCookieManager
 
 

 
Returns :
Returns :

  the cookies list
 
 

 
 
 
 
manager :
manager :

  the EphyCookieManager
 
 

 
cookie :
cookie :

  a EphyCookie
 
 

 
 

-
+

 
 
manager :
manager :

  the EphyCookieManager
 
 

 

 

 
+

+

+

+

+

 
 
 
--- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-ephy-shell.html
+++ epiphany-browser-2.21.4/doc/reference/html/epiphany-ephy-shell.html
@@ -3,11 +3,11 @@
 
 
 ephy-shell
-
+
 
 
 
-
+
 
 
 
@@ -21,16 +21,16 @@
 		Epiphany Reference Manual
  
 
Top
+
Top
                    | 
-                  Description

 

 

 

 

@@ -42,37 +42,37 @@
 
 
 
-extern              EphyShell *ephy_shell;
-enum                EphyNewTabFlags;
-EphyEmbed*          ephy_shell_new_tab                  (EphyShell *shell,
-                                                         EphyWindow *parent_window,
-                                                         EphyEmbed *previous_embed,
+extern              EphyShell *ephy_shell;
+enum                EphyNewTabFlags;
+EphyEmbed*          ephy_shell_new_tab                  (EphyShell *shell,
+                                                         EphyWindow *parent_window,
+                                                         EphyEmbed *previous_embed,
                                                          const char *url,
-                                                         EphyNewTabFlags flags);
-GObject*            ephy_shell_get_session              (EphyShell *shell);
-EphyBookmarks*      ephy_shell_get_bookmarks            (EphyShell *shell);
-GObject*            ephy_shell_get_toolbars_model       (EphyShell *shell,
+                                                         EphyNewTabFlags flags);
+GObject*            ephy_shell_get_session              (EphyShell *shell);
+EphyBookmarks*      ephy_shell_get_bookmarks            (EphyShell *shell);
+GObject*            ephy_shell_get_toolbars_model       (EphyShell *shell,
                                                          gboolean fullscreen);
-GObject*            ephy_shell_get_extensions_manager   (EphyShell *shell);
-GtkWidget*          ephy_shell_get_bookmarks_editor     (EphyShell *shell);
-GtkWidget*          ephy_shell_get_history_window       (EphyShell *shell);
-GObject*            ephy_shell_get_pdm_dialog           (EphyShell *shell);
-GObject*            ephy_shell_get_prefs_dialog         (EphyShell *shell);
+GObject*            ephy_shell_get_extensions_manager   (EphyShell *shell);
+GtkWidget*          ephy_shell_get_bookmarks_editor     (EphyShell *shell);
+GtkWidget*          ephy_shell_get_history_window       (EphyShell *shell);
+GObject*            ephy_shell_get_pdm_dialog           (EphyShell *shell);
+GObject*            ephy_shell_get_prefs_dialog         (EphyShell *shell);
 
 

-
Description

+
Description

 

 
 

 

-
Details

+
Details

 

-

+

 ephy_shell

-
extern EphyShell *ephy_shell;
+
extern EphyShell *ephy_shell;
 

 

 
@@ -80,9 +80,9 @@
 

 

 

-

+

 enum EphyNewTabFlags

-
typedef enum
+
typedef enum
 {
 	/* Page types */
 	EPHY_NEW_TAB_HOME_PAGE		= 1 << 0,
@@ -111,19 +111,19 @@
 

 

 

-

+

 ephy_shell_new_tab ()

-
EphyEmbed*          ephy_shell_new_tab                  (EphyShell *shell,
-                                                         EphyWindow *parent_window,
-                                                         EphyEmbed *previous_embed,
+
EphyEmbed*          ephy_shell_new_tab                  (EphyShell *shell,
+                                                         EphyWindow *parent_window,
+                                                         EphyEmbed *previous_embed,
                                                          const char *url,
-                                                         EphyNewTabFlags flags);

+                                                         EphyNewTabFlags flags);

 

 Create a new tab and the parent window when necessary.
 Use this function to open urls in new window/tabs.
 

 

-ReturnValue: the created EphyEmbed

+ReturnValue: the created EphyEmbed

 

 
 

@@ -131,32 +131,32 @@
 

-
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -193,9 +193,9 @@
 

-

+

 ephy_shell_get_bookmarks ()

-
EphyBookmarks*      ephy_shell_get_bookmarks            (EphyShell *shell);

+
EphyBookmarks*      ephy_shell_get_bookmarks            (EphyShell *shell);

 

 
 

@@ -203,12 +203,12 @@
 

-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+

 
 

-ephy-shell
+ephy-shell
 

 
ephy-shell

 		
 
 
 

 
 
shell :
shell :

  a EphyShell
 
 

 
parent_window : the target EphyWindow or NULL
+
parent_window :
 the target EphyWindow or NULL
 
 

 
previous_embed :
previous_embed :

  the referrer embed, or NULL
 
 

 
url :
url :

  an url to load or NULL
 
 

 
flags :
flags :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -167,9 +167,9 @@
 
 

 

-

+

 ephy_shell_get_session ()

-
GObject*            ephy_shell_get_session              (EphyShell *shell);

+
GObject*            ephy_shell_get_session              (EphyShell *shell);

 

 Returns current session.

 

@@ -179,12 +179,12 @@
 

 
 
shell :
shell :

  the EphyShell
 
 

 
Returns :
Returns :

  the current session.
 
 

 
 
 
 
shell :
shell :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -219,9 +219,9 @@
 
 

 

-

+

 ephy_shell_get_toolbars_model ()

-
GObject*            ephy_shell_get_toolbars_model       (EphyShell *shell,
+
GObject*            ephy_shell_get_toolbars_model       (EphyShell *shell,
                                                          gboolean fullscreen);

 

 
@@ -230,17 +230,17 @@
 

 
 
shell :
shell :

 
 
 

 
fullscreen :
fullscreen :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -251,9 +251,9 @@
 
 

 

-

+

 ephy_shell_get_extensions_manager ()

-
GObject*            ephy_shell_get_extensions_manager   (EphyShell *shell);

+
GObject*            ephy_shell_get_extensions_manager   (EphyShell *shell);

 

 
 

@@ -261,12 +261,12 @@
 

 
 
shell :
shell :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -277,9 +277,9 @@
 
 

 

-

+

 ephy_shell_get_bookmarks_editor ()

-
GtkWidget*          ephy_shell_get_bookmarks_editor     (EphyShell *shell);

+
GtkWidget*          ephy_shell_get_bookmarks_editor     (EphyShell *shell);

 

 
 

@@ -287,12 +287,12 @@
 

 
 
shell :
shell :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -303,9 +303,9 @@
 
 

 

-

+

 ephy_shell_get_history_window ()

-
GtkWidget*          ephy_shell_get_history_window       (EphyShell *shell);

+
GtkWidget*          ephy_shell_get_history_window       (EphyShell *shell);

 

 
 

@@ -313,12 +313,12 @@
 

 
 
shell :
shell :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -329,9 +329,9 @@
 
 

 

-

+

 ephy_shell_get_pdm_dialog ()

-
GObject*            ephy_shell_get_pdm_dialog           (EphyShell *shell);

+
GObject*            ephy_shell_get_pdm_dialog           (EphyShell *shell);

 

 
 

@@ -339,12 +339,12 @@
 

 
 
shell :
shell :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -355,9 +355,9 @@
 
 

 

-

+

 ephy_shell_get_prefs_dialog ()

-
GObject*            ephy_shell_get_prefs_dialog         (EphyShell *shell);

+
GObject*            ephy_shell_get_prefs_dialog         (EphyShell *shell);

 

 
 

@@ -365,12 +365,12 @@
 

 
 
shell :
shell :

 
 
 

 
Returns :
Returns :

 
 
 
@@ -380,6 +380,11 @@
 

 

 

+

+

+

+

+
--- epiphany-browser-2.21.4.orig/doc/reference/html/EphyCommandManager.html +++ epiphany-browser-2.21.4/doc/reference/html/EphyCommandManager.html @@ -3,12 +3,12 @@ EphyCommandManager - + - + @@ -22,20 +22,20 @@ 		Epiphany Reference Manual Next
Top +
Top  |  - Description + Description  |  - Object Hierarchy + Object Hierarchy  |  - Signals
@@ -47,17 +47,17 @@ - EphyCommandManager; - EphyCommandManagerIface; -void ephy_command_manager_do_command (EphyCommandManager *manager, + EphyCommandManager; + EphyCommandManagerIface; +void ephy_command_manager_do_command (EphyCommandManager *manager, const char *command); -gboolean ephy_command_manager_can_do_command (EphyCommandManager *manager, +gboolean ephy_command_manager_can_do_command (EphyCommandManager *manager, const char *command);
-

Object Hierarchy

+

Object Hierarchy

 
   GInterface
@@ -65,20 +65,20 @@
-

Signals

+

Signals

 
-  "command-changed"                                : Run First
+  "command-changed"                                : Run First
-

Description

+

Description

-An EphyCommandManager is an interface to an EphyEmbed which is used to perform +An EphyCommandManager is an interface to an EphyEmbed which is used to perform commands, such as cut/copy/paste. To perform any command, use -ephy_command_manager_do_command(). To test the availability of a command, use -ephy_command_manager_can_do_command(). The availability of commands depends on -the selection and actions previously performed in the EphyEmbed. For instance, +ephy_command_manager_do_command(). To test the availability of a command, use +ephy_command_manager_can_do_command(). The availability of commands depends on +the selection and actions previously performed in the EphyEmbed. For instance, cmd_copy is only available if text has been selected; cmd_undo is only available if the user has a text input focused and has typed or erased some of its text. @@ -86,7 +86,7 @@

-

Example 1. Copying selected text in an EphyEmbed

+

Example 1. Copying selected text in an EphyEmbed

#include <ephy-embed.h>
 #include <ephy-command-manager.h>
 
@@ -107,7 +107,7 @@
 


 

 

-The EphyCommandManager interface can perform any command which is defined in
+The EphyCommandManager interface can perform any command which is defined in
 Mozilla. However, for purposes of abstraction, only a certain subset of commands
 should be used:
 

@@ -117,25 +117,25 @@
- + - + - + - + - + @@ -144,20 +144,20 @@
-

Details

+

Details

-

+

EphyCommandManager

-
typedef struct _EphyCommandManager EphyCommandManager;
+
typedef struct _EphyCommandManager EphyCommandManager;

-

+

EphyCommandManagerIface

-
typedef struct {
+
typedef struct {
 	GTypeInterface base_iface;
 
 	void		(* do_command)		(EphyCommandManager *manager,
@@ -177,9 +177,9 @@
-

+

ephy_command_manager_do_command ()

-
void                ephy_command_manager_do_command     (EphyCommandManager *manager,
+
void                ephy_command_manager_do_command     (EphyCommandManager *manager,
                                                          const char *command);

 

 Performs command.

@@ -190,12 +190,12 @@
- - + - + @@ -204,9 +204,9 @@
-

+

ephy_command_manager_can_do_command ()

-
gboolean            ephy_command_manager_can_do_command (EphyCommandManager *manager,
+
gboolean            ephy_command_manager_can_do_command (EphyCommandManager *manager,
                                                          const char *command);

 

 Returns TRUE if command can be performed.

@@ -217,17 +217,17 @@
- - + - + - + @@ -236,17 +236,17 @@
-

Signal Details

+

Signal Details

-

-The "command-changed" signal

-
void                user_function                      (EphyCommandManager *manager,
+

+The "command-changed" signal

+
void                user_function                      (EphyCommandManager *manager,
                                                         gchar              *command,
                                                         gpointer            user_data)      : Run First

 

 The ::command-changed signal is emitted when command has changed from being
 available to unavailable, or vice-versa. The new availability can be tested
-with ephy_command_manager_can_do_command().

+with ephy_command_manager_can_do_command().

 

 
 

@@ -254,23 +254,28 @@
- + - + - +

-EphyCommandManager +EphyCommandManager

EphyCommandManager — Performs commands, such as cut/copy/paste
cmd_copy

cmd_copy

Copies selected text
cmd_cut

cmd_cut

Cuts selected text.
cmd_paste

cmd_paste

Pastes text from the clipboard (for example, into a text entry)

cmd_undo

cmd_undo

Undoes the last action (for example, typing text into a text entry
cmd_redo

cmd_redo

Redoes previously undone actions (for example, in a text entry)
manager : an EphyCommandManager +

manager :

 an EphyCommandManager
command :

command :

 the command
manager : an EphyCommandManager +

manager :

 an EphyCommandManager
command :

command :

 the command
Returns :

Returns :

 TRUE if command can be performed.
manager :

manager :
command :

command :

 The command whose avalability has changed
user_data :

user_data :

 user data set when the signal handler was connected.
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/EphyNodeDb.html +++ epiphany-browser-2.21.4/doc/reference/html/EphyNodeDb.html @@ -3,12 +3,12 @@ EphyNodeDb - + - + @@ -22,20 +22,20 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description  |  - Object Hierarchy + Object Hierarchy  |  - Properties + Properties
@@ -47,30 +47,30 @@ - EphyNodeDb; -EphyNodeDb* ephy_node_db_new (const char *name); -gboolean ephy_node_db_load_from_file (EphyNodeDb *db, + EphyNodeDb; +EphyNodeDb* ephy_node_db_new (const char *name); +gboolean ephy_node_db_load_from_file (EphyNodeDb *db, const char *xml_file, const xmlChar *xml_root, const xmlChar *xml_version); -int ephy_node_db_write_to_xml_safe (EphyNodeDb *db, +int ephy_node_db_write_to_xml_safe (EphyNodeDb *db, const xmlChar *filename, const xmlChar *root, const xmlChar *version, const xmlChar *comment, EphyNode *node, ...); -const char* ephy_node_db_get_name (EphyNodeDb *db); -gboolean ephy_node_db_is_immutable (EphyNodeDb *db); -void ephy_node_db_set_immutable (EphyNodeDb *db, +const char* ephy_node_db_get_name (EphyNodeDb *db); +gboolean ephy_node_db_is_immutable (EphyNodeDb *db); +void ephy_node_db_set_immutable (EphyNodeDb *db, gboolean immutable); -EphyNode* ephy_node_db_get_node_from_id (EphyNodeDb *db, +EphyNode* ephy_node_db_get_node_from_id (EphyNodeDb *db, guint id);
-

Object Hierarchy

+

Object Hierarchy

 
   GObject
@@ -78,50 +78,50 @@
-

Properties

+

Properties

 
-  "immutable"                gboolean              : Read / Write
-  "name"                     gchararray            : Read / Write / Construct Only
+  "immutable"                gboolean              : Read / Write
+  "name"                     gchararray            : Read / Write / Construct Only
-

Description

+

Description

-An EphyNodeDb is a database for arbitrary data organized in a tree. +An EphyNodeDb is a database for arbitrary data organized in a tree.

Each database is stored along with its name in a global set of databases. -Databases can be created using ephy_node_db_new() and retrieved using +Databases can be created using ephy_node_db_new() and retrieved using ephy_node_db_get_by_name().

-Each EphyNode inside an EphyNodeDb is identified by a unique node ID. By -keeping a handle on the ID, one can use ephy_node_db_get_node_from_id() to +Each EphyNode inside an EphyNodeDb is identified by a unique node ID. By +keeping a handle on the ID, one can use ephy_node_db_get_node_from_id() to retrieve its corresponding EphyNode.

-EphyNodeDbs can be saved to disk using ephy_node_db_write_to_xml_safe() -and restored using ephy_node_db_load_from_file(). +EphyNodeDbs can be saved to disk using ephy_node_db_write_to_xml_safe() +and restored using ephy_node_db_load_from_file().

-

Details

+

Details

-

+

EphyNodeDb

-
typedef struct _EphyNodeDb EphyNodeDb;
+
typedef struct _EphyNodeDb EphyNodeDb;

-

+

ephy_node_db_new ()

-
EphyNodeDb*         ephy_node_db_new                    (const char *name);
+
EphyNodeDb*         ephy_node_db_new                    (const char *name);

-Creates and returns a new EphyNodeDb, named name.

+Creates and returns a new EphyNodeDb, named name.

@@ -129,13 +129,13 @@
- - + - - + @@ -143,9 +143,9 @@
-

+

ephy_node_db_load_from_file ()

-
gboolean            ephy_node_db_load_from_file         (EphyNodeDb *db,
+
gboolean            ephy_node_db_load_from_file         (EphyNodeDb *db,
                                                          const char *xml_file,
                                                          const xmlChar *xml_root,
                                                          const xmlChar *xml_version);

@@ -157,7 +157,7 @@
 

 

 The data will most probably have been stored using
-ephy_node_db_write_to_xml_safe().

+ephy_node_db_write_to_xml_safe().

 

 
 

@@ -165,27 +165,27 @@
- - + - + - + - + - + @@ -194,9 +194,9 @@
-

+

ephy_node_db_write_to_xml_safe ()

-
int                 ephy_node_db_write_to_xml_safe      (EphyNodeDb *db,
+
int                 ephy_node_db_write_to_xml_safe      (EphyNodeDb *db,
                                                          const xmlChar *filename,
                                                          const xmlChar *root,
                                                          const xmlChar *version,
@@ -205,7 +205,7 @@
                                                          ...);

 

 Writes db's data to an XML file for storage. The data can be retrieved in
-the future using ephy_node_db_load_from_file().
+the future using ephy_node_db_load_from_file().
 

 

 The function arguments are straightforward until node, at which point some
@@ -234,43 +234,43 @@
- - + - + - + - + - + - + - + - + @@ -279,9 +279,9 @@
-

+

ephy_node_db_get_name ()

-
const char*         ephy_node_db_get_name               (EphyNodeDb *db);
+
const char*         ephy_node_db_get_name               (EphyNodeDb *db);

@@ -291,12 +291,12 @@

- - + - + @@ -305,9 +305,9 @@
-

+

ephy_node_db_is_immutable ()

-
gboolean            ephy_node_db_is_immutable           (EphyNodeDb *db);
+
gboolean            ephy_node_db_is_immutable           (EphyNodeDb *db);

@@ -317,12 +317,12 @@

- - + - + @@ -331,9 +331,9 @@
-

+

ephy_node_db_set_immutable ()

-
void                ephy_node_db_set_immutable          (EphyNodeDb *db,
+
void                ephy_node_db_set_immutable          (EphyNodeDb *db,
                                                          gboolean immutable);

 

 If immutable is TRUE, sets db immutable (read-only). Otherwise, sets db
@@ -345,12 +345,12 @@
- - + - + @@ -359,9 +359,9 @@
-

+

ephy_node_db_get_node_from_id ()

-
EphyNode*           ephy_node_db_get_node_from_id       (EphyNodeDb *db,
+
EphyNode*           ephy_node_db_get_node_from_id       (EphyNodeDb *db,
                                                          guint id);

 

 Returns the EphyNode with id id from db, or NULL if no such id exists.

@@ -372,17 +372,17 @@
- - + - + - + @@ -391,28 +391,33 @@
-

Property Details

+

Property Details

-

-The "immutable" property

-
  "immutable"                gboolean              : Read / Write
+

+The "immutable" property

+
  "immutable"                gboolean              : Read / Write

TRUE if no EphyNodes can be added, removed or modified from this -EphyNodeDb +EphyNodeDb

Default value: FALSE

-

-The "name" property

-
  "name"                     gchararray            : Read / Write / Construct Only
+

+The "name" property

+
  "name"                     gchararray            : Read / Write / Construct Only

-A string identifier unique to this EphyNodeDb +A string identifier unique to this EphyNodeDb

Default value: NULL

+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-EphyEmbedPersist.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-EphyEmbedPersist.html @@ -3,12 +3,12 @@ EphyEmbedPersist - + - + @@ -22,16 +22,16 @@ - + Description

-EphyNodeDb +EphyNodeDb

EphyNodeDb — Data tree
name : the name of the new EphyNodeDb +

name :

 the name of the new EphyNodeDb
Returns : the new EphyNodeDb +

Returns :

 the new EphyNodeDb
db : a new EphyNodeDb +

db :

 a new EphyNodeDb
xml_file :

xml_file :

 the filename from which db will be populated
xml_root :

xml_root :

 the root element in xml_file
xml_version :

xml_version :

 the required version attribute in the xml_root
Returns :

Returns :

 TRUE if successful
db : an EphyNodeDb +

db :

 an EphyNodeDb
filename :

filename :

 the XML file in which db's data will be stored
root :

root :

 the desired root element in filename
version :

version :

 the version attribute to the root element
comment :

comment :

 a comment to place directly inside the root element of filename
node :

node :

 The first node of data to write
... :

... :

 number of exceptions, list of their EphyNodes, and more such sequences, followed by NULL
Returns :

Returns :

 0 on success or a negative number on failure
db : an EphyNodeDb +

db :

 an EphyNodeDb
Returns :

Returns :

 the name of db
db : an EphyNodeDb +

db :

 an EphyNodeDb
Returns :

Returns :

 TRUE if db is immutable
db : an EphyNodeDb +

db :

 an EphyNodeDb
immutable :

immutable :

 TRUE to make db immutable
db : an EphyNodeDb +

db :

 an EphyNodeDb
id :

id :

 an id specifying an EphyNode in db
Returns :

Returns :

 an EphyNode
Epiphany Reference Manual Next
Top +
Top  |  - Description
@@ -43,53 +43,53 @@ -void ephy_embed_persist_set_dest (EphyEmbedPersist *persist, +void ephy_embed_persist_set_dest (EphyEmbedPersist *persist, const char *value); -void ephy_embed_persist_set_embed (EphyEmbedPersist *persist, - EphyEmbed *value); -void ephy_embed_persist_set_fc_title (EphyEmbedPersist *persist, +void ephy_embed_persist_set_embed (EphyEmbedPersist *persist, + EphyEmbed *value); +void ephy_embed_persist_set_fc_title (EphyEmbedPersist *persist, const char *value); -void ephy_embed_persist_set_fc_parent (EphyEmbedPersist *persist, +void ephy_embed_persist_set_fc_parent (EphyEmbedPersist *persist, GtkWindow *value); -void ephy_embed_persist_set_flags (EphyEmbedPersist *persist, +void ephy_embed_persist_set_flags (EphyEmbedPersist *persist, EphyEmbedPersistFlags value); -void ephy_embed_persist_set_max_size (EphyEmbedPersist *persist, +void ephy_embed_persist_set_max_size (EphyEmbedPersist *persist, gint64 value); -void ephy_embed_persist_set_persist_key (EphyEmbedPersist *persist, +void ephy_embed_persist_set_persist_key (EphyEmbedPersist *persist, const char *value); -void ephy_embed_persist_set_source (EphyEmbedPersist *persist, +void ephy_embed_persist_set_source (EphyEmbedPersist *persist, const char *value); -const char* ephy_embed_persist_get_dest (EphyEmbedPersist *persist); -EphyEmbed* ephy_embed_persist_get_embed (EphyEmbedPersist *persist); -const char* ephy_embed_persist_get_fc_title (EphyEmbedPersist *persist); -GtkWindow* ephy_embed_persist_get_fc_parent (EphyEmbedPersist *persist); -EphyEmbedPersistFlags ephy_embed_persist_get_flags (EphyEmbedPersist *persist); -gint64 ephy_embed_persist_get_max_size (EphyEmbedPersist *persist); -const char* ephy_embed_persist_get_persist_key (EphyEmbedPersist *persist); -const char* ephy_embed_persist_get_source (EphyEmbedPersist *persist); -gboolean ephy_embed_persist_save (EphyEmbedPersist *persist); -void ephy_embed_persist_cancel (EphyEmbedPersist *persist); -char* ephy_embed_persist_to_string (EphyEmbedPersist *persist); +const char* ephy_embed_persist_get_dest (EphyEmbedPersist *persist); +EphyEmbed* ephy_embed_persist_get_embed (EphyEmbedPersist *persist); +const char* ephy_embed_persist_get_fc_title (EphyEmbedPersist *persist); +GtkWindow* ephy_embed_persist_get_fc_parent (EphyEmbedPersist *persist); +EphyEmbedPersistFlags ephy_embed_persist_get_flags (EphyEmbedPersist *persist); +gint64 ephy_embed_persist_get_max_size (EphyEmbedPersist *persist); +const char* ephy_embed_persist_get_persist_key (EphyEmbedPersist *persist); +const char* ephy_embed_persist_get_source (EphyEmbedPersist *persist); +gboolean ephy_embed_persist_save (EphyEmbedPersist *persist); +void ephy_embed_persist_cancel (EphyEmbedPersist *persist); +char* ephy_embed_persist_to_string (EphyEmbedPersist *persist);
-

Description

+

Description

An EphyEmbedPersist is a relatively simple way to save a web page or file to disk. It is an abstract class, implemented by MozillaEmbedPersist.

-To create an EphyEmbedPersist, use ephy_embed_factory_new_object(). Next, call -ephy_embed_persist_set_flags() and ephy_embed_persist_set_embed(). Depending -on the flags, you may also want to call ephy_embed_persist_set_dest() or -ephy_embed_persist_set_source(). Finally, call ephy_embed_persist_save() to +To create an EphyEmbedPersist, use ephy_embed_factory_new_object(). Next, call +ephy_embed_persist_set_flags() and ephy_embed_persist_set_embed(). Depending +on the flags, you may also want to call ephy_embed_persist_set_dest() or +ephy_embed_persist_set_source(). Finally, call ephy_embed_persist_save() to save the file.

-

Example 3. Saving the current web page to disk

+

Example 3. Saving the current web page to disk

#include <epiphany/ephy-embed-persist.h>
 #include <epiphany/ephy-embed.h>
 
@@ -128,11 +128,11 @@
-

Details

+

Details

-

+

ephy_embed_persist_set_dest ()

-
void                ephy_embed_persist_set_dest         (EphyEmbedPersist *persist,
+
void                ephy_embed_persist_set_dest         (EphyEmbedPersist *persist,
                                                          const char *value);

 

 Sets the path to which persist should save data.

@@ -143,12 +143,12 @@
- + - + @@ -157,17 +157,17 @@
-

+

ephy_embed_persist_set_embed ()

-
void                ephy_embed_persist_set_embed        (EphyEmbedPersist *persist,
-                                                         EphyEmbed *value);
+
void                ephy_embed_persist_set_embed        (EphyEmbedPersist *persist,
+                                                         EphyEmbed *value);

-Sets the EphyEmbed from which persist will download data. +Sets the EphyEmbed from which persist will download data.

-An EphyEmbed is absolutely required to download if persist's +An EphyEmbed is absolutely required to download if persist's EphyEmbedPersistFlags include EPHY_EMBED_PERSIST_COPY_PAGE. Regardless, an -EphyEmbed should be set for every EphyEmbedPersist, +EphyEmbed should be set for every EphyEmbedPersist, since it determines request information such as the referring page.

@@ -176,13 +176,13 @@

- + - - + @@ -190,14 +190,14 @@
-

+

ephy_embed_persist_set_fc_title ()

-
void                ephy_embed_persist_set_fc_title     (EphyEmbedPersist *persist,
+
void                ephy_embed_persist_set_fc_title     (EphyEmbedPersist *persist,
                                                          const char *value);

 

 Sets the title of the filechooser window. The filechooser will only be
 displayed if EPHY_EMBED_PERSIST_ASK_DESTINATION has been set with
-ephy_embed_persist_set_flags().

+ephy_embed_persist_set_flags().

 

 
 

@@ -205,12 +205,12 @@
- + - + @@ -219,14 +219,14 @@
-

+

ephy_embed_persist_set_fc_parent ()

-
void                ephy_embed_persist_set_fc_parent    (EphyEmbedPersist *persist,
+
void                ephy_embed_persist_set_fc_parent    (EphyEmbedPersist *persist,
                                                          GtkWindow *value);

 

-Sets the EphyWindow which should be persist's filechooser's parent. The
+Sets the EphyWindow which should be persist's filechooser's parent. The
 filechooser will only be displayed if EPHY_EMBED_PERSIST_ASK_DESTINATION has been
-set with ephy_embed_persist_set_flags().

+set with ephy_embed_persist_set_flags().

 

 
 

@@ -234,13 +234,13 @@
- + - - + @@ -248,9 +248,9 @@
-

+

ephy_embed_persist_set_flags ()

-
void                ephy_embed_persist_set_flags        (EphyEmbedPersist *persist,
+
void                ephy_embed_persist_set_flags        (EphyEmbedPersist *persist,
                                                          EphyEmbedPersistFlags value);

 

 Sets the flags to be used for persist's download.

@@ -261,12 +261,12 @@
- + - + @@ -275,9 +275,9 @@
-

+

ephy_embed_persist_set_max_size ()

-
void                ephy_embed_persist_set_max_size     (EphyEmbedPersist *persist,
+
void                ephy_embed_persist_set_max_size     (EphyEmbedPersist *persist,
                                                          gint64 value);

 

 Sets the maximum size of persist's download.
@@ -294,12 +294,12 @@
- + - + @@ -308,9 +308,9 @@
-

+

ephy_embed_persist_set_persist_key ()

-
void                ephy_embed_persist_set_persist_key  (EphyEmbedPersist *persist,
+
void                ephy_embed_persist_set_persist_key  (EphyEmbedPersist *persist,
                                                          const char *value);

 

 Sets the GConf key from which persist will determine the default download
@@ -322,12 +322,12 @@
- + - + @@ -336,13 +336,13 @@
-

+

ephy_embed_persist_set_source ()

-
void                ephy_embed_persist_set_source       (EphyEmbedPersist *persist,
+
void                ephy_embed_persist_set_source       (EphyEmbedPersist *persist,
                                                          const char *value);

 

 Sets the URL from which persist should download. This should be used in
-conjunction with ephy_embed_persist_set_embed().

+conjunction with ephy_embed_persist_set_embed().

 

 
 

@@ -350,12 +350,12 @@
- + - + @@ -364,9 +364,9 @@
-

+

ephy_embed_persist_get_dest ()

-
const char*         ephy_embed_persist_get_dest         (EphyEmbedPersist *persist);
+
const char*         ephy_embed_persist_get_dest         (EphyEmbedPersist *persist);

Returns the destination filename to which persist will save its download.

@@ -376,12 +376,12 @@

- + - + @@ -390,11 +390,11 @@
-

+

ephy_embed_persist_get_embed ()

-
EphyEmbed*          ephy_embed_persist_get_embed        (EphyEmbedPersist *persist);
+
EphyEmbed*          ephy_embed_persist_get_embed        (EphyEmbedPersist *persist);

-Returns the EphyEmbed from which persist will download.

+Returns the EphyEmbed from which persist will download.

@@ -402,13 +402,13 @@
- + - - + @@ -416,9 +416,9 @@
-

+

ephy_embed_persist_get_fc_title ()

-
const char*         ephy_embed_persist_get_fc_title     (EphyEmbedPersist *persist);
+
const char*         ephy_embed_persist_get_fc_title     (EphyEmbedPersist *persist);

Returns the title to be displayed in persist's filechooser.

@@ -428,12 +428,12 @@

- + - + @@ -442,11 +442,11 @@
-

+

ephy_embed_persist_get_fc_parent ()

-
GtkWindow*          ephy_embed_persist_get_fc_parent    (EphyEmbedPersist *persist);
+
GtkWindow*          ephy_embed_persist_get_fc_parent    (EphyEmbedPersist *persist);

-Returns the EphyWindow which should serve as a parent for persist's +Returns the EphyWindow which should serve as a parent for persist's filechooser.

@@ -455,13 +455,13 @@

- + - - + @@ -469,9 +469,9 @@
-

+

ephy_embed_persist_get_flags ()

-
EphyEmbedPersistFlags ephy_embed_persist_get_flags      (EphyEmbedPersist *persist);
+
EphyEmbedPersistFlags ephy_embed_persist_get_flags      (EphyEmbedPersist *persist);

Returns persist's EphyEmbedPersistFlags.

@@ -481,12 +481,12 @@

- + - + @@ -495,9 +495,9 @@
-

+

ephy_embed_persist_get_max_size ()

-
gint64              ephy_embed_persist_get_max_size     (EphyEmbedPersist *persist);
+
gint64              ephy_embed_persist_get_max_size     (EphyEmbedPersist *persist);

Returns the maximum size of persist's requested download, in bytes.

@@ -507,12 +507,12 @@

- + - + @@ -521,9 +521,9 @@
-

+

ephy_embed_persist_get_persist_key ()

-
const char*         ephy_embed_persist_get_persist_key  (EphyEmbedPersist *persist);
+
const char*         ephy_embed_persist_get_persist_key  (EphyEmbedPersist *persist);

Returns the GConf key which determines Epiphany's default download directory.

@@ -533,12 +533,12 @@

- + - + @@ -547,9 +547,9 @@
-

+

ephy_embed_persist_get_source ()

-
const char*         ephy_embed_persist_get_source       (EphyEmbedPersist *persist);
+
const char*         ephy_embed_persist_get_source       (EphyEmbedPersist *persist);

Returns the source URL of the file to download.

@@ -559,12 +559,12 @@

- + - + @@ -573,9 +573,9 @@
-

+

ephy_embed_persist_save ()

-
gboolean            ephy_embed_persist_save             (EphyEmbedPersist *persist);
+
gboolean            ephy_embed_persist_save             (EphyEmbedPersist *persist);

Begins saving the file specified in persist.

@@ -593,12 +593,12 @@
- + - + @@ -607,9 +607,9 @@
-

+

ephy_embed_persist_cancel ()

-
void                ephy_embed_persist_cancel           (EphyEmbedPersist *persist);
+
void                ephy_embed_persist_cancel           (EphyEmbedPersist *persist);

Cancels persist's download. This will not delete the partially downloaded file.

@@ -619,7 +619,7 @@

-EphyEmbedPersist +EphyEmbedPersist

EphyEmbedPersist — A class to download files
persist :

persist :

 an EphyEmbedPersist
value :

value :

 the path to which persist should save data
persist :

persist :

 an EphyEmbedPersist
value : a parent EphyEmbed +

value :

 a parent EphyEmbed
persist :

persist :

 an EphyEmbedPersist
value :

value :

 the title to be displayed by the filechooser
persist :

persist :

 an EphyEmbedPersist
value : the EphyWindow which should be the filechooser's parent +

value :

 the EphyWindow which should be the filechooser's parent
persist :

persist :

 an EphyEmbedPersist
value :

value :

 the desired EphyEmbedPersistFlags
persist :

persist :

 an EphyEmbedPersist
value :

value :

 maximum size of requested download, in bytes
persist :

persist :

 an EphyEmbedPersist
value :

value :

 a GConf key
persist :

persist :

 an EphyEmbedPersist
value :

value :

 the URL from which persist should download
persist :

persist :

 an EphyEmbedPersist
Returns :

Returns :

 persist's destination filename
persist :

persist :

 an EphyEmbedPersist
Returns : the EphyEmbed from which persist will download +

Returns :

 the EphyEmbed from which persist will download
persist :

persist :

 an EphyEmbedPersist
Returns :

Returns :

 the title to be displayed in persist's filechooser
persist :

persist :

 an EphyEmbedPersist
Returns : the EphyWindow parent for persist's filechooser +

Returns :

 the EphyWindow parent for persist's filechooser
persist :

persist :

 an EphyEmbedPersist
Returns :

Returns :

 persist's EphyEmbedPersistFlags
persist :

persist :

 an EphyEmbedPersist
Returns :

Returns :

 the maximum size of persist's requested download, in bytes
persist :

persist :

 an EphyEmbedPersist
Returns :

Returns :

 the GConf key to the default download directory
persist :

persist :

 an EphyEmbedPersist
Returns :

Returns :

 a source URL
persist :

persist :

 an EphyEmbedPersist
Returns :

Returns :

 TRUE if the download began successfully
- + @@ -627,18 +627,18 @@
-

+

ephy_embed_persist_to_string ()

-
char*               ephy_embed_persist_to_string        (EphyEmbedPersist *persist);
+
char*               ephy_embed_persist_to_string        (EphyEmbedPersist *persist);

Returns the download specified by persist as a string instead of downloading it to a file.

-The download is synchronous. An EphyEmbed must be specified with -ephy_embed_persist_set_embed(). The function implicitly assumes that +The download is synchronous. An EphyEmbed must be specified with +ephy_embed_persist_set_embed(). The function implicitly assumes that persist's EphyEmbedPersistFlags include EPHY_EMBED_PERSIST_COPY_PAGE. If persist's -EphyEmbed has not finished downloading, this function will only return the +EphyEmbed has not finished downloading, this function will only return the portion of data which has already been downloaded.

@@ -651,19 +651,24 @@

- + - - +
persist :

persist :

 an EphyEmbedPersist
persist :

persist :

 an EphyEmbedPersist
Returns : The contents of persist's EphyEmbed's web page +

Returns :

 The contents of persist's EphyEmbed's web page
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-EphyEmbedFactory.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-EphyEmbedFactory.html @@ -3,12 +3,12 @@ EphyEmbedFactory - + - + @@ -22,16 +22,16 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description
@@ -43,27 +43,27 @@ -GObject* ephy_embed_factory_new_object (GType type); +GObject* ephy_embed_factory_new_object (GType type);
-

Description

+

Description

-EphyEmbed, EphyEmbedPersist and EphyEmbedSingle are all interfaces. In the +EphyEmbed, EphyEmbedPersist and EphyEmbedSingle are all interfaces. In the interest of abstraction, the only recommended way to create new instances of the objects which implement these interfaces is to use EphyEmbedFactory.

-To create a new instance of an EphyEmbed, EphyEmbedPersist or -EphyEmbedSingle, use ephy_embed_factory_new_object(). +To create a new instance of an EphyEmbed, EphyEmbedPersist or +EphyEmbedSingle, use ephy_embed_factory_new_object().

-

Details

+

Details

-

+

ephy_embed_factory_new_object ()

-
GObject*            ephy_embed_factory_new_object       (GType type);
+
GObject*            ephy_embed_factory_new_object       (GType type);

Create an instance of an object implementing the type interface.

@@ -73,12 +73,12 @@

- + - + @@ -86,6 +86,11 @@

-EphyEmbedFactory +EphyEmbedFactory

EphyEmbedFactory — Factory for creating new embed objects
type :

type :

 a GType specifying which object to create
Returns :

Returns :

 the object instance
+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/ch02.html +++ epiphany-browser-2.21.4/doc/reference/html/ch02.html @@ -3,12 +3,12 @@ Incomplete - + - + @@ -23,7 +23,7 @@

-Incomplete

+Incomplete
ephy-cookie-manager --- epiphany-browser-2.21.4.orig/doc/reference/html/epiphany-EphyGlade.html +++ epiphany-browser-2.21.4/doc/reference/html/epiphany-EphyGlade.html @@ -3,12 +3,12 @@ EphyGlade - + - + @@ -22,16 +22,16 @@ Epiphany Reference Manual Next -Top +Top  |  - Description + Description
@@ -46,25 +46,30 @@
-

Description

+

Description

Epiphany has its own convenience wrapper around glade_xml_new() which will automatically connect all a widget's signals and return the GtkWidget root object.

After retrieving a GladeXML object from ephy_glade_widget_new(), regular GladeXML functions can be called on that object.

-

Details

+

Details

+
+
+
+
+
--- epiphany-browser-2.21.4.orig/doc/reference/html/style.css +++ epiphany-browser-2.21.4/doc/reference/html/style.css @@ -1,16 +1,16 @@ -.synopsis, .classsynopsis +.synopsis, .classsynopsis { background: #eeeeee; border: solid 1px #aaaaaa; padding: 0.5em; } -.programlisting +.programlisting { background: #eeeeff; border: solid 1px #aaaaff; padding: 0.5em; } -.variablelist +.variablelist { padding: 4px; margin-left: 3em; @@ -19,62 +19,88 @@ { vertical-align: top; } + /* this is needed so that the local anchors are displayed below the naviagtion */ -div.refnamediv a[name], div.refsect1 a[name] -{ - position: relative; - top: -4.5em; -} -table.navigation#top -{ - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0; - margin-bottom: 0; - position: fixed; - top: 0; - left: 0; - height: 2em; - z-index: 1; -} -.navigation a -{ - color: #770000; +@media screen { + div.refnamediv a[name], div.refsect1 a[name] + { + position: relative; + top: -4.5em; + } + table.navigation#top + { + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + position: fixed; + top: 0; + left: 0; + height: 2em; + z-index: 1; + } + .navigation a + { + color: #770000; + } + .navigation a:visited + { + color: #550000; + } + td.shortcuts + { + color: #770000; + font-size: 80%; + } + div.refentry, div.chapter, div.reference, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface + { + position: relative; + top: 3em; + z-index: 0; + } + div.refnamediv + { + margin-top: 2em; + } + body + { + padding-bottom: 20em; + } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 2em; + } } -.navigation a:visited -{ - color: #550000; -} -.navigation .title + +.navigation .title { font-size: 200%; } -td.shortcuts -{ - color: #770000; - font-size: 80%; -} -div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface -{ - position: relative; - top: 3em; - z-index: 0; -} -div.refnamediv -{ - margin-top: 2em; -} -div.gallery-float + +div.gallery-float { float: left; padding: 10px; } -div.gallery-float img +div.gallery-float img { border-style: none; } -div.gallery-spacer +div.gallery-spacer { clear: both; } @@ -110,3 +136,13 @@ { background-color: #eeeeee; } + +hr +{ + color: #888; + background: #888; + border: 0; + height: 1px; + clear: both; +} + --- epiphany-browser-2.21.4.orig/debian/epiphany-webkit.postinst +++ epiphany-browser-2.21.4/debian/epiphany-webkit.postinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --install \ + /usr/bin/$alt $alt /usr/bin/epiphany-webkit 80 \ + --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-webkit.1.gz +done + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.21.4.orig/debian/epiphany-browser.install +++ epiphany-browser-2.21.4/debian/epiphany-browser.install @@ -0,0 +1,2 @@ +debian/epiphany.sh /usr/bin/ +debian/bug/control /usr/share/bug/epiphany-browser/ --- epiphany-browser-2.21.4.orig/debian/epiphany-gecko.postinst +++ epiphany-browser-2.21.4/debian/epiphany-gecko.postinst @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --install \ + /usr/bin/$alt $alt /usr/bin/epiphany-gecko 85 \ + --slave /usr/share/man/man1/$alt.1.gz $alt.1.gz /usr/share/man/man1/epiphany-gecko.1.gz +done + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.21.4.orig/debian/copyright +++ epiphany-browser-2.21.4/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Edd Dumbill on 14 Feb 2003. + +It was downloaded from + +Upstream authors: + Marco Pesenti Gritti + Xan Lopez + Christian Persch + Adam Hooper + Jean-François Rameau + Crispin Flowerday + +License: + + This package 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 of the License, or + (at your option) any later version. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2003-2007, the Debian GNOME team + and +is licensed under the GPL, see above. --- epiphany-browser-2.21.4.orig/debian/epiphany-browser-data.gconf-defaults +++ epiphany-browser-2.21.4/debian/epiphany-browser-data.gconf-defaults @@ -0,0 +1,2 @@ +/apps/epiphany/general/homepage file:///usr/share/ubuntu-artwork/home/locales/index-%l.html +/apps/epiphany/web/language [system] --- epiphany-browser-2.21.4.orig/debian/control.in +++ epiphany-browser-2.21.4/debian/control.in @@ -0,0 +1,114 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + pkg-config, + libglib2.0-dev (>= 2.13.4), + libgtk2.0-dev (>= 2.11.6), + libxml2-dev (>= 2.6.12), + libxslt1-dev (>= 1.1.7), + libglade2-dev (>= 2.3.1), + libgnomevfs2-dev (>= 2.9.2), + libgnome2-dev (>= 2.14.0), + libgnomeui-dev (>= 2.16.0-2), + libgconf2-dev, + libgnome-desktop-dev (>= 2.9.91), + libstartup-notification0-dev (>= 0.5), + libdbus-glib-1-dev (>= 0.60), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxml-parser-perl, + xulrunner-1.9-dev (>= 1.9~b3~), + iso-codes (>= 0.35), + python-dev (>= 2.3), + python-gtk2-dev (>= 2.7.1), + python-gnome2-dev (>= 2.6.0), + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.35.0), + x11proto-core-dev, + network-manager-dev, + quilt, + libenchant-dev (>= 1.0), + gtk-doc-tools (>= 1.0), + liblaunchpad-integration-dev +Standards-Version: 3.7.2 + +Package: epiphany-browser +Architecture: all +Depends: epiphany-gecko | epiphany-webkit +Description: Intuitive web browser - dummy package + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This dummy package installs Epiphany with the Gecko backend by default. + +Package: epiphany-gecko +Architecture: any +Depends: epiphany-browser-data (>= ${gnome:Version}), + epiphany-browser-data (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + gnome-icon-theme (>= 2.9.90), + dbus, + iso-codes, + xulrunner-1.9 (>= 1.9~b3~), + ${misc:Depends} +Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1) +Recommends: yelp, epiphany-extensions +Breaks: epiphany-extensions (<< 2.20.1-2ubuntu3) +Suggests: mozplugger +Provides: www-browser, gnome-www-browser +Description: Intuitive GNOME web browser - Gecko version + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. Simplicity is achieved by a well designed user interface and + reliance on external applications for performing external tasks (such as + reading email). Simplicity should not mean less powerful. Standards + compliance is achieved on the HTML side by using the Gecko + rendering engine, as developed for the Mozilla and Firefox browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Gecko backend to render web pages. + . + Homepage: http://www.gnome.org/projects/epiphany/ + +Package: epiphany-browser-data +Architecture: all +Depends: ${misc:Depends} +Recommends: epiphany-browser +Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1) +Replaces: epiphany-browser (<< 2.20.1-2ubuntu1) +Description: Data files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains the common files, artwork and translations for + Epiphany. + +Package: epiphany-browser-dev +Architecture: all +Section: devel +Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2) +Description: Development files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package is required to develop extensions for Epiphany. + +Package: epiphany-browser-dbg +Architecture: any +Section: gnome +Priority: extra +Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version}) +Description: Debugging symbols for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains detached debugging symbols. --- epiphany-browser-2.21.4.orig/debian/rules +++ epiphany-browser-2.21.4/debian/rules @@ -0,0 +1,174 @@ +#!/usr/bin/make -f + +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := epiphany + +STAMP_DIR := debian/stamp +BUILD_DIR := debian/build +PATCH_DIR := debian/patches + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) + +CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2) + +FLAVORS := gecko + +common_configure_flags := \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dbus \ + --disable-scrollkeeper \ + --enable-zeroconf \ + --enable-python \ + --enable-network-manager + +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) +else + common_configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +gecko_configure_flags := $(common_configure_flags) \ + --libexecdir=\$${prefix}/lib/epiphany-gecko \ + --with-engine=mozilla \ + --with-gecko=libxul-embedding \ + --enable-gtk-doc \ + --enable-spell-checker + +webkit_configure_flags := $(common_configure_flags) \ + --libexecdir=\$${prefix}/lib/epiphany-webkit \ + --with-engine=webkit + +patch: $(STAMP_DIR)/patch-stamp +$(STAMP_DIR)/patch-stamp: + dh_testdir + mkdir -p $(STAMP_DIR) + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2 + touch $@ + +builddir = $(BUILD_DIR)/$* + +configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS)) +$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp + dh_testdir + mkdir -p $(builddir) + cd $(builddir) && \ + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + $(CURDIR)/configure $($*_configure_flags) + touch $@ + +build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS)) +$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-% + dh_testdir + $(MAKE) -C $(builddir) + touch $@ + +installdir = $(CURDIR)/debian/epiphany-$* + +install-clean: + dh_testdir + dh_testroot + dh_clean -k + +install-%: $(STAMP_DIR)/build-stamp-% + $(MAKE) -C $(builddir) install DESTDIR=$(installdir) + cd $(installdir)/usr/bin && mv epiphany epiphany-$* + rm -f $(installdir)/usr/lib/epiphany*/*/*/*a + echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/epiphany-$*.substvars + echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/epiphany-$*.substvars + +install: install-clean $(addprefix install-, $(FLAVORS)) + dh_installdirs + mv debian/epiphany-gecko/usr/include debian/epiphany-browser-dev/usr/ + mv debian/epiphany-gecko/usr/lib/pkgconfig debian/epiphany-browser-dev/usr/lib/ + cd debian/epiphany-gecko/usr/share && \ + mv aclocal pygtk gtk-doc $(CURDIR)/debian/epiphany-browser-dev/usr/share/ + mv debian/epiphany-gecko/etc/* debian/epiphany-browser-data/etc + rmdir debian/epiphany-gecko/etc + mv debian/epiphany-gecko/usr/share debian/epiphany-browser-data/usr/ +# cd debian/epiphany-webkit && rm -rf etc usr/share usr/lib/pkgconfig usr/include + cd debian/epiphany-browser-data/usr/share/epiphany-browser && \ + mv mime-types-permissions.xml default-prefs.js $(CURDIR)/debian/epiphany-browser-data/etc/gnome/epiphany/ + cd debian/epiphany-browser-data/usr/share/man/man1 && \ + mv epiphany.1 epiphany-browser.1 +# Correct help file paths + cd debian/epiphany-browser-data/usr/share/omf && mv epiphany epiphany-browser + cd debian/epiphany-browser-data/usr/share/gnome/help && mv epiphany epiphany-browser + find debian/epiphany-browser-data/usr/share/omf/epiphany-browser/ \ + -name "*.omf" -exec perl -pi -e 's#/usr/share/gnome/help/epiphany/#/usr/share/gnome/help/epiphany-browser/#' {} \; + +# Make both epiphanies installable together + for f in $(FLAVORS); do \ + F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \ + mkdir -p debian/epiphany-$$f/usr/share/applications ; \ + ( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \ + debian/epiphany-browser-data/usr/share/applications/epiphany.desktop \ + | sed "s,epiphany-browser,epiphany-$$f," \ + | grep -v ^TryExec | grep -v ^MimeType ; \ + echo NoDisplay=true ) \ + > debian/epiphany-$$f/usr/share/applications/epiphany-$$f.desktop ; \ + done + dh_install + cd debian/epiphany-browser/usr/bin && \ + mv epiphany.sh epiphany + +clean:: + dh_testdir + dh_testroot + QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2 + rm -rf .pc + rm -f po/.intltool-merge-cache + rm -f intltool-extract intltool-update intltool-merge + rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR) + dh_clean + +binary: binary-arch binary-indep + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs -i ChangeLog ChangeLog-* + dh_installdocs -i + dh_installman -i + dh_installmenu -i + dh_link -i + dh_scrollkeeper -i + dh_gconf -i + dh_desktop -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs -a ChangeLog ChangeLog-* + dh_installdocs -a + dh_installman -a + dh_installmenu -a + dh_link -a + dh_scrollkeeper -a + dh_gconf -a + dh_desktop -a + dh_strip -a --dbg-package=epiphany-browser-dbg + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary --- epiphany-browser-2.21.4.orig/debian/watch +++ epiphany-browser-2.21.4/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://download.gnome.org/sources/epiphany/([\d\.]+)[02468]/ \ + epiphany-(.*)\.tar\.gz \ + debian uupdate --- epiphany-browser-2.21.4.orig/debian/epiphany-browser-data.docs +++ epiphany-browser-2.21.4/debian/epiphany-browser-data.docs @@ -0,0 +1,4 @@ +NEWS +README +TODO +AUTHORS --- epiphany-browser-2.21.4.orig/debian/changelog +++ epiphany-browser-2.21.4/debian/changelog @@ -0,0 +1,1387 @@ +epiphany-browser (2.21.4-0ubuntu5) hardy; urgency=low + + * Revert the 12_gxx43 patch before upload. + + -- Matthias Klose Fri, 25 Jan 2008 13:10:58 +0000 + +epiphany-browser (2.21.4-0ubuntu4) hardy; urgency=low + + * Fix build failures with g++-4.3. + + -- Matthias Klose Thu, 24 Jan 2008 15:03:42 +0000 + +epiphany-browser (2.21.4-0ubuntu3) hardy; urgency=low + + * respin against updated xulrunner-1.9 (>= 1.9~b3~) that uses system-nspr + nss,cairo: + - update debian/control + * fix http authentication by implementing nsIPromptService2 as a workaround + until xulrunner implements a proper adaptor to nsIPromptService + - add debian/patches/98a_nsipromptservice2_workaround.patch + - update debian/patches/series + * implement missing symbol |DisplayProtectedAuth| recently added to xulrunner + trunk + - add debian/patches/98b_gtk_nss_dialog_missing_symbol.patch + - update debian/patches/series + + -- Alexander Sack Wed, 02 Jan 2008 12:54:28 +0100 + +epiphany-browser (2.21.4-0ubuntu2) hardy; urgency=low + + * debian/control.in, debian/rules: + - build using xulrunner + * debian/patches/98_xulrunner1.9_build_changes.patch: + - changes from Alexander Sack to build using xulrunner1.9 + * debian/patches/99_autoreconf.patch: + - updated + + -- Sebastien Bacher Tue, 18 Dec 2007 15:22:07 +0100 + +epiphany-browser (2.21.4-0ubuntu1) hardy; urgency=low + + * New upstream version + A big refactoring of the Epiphany internals was done in order to achieve + better cross-engine support. It can be roughly separated in two chunks: + - EphyTab and its usage of GtkMozEmbed specific signals was transformed + into generic code under EphyBaseEmbed with backend-agnostic + gobject-properties. Backends are now encouraged to subclass EphyBaseEmbed + and update its properties to keep them in sync with the engine state. + In turn, the browser chrome will connect to the notify:: signals + for the properties to update its UI to reflect those changes. + - In some situations the embed/ code will need to know some specific + details of the fronted (for example, the active child among all the + embed instances in the popup management code). Instead of directly + accessing the fronted, an generic EphyEmbedContainer interface + has been created, offering all the needed methods.In Epiphany, + this interface is implemented by EphyWindow. + Bug fixes: + - Add saved files to the GtkRecent list. Fixes Bug #148401. + - Make cursor be at the end of the URL when selecting entries from the + completion popup. Fixes bug #466344. + - Fix multihead problems in toolbar editor. + - Fix download-icon toolip updates. Fixes bug #343238. + - Default to Cancel on Cert dialogues. Fixes bug #163379. + - Remove "Add bookmark" and "Save as" from the document context menu. + Part of bug #332968. + - Fix completion model to show icons for history items too, + history/bookmarks/favicon_cache service objects are now stored in the + completion priv. Fixes bug #459811. + - Sets page header and footer margins to a reasonable value when printing. + Workaround for bug #346110. + - Adds a check for NULL pointer in ephy-session.c, fixing wrong behaviour + when restoring Epiphany in some cases. Fix for bug #488718. + - Updates to new NetworkManager API signals for status monitoring. + - Take the page orientation from the page setup, not from + the print settings. Bug #485670 (see also gtk+ bug #485685). + - Makes the Go button behaviour consistent with the "Enter" behaviour. Both + actions search for keywords or load the url. Fixes #484178. + - EphyContentPolicy::ShouldLoad: use the same content policy for + http and https, allowing adblock to work on https. Fixes bug #471583. + - Make Epiphany properly remember the last saved location + in the FileChooser. Fix for bug #336251. + - Make session recovery focus work properly and remember the active tab. + Fixes bug #317272. + - Fix disable_toolbar_editing lockdown not respected for Remove and Move + actions on toolbar buttons. Fixes bug #475641. + - Change the hint of the bookmarking properties dialog to DIALOG, instead + of NORMAL. Make bookmarking work in fullscreen mode and does not put + bookmark properties windows in the taskbar. Fixes bug #478928. + - Find toolbar now remembers last pattern searched also when opened with + slash or apostrophe. Fixes bug #343337. + - Add a somewhat tricky fix for url titles not visible on the completion + popup of the location entry when using a dark theme (like Darkilouche). + Fixes bug #446898. + - Private instances of Epiphany now remove the profile dir on exit. + Note that the profile dir won't be deleted if it's a custom path. + Fixes bug #329680. + - Make "Up" button dropdown menu show titles instead of URLs for already + visited pages. Fix for bug #323764. + - Remove ellipsis from View -> Page Security Information, as it does not + require further user interaction to complete. Fix for bug #483312. + - Hide Back/Forward buttons when disable_history lockdown key is enabled. + Fixes bug #394795. + - Add explanation label to "Only from sites you visit" radio button. + Fixes bug 493422. + Changes: + - Add accessibility theme icons for our apps icon. + - Enable printing to PDF file on gecko 1.9, now that moz#367907 is fixed. + - Make 'Not found' on find toolbar temporarily bold and sounds the bell + signal when searching on a page and no results are found. + Fixes bug #363004. + - Makes tooltips for Back and Forward buttons display the titles of + relative pages. Fixes bug #341400. + - Add drag-and-drop of URLs onto "New Tab" and "New Window" buttons in + the toolbar. Fixes bug #382383. + - Add a broom icon in the search entry of the History window, + like in Bookmarks Editor. Fixes bug #476179. + - Use friendly display for mailto: links; shows a nice text in status bar + when hovering a mailto: link. Fixes bug #339161. + - Fix the build of the custom GTK+ filepicker. Add a preview for the + FileChooser. The default size is 150x150. Fixes bug #440859. + - Make the location entry completion cells smarter, now bookmarks take the + full width of the popup. Also make titles of history entries align + to the left so it's easier to browse a lot of entries with similar + titles. Almost-fixes bug #419475. + - Change the "Powered by" name in the About dialog according to the used + backend. Fix for bug #478196. + - Display "Execute script " string as tooltip for bookmark action + instead of the whole javascript code when bookmarking a scriptlet. + Fix bug #492695. + - Update to latest EggToolbarEditor code. + This supports changing the editor's model during runtime and + tries to avoid some possibly leaking signal handlers. Fixes bug #493149. + - Adds a column in the history window showing the date and the time of the + visit, substitutes radiobuttons with checkboxes in the View menu of the + window. Fix bug #380156. + - Enable a --with-distributor-name configure option, defaulting to Epiphany. + Use it on an error page to designate the distributors/developers to + contact. Fixes bug #433796. + - Add a "Remove all" button to the Personal Data Manager for both the + cookies and the passwords. Addresses bug #148314. + - Fix a bug in EphyNodeView which caused problems when setting columns + as resizable; thanks to Kristian Rietveld for finding out the cause. + Make history window columns resizable and bookmarks editor columns + resizable and sortable. Fixes bug #132808. + * debian/control.in: + - use Breaks on epiphany-extensions due to version change + * debian/patches/02_ac_init.patch: + - updated + * debian/patches/08_localized_startup_page.patch: + - updated + * debian/patches/13_powered-by.patch, + debian/patches/14_webkit-scrollbars.patch, + debian/patches/15_webkit-gtk-api.patch, + debian/patches/16_webkit-missing-methods.patch, + debian/patches/17_webkit-signal-emission.patch: + - removed, fixed with the new version + * debian/patches/99_autoreconf.patch: + - updated + + -- Sebastien Bacher <seb128@canonical.com> Mon, 17 Dec 2007 10:32:26 +0100 + +epiphany-browser (2.20.2-1ubuntu2) hardy; urgency=low + + * debian/control.in: + - epiphany-browser-dbg recommends firefox-dbg (LP: #174445) + * debian/patches/07_use_correct_program_name.patch: + - dropped, not required since there is an epiphany-browser alternative now, + and fixes the help directory (LP: #175157) + * debian/rules: + - use the same gecko directory naming than debian + + -- Sebastien Bacher <seb128@canonical.com> Tue, 11 Dec 2007 12:55:51 +0100 + +epiphany-browser (2.20.2-1ubuntu1) hardy; urgency=low + + * The webkit variant is not built for now since it's not juged good enough + to compete with the gecko one yet and not worth promoting webkit. + The package could be maintained to universe as a different source for now. + * Sync with Debian + * debian/control.in: + - Build-Depends on firefox-dev (>= 1.5), liblaunchpad-integration-dev + - Depends on firefox (>= 1.5) and not xulrunner-gnome-support + - don't build the webkit variant + - don't Build-Depends on libxul-dev + - don't Recommends xulrunner debug packages + - mention Firefox rather than Iceweasel + - package maintained by the Ubuntu Desktop Team + - update transition version + * debian/epiphany-browser-data.gconf-defaults: + - change startup page + * debian/patches/03_dbus.patch: + - don't use hack from Debian to start a private instance when it can't + connect to the dbus, changes made while running that mode are not stored + (Ubuntu: #74725) + * debian/patches/06_lpi.patch: + - launchpad integration + * debian/patches/07_use_correct_program_name.patch: + - use "epiphany" instead of PACKAGE to work with the epiphany-browser name + change, fix session storing (Ubuntu: #43130) + * debian/patches/08_localized_startup_page.patch: + - use the startup page corresponding to the locale used + * debian/patches/11_useragent-weasel.patch: + - don't use, the change is Debian specific + * debian/patches/99_autoreconf.patch: + - updated + * debian/rules: + - build with firefox, not xulrunner + - don't build the webkit variant + - don't change the gecko build directory + + -- Sebastien Bacher <seb128@canonical.com> Wed, 05 Dec 2007 14:17:00 +0100 + +epiphany-browser (2.20.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * debian/bug/control: ship a bug control file in epiphany-browser to + correctly report dependencies of epiphany-{gecko,webkit}. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/18_ephy-session_crash.patch: + - Dropped, merged upstream. + + debian/patches/02_ac_init.patch: + - Updated for the new version. + + debian/patches/99_autoreconf.patch: + - Regenerated. + + -- Sebastian Dröge <slomo@debian.org> Sat, 01 Dec 2007 17:45:45 +0100 + +epiphany-browser (2.20.1-2) unstable; urgency=low + + * 18_ephy-session_crash.patch: stolen from upstream SVN. Fixes crash + when loading a session. Closes: #449003. + + -- Josselin Mouette <joss@debian.org> Thu, 15 Nov 2007 21:14:29 +0100 + +epiphany-browser (2.20.1-1) unstable; urgency=low + + [ Nelson A. de Oliveira ] + * Fix menu files for epiphany-webkit and epiphany-gecko (Closes: #444066). + + [ Josselin Mouette ] + * 13_powered-by.patch: stolen from SVN. Don't display "powered by + Gecko" in the webkit version's about dialog. Also fix translations + accordingly. Closes: #444999. + * 14_webkit-scrollbars.patch: stolen from SVN. Implement size_request + for EphyTab, getting scrollbars to work for the webkit engine. + Closes: #444044. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/02_ac_init.patch: + - Updated for the new version. + + debian/patches/12_contentmanager_block_https.patch: + - Dropped, merged upstream. + * debian/patches/15_webkit-gtk-api.patch: + + Update to the latest WebKit/Gtk API. Patch taken from upstream SVN. + Closes: #447371. + * debian/patches/16_webkit-missing-methods.patch: + + Implement some missing methods and add some workarounds for WebKit + bugs. Patch taken from upstream SVN. There are more patches in SVN + that make the WebKit backened more useful but can't easily be backported + because of API changes in epiphany. + * debian/patches/17_webkit-signal-emission.patch: + + Don't emit signal that we don't have. Patch taken from upstream SVN. + * debian/patches/99_autoreconf.patch: + + Regenerate autotools stuff for the new version. + + -- Sebastian Dröge <slomo@debian.org> Thu, 01 Nov 2007 06:37:43 +0100 + +epiphany-browser (2.20.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * Fix typo that lead NoDisplay to be ignored. + * Remove MimeType entries from the additional .desktop files. + * 12_contentmanager_block_https.patch: use the same content policy for + http and https, allowing adblock to work on https. Closes: #439772. + + [ Loic Minier ] + * Cleanup whitespaces in control. + + -- Josselin Mouette <joss@debian.org> Sat, 29 Sep 2007 01:28:11 +0200 + +epiphany-browser (2.20.0-1) unstable; urgency=low + + * epiphany.sh: ship epiphany as a wrapper script for epiphany-browser + instead of a symbolic link the other way round. This way all + processes should be named epiphany-browser which is recognized by + bug-buddy. Closes: #433443. + * New upstream release. + * Bump required build-dependencies. + * Build two flavors of epiphany, one with webkit and one with gecko. + * Separate them in two packages installable simultaneously. + * 00_browser_wrapper_path.patch: add a TryExec key as the desktop + entry is moved to the data package. + * Refresh other patches. + * 05_libexecdir.patch: use libexecdir for the plugin directory, so + that it can be different for both backends. + * Introduce a new alternative, epiphany-browser, and register both + versions for it. + * epiphany-browser.menu: update to the new menu policy. + * Enable build of documentation; build-depend on gtk-doc-tools. + + -- Josselin Mouette <joss@debian.org> Fri, 21 Sep 2007 17:10:27 +0200 + +epiphany-browser (2.18.3-1) unstable; urgency=low + + * Fix copyright (closes: #428099). + * New upstream bugfix release. + + Refresh patches. + * 11_useragent-weasel.patch: comment out the UA breakage that upstream + introduces for xulrunner users and explain why we do it. + + -- Josselin Mouette <joss@debian.org> Wed, 04 Jul 2007 22:23:31 +0200 + +epiphany-browser (2.18.2-1) unstable; urgency=low + + [ Sam Morris ] + * Drop 11_spell-checker-for-1.8.0.patch now that xulrunner 1.8.1 is + available. Also bump build-depends appropriately. Closes: #414558. + + [ Josselin Mouette ] + * Fix watch file. + * Split translations and data files in a separate + epiphany-browser-data package. + + Include gnome-version.mk for ${gnome:Version}. + * Ship debugging symbols in epiphany-browser-dbg (closes: #425290). + + debian/compat: use debhelper mode 5. + + Build-depend on debhelper 5. + * Wrap depends and build-depends. + * Improve descriptions a bit. + * Use ${binary:Version}. + * Replace some file moves in debian/rules by correct .install files. + * README: removed, obsolete. + * New upstream translation and bugfix release. + * 02_ac_init.patch: updated. + * 04_move_tabs.patch: disabled for the moment, it doesn't work. + * 08_load_on_new_tab.patch: ditto. + * 99_configure.patch: refreshed. + + -- Josselin Mouette <joss@debian.org> Sat, 02 Jun 2007 11:56:53 +0200 + +epiphany-browser (2.18.1-3) unstable; urgency=low + + * 09_download_dialog.patch: still kill the download dialog, but + reinstate the distinction between download and save for security + reasons (closes: #424765). Also improve the preferences dialog to + make insensitive the download folder selection when necessary. + + -- Josselin Mouette <joss@debian.org> Sat, 19 May 2007 00:03:32 +0200 + +epiphany-browser (2.18.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * epiphany-browser.gconf-defaults: set the default language to + "system" so that epiphany uses content negociation by default. + Thanks Roland Mas for noticing. + + [ Sebastian Dröge ] + * Upload to unstable, drop check-dist include. + * Disable 11_spell-checker-for-1.8.0 and update 99_configure. spellchecking + support is disabled again in xulrunner for now. + + -- Sebastian Dröge <slomo@debian.org> Wed, 25 Apr 2007 01:08:24 +0200 + +epiphany-browser (2.18.1-1) experimental; urgency=low + + * Fix changelog and version the libenchant-dev build-dep. + * New upstream release + - Rename patch 100_spell-checker-for-1.8.0 to 11_spell-checker-for-1.8.0 + and only patch configure.ac; refresh. + - Update patch 99_configure. + - Update patch 02_ac_init. + + -- Loic Minier <lool@dooz.org> Mon, 09 Apr 2007 16:05:07 +0200 + +epiphany-browser (2.18.0-3) experimental; urgency=low + + [ Loic Minier ] + * Add a pre-build:: target to workaround a missing nspr.pc in libxul-dev + 1.8.0.11-3: symlink xulrunner-nspr.pc as nspr.pc in debian/pkg-config and + list debian/pkg-config in PKG_CONFIG_PATH; thanks Sam Morris and + Mike Hommey. + + [ Josselin Mouette ] + * 10_url_double-click.patch: patch from Sam Hocevar to make the + behavior when double-clicking in the URL bar conform to the rest of + the desktop (closes: #417836). + + [ Loic Minier ] + * Spell checking support: + - Build-dep against libxul-dev 1.8.0.11-3 and libenchant-dev. + - Pass --enable-spell-checker to configure. + - New patch, 100_spell-checker-for-1.8.0, allows using the spell checker + with Xulrunner <= 1.8.1. + + -- Loic Minier <lool@dooz.org> Mon, 09 Apr 2007 12:01:07 +0200 + +epiphany-browser (2.18.0-2) experimental; urgency=low + + [ Josselin Mouette ] + * Re-introduce 00_browser_wrapper_path.patch to avoid any issue with + the epiphany game package. + + Call epiphany-browser explicitly instead of hardcoding the path. + * Bump back conflict on epiphany-extensions to << 2.16, as the 2.16 + series have correct dependencies. + + [ Loic Minier ] + * Merge 2.14.3-2 up to 2.14.3-6; SVN r7118:9090. + * Drop patch 06_dbus_connection_close, merged upstream. + * Drop patch 30_bookmark-editor-crash, merged upstream. + + -- Loic Minier <lool@dooz.org> Sun, 18 Mar 2007 19:01:57 +0100 + +epiphany-browser (2.18.0-1) experimental; urgency=low + + [ Sam Morris ] + * New upstream release. + * Refresh patches. + * Bump conflict on epiphany-extensions to << 2.18 + * Drop 00_browser_wrapper_path.patch; seems useless + + [ Loic Minier ] + * Drop patch 05_xulrunner; merged upstream. + * Include CDBS's utils. + + -- Loic Minier <lool@dooz.org> Mon, 12 Mar 2007 14:21:50 +0100 + +epiphany-browser (2.16.3-1) experimental; urgency=low + + * New upstream release. + * Refresh patches. + + -- Josselin Mouette <joss@debian.org> Thu, 1 Mar 2007 22:12:53 +0100 + +epiphany-browser (2.16.2-4) experimental; urgency=low + + * Bump the epiphany-browser-dev dep on libgnomeui-dev to 2.16.0-2 as well. + + -- Loic Minier <lool@dooz.org> Sun, 4 Feb 2007 12:30:05 +0100 + +epiphany-browser (2.16.2-3) experimental; urgency=low + + [ Loic Minier ] + * Set GNOME_MODULE to epiphany for get-orig-source. + + [ Josselin Mouette ] + * 09_download_dialog.patch: remove the annoying dialog that lets the + user choose between "download" and "save as". Also remove the + distinction between the gconf keys. Closes: #280280. + + [ Loic Minier ] + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 as Gtk 2.10 requires it + anyway. + + -- Loic Minier <lool@dooz.org> Mon, 22 Jan 2007 11:09:05 +0100 + +epiphany-browser (2.16.2-2) experimental; urgency=low + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + [ Josselin Mouette ] + * Depend on xulrunner-gnome-support (closes: #404755). + * 06_ssl_weak_ciphers.patch: enable SSL weak ciphers, as epiphany + warns about their use anyway, thanks Mike Hommey (closes: #368259). + * epiphany-browser.dirs: create /etc/gnome/epiphany. + * rules: move default-prefs.js mime-types-permissions.xml to this + directory to make them conffiles (closes: #195406). + * 07_bookmarks.patch: provide some Debian-related bookmarks by default + (closes: #175014). + * epiphany-browser.gconf-defaults: set the homepage to the Debian + website. + * epiphany-browser.links: add a /usr/bin/epiphany-browser link to make + session saving work, thanks Håvard Moen (closes: #375003). + + Also add a link for the manual page. + * 08_load_on_new_tab.patch: patch from Cyril Brulebois to add a gconf + key allowing to emulate the mozilla behavior when loading new tabs + (closes: #402177). + + -- Josselin Mouette <joss@debian.org> Fri, 12 Jan 2007 12:59:27 +0100 + +epiphany-browser (2.16.2-1) experimental; urgency=low + + [ Loic Minier ] + * Update description to use Iceweasel instead of Firefox. + + [ Josselin Mouette ] + * New upstream release. + * Refresh patches. + + -- Josselin Mouette <joss@debian.org> Sun, 26 Nov 2006 22:16:38 +0100 + +epiphany-browser (2.16.1-1) experimental; urgency=low + + * New upstream release. + * rules: switch to quilt for patch handling. + * Build-depend on quilt. + * Update patches for the new version. + + -- Josselin Mouette <joss@debian.org> Sun, 19 Nov 2006 18:08:37 +0100 + +epiphany-browser (2.16.0-1) experimental; urgency=low + + * New upstream release. + * 04_move_tabs.patch: re-enable the ability to move tabs between + windows now the bug is fixed in xulrunner (closes: #317724). + * 00_browser_wrapper_path.patch: cleanup. + * Please Jordi by taking over maintainership of the package. + * 01_bookmarks_menu.patch: updated. + * 02_ac_init.patch: updated. + * 99_configure.patch: updated accordingly. + * NEWS: removed, its content is no more relevant. + * Update watch file for 2.16. + * Build-depend on intltool 0.35.0 and x11proto-core-dev. + * Remove useless build-dependencies on liborbit, perl and gnome-print. + * Bump requirements on glib, gtk, iso-codes, libgnome and libgnomeui. + * Enable network manager by passing --enable-network-manager. + + Build-depend on network-manager-dev. + * epiphany-browser-dev.install: add /usr/share/pygtk and + /use/share/aclocal. + * epiphany-browser.install: add /usr/share/dbus-1 and replace + /usr/share/pixmaps by /usr/share/icons. + * Conflict with epiphany-extensions << 2.16. + + -- Josselin Mouette <joss@debian.org> Sat, 9 Sep 2006 21:49:22 +0200 + +epiphany-browser (2.14.3-6) unstable; urgency=medium + + * Add a get-orig-source target to retrieve the upstream tarball. + * New patch, 30_bookmark-editor-crash, workaround for a crash in the + bookmark-editor; GNOME #351814. + + -- Loic Minier <lool@dooz.org> Mon, 26 Feb 2007 11:24:28 +0100 + +epiphany-browser (2.14.3-5) unstable; urgency=medium + + * 07_bookmarks.patch: provide some Debian-related bookmarks by default + (closes: #175014). + * epiphany-browser.gconf-defaults: set the homepage to the Debian + website. + * epiphany-browser.links: add a /usr/bin/epiphany-browser link to make + session saving work, thanks Håvard Moen (closes: #375003). + * Urgency is medium to get the session fix and the branding changes to + etch. + + -- Josselin Mouette <joss@debian.org> Fri, 12 Jan 2007 13:25:07 +0100 + +epiphany-browser (2.14.3-4) unstable; urgency=medium + + * debian/control.in: depend on xulrunner-gnome-support (closes: #404755). + + -- Jordi Mallach <jordi@debian.org> Thu, 28 Dec 2006 23:54:04 +0100 + +epiphany-browser (2.14.3-3) unstable; urgency=low + + [ Loic Minier ] + * Provide gnome-www-browser. + * Suggest mozplugger instead of mozilla-bonobo; thanks Adam C Powell IV; + closes: #393981. + + [ Jordi Mallach ] + * 06_dbus_connection_close.patch: don't call dbus_connection_close(); + unref'ing it should be enough. Suggested by Sjoerd. + + -- Jordi Mallach <jordi@debian.org> Wed, 25 Oct 2006 11:22:28 +0200 + +epiphany-browser (2.14.3-2) unstable; urgency=low + + * 04_move_tabs.patch: re-enable the ability to move tabs between + windows now the bug is fixed in xulrunner (closes: #317724). + * Conflict with epiphany-extensions << 2.14. + + -- Josselin Mouette <joss@debian.org> Wed, 27 Sep 2006 15:38:53 +0200 + +epiphany-browser (2.14.3-1) unstable; urgency=low + + * New upstream release. + - Update the 02_ac_init and 99_configure patches. + + -- Loic Minier <lool@dooz.org> Mon, 7 Aug 2006 22:28:46 +0200 + +epiphany-browser (2.14.2.1-3) unstable; urgency=low + + * 03_dbus.patch: add a warning dialog when the dbus session isn't + found (closes: #373798). + + -- Josselin Mouette <joss@debian.org> Sun, 18 Jun 2006 12:54:32 +0200 + +epiphany-browser (2.14.2.1-2) unstable; urgency=low + + * Generate the configure patch with autoconf 2.59a-9 as newer versions + require another level of shell expansion to resolve datadir, and hence + cause the AM_GLIB_DEFINE_LOCALEDIR macro to fail miserably. + [debian/patches/99_configure.patch] + + -- Loic Minier <lool@dooz.org> Sun, 4 Jun 2006 16:22:30 +0200 + +epiphany-browser (2.14.2.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * 03_dbus.patch: fall back on being a private instance when there is no + session bus (closes: #361072). + + [ Loic Minier ] + * New upstream release. + - Update patches. + [debian/patches/00_browser_wrapper_path.patch, + debian/patches/02_ac_init.patch, debian/patches/03_dbus.patch, + debian/patches/99_configure.patch] + * Make package binNMU-able by changing the ${Source-Version} dependency of + epiphany-browser-dev on epiphany from "=" to ">=". + [debian/control, debian/control.in] + + -- Loic Minier <lool@dooz.org> Thu, 1 Jun 2006 11:22:48 +0200 + +epiphany-browser (2.14.1-3) unstable; urgency=low + + * Brown paper bag release. + * Turn the build-dependency on dbus into a dependency. + + -- Guilherme de S. Pastore <gpastore@debian.org> Fri, 12 May 2006 20:46:05 -0300 + +epiphany-browser (2.14.1-2) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * debian/control.in: + - added build-dependency on dbus (Closes: #360836). + - updated Standards-Version to 3.7.2. + + [ Jordi Mallach ] + * debian/control.in: epiphany-browser-dev depends on libgnomeui-dev. + + -- Guilherme de S. Pastore <gpastore@debian.org> Fri, 12 May 2006 19:16:30 -0300 + +epiphany-browser (2.14.1-1) unstable; urgency=low + + * New upstream release. + - debian/patches/{02_ac_init,99_configure}.patch: updated. + * Sourceful upload makes it installable again (Closes: #364267). + + -- Guilherme de S. Pastore <gpastore@debian.org> Sat, 22 Apr 2006 15:23:30 -0300 + +epiphany-browser (2.14.0-1) unstable; urgency=low + + * New upstream release. + - no more annoying HOWL compatibility warning (closes: #354761). + - fixes slowness of 1.8.x when using xulrunner (closes: #354822). + * debian/control.in: Updated build-deps as per configure.ac. + * debian/epiphany-browser.install: remove uneeded entries. + * debian/watch: updated for 2.14. + * debian/patches/00_browser_wrapper_path.patch: update filenames. + * debian/patches/01_bookmarks_menu.patch: update to Ubuntu's version. + * debian/patches/02_server_path.patch: removed, obsolete. + * debian/patches/03_ac_init.patch: updated. + * debian/patches/03_ac_init.patch: moved... + * debian/patches/02_ac_init.patch: here. Now contains configure.ac changes + only. + * debian/patches/04_debian_user_agent.patch: removed, xulrunner advertises + already. + * debian/patches/05_xulrunner.patch: updated. + * debian/patches/99_configure.patch: generated with `autoconf && rm -rf + autom4te.cache`. + + -- Jordi Mallach <jordi@debian.org> Wed, 29 Mar 2006 23:54:28 +0200 + +epiphany-browser (1.8.5-2) unstable; urgency=low + + * Remove dependency on xulrunner, it is unuseful now xulrunner is + fixed. + + -- Josselin Mouette <joss@debian.org> Tue, 21 Feb 2006 20:36:31 +0100 + +epiphany-browser (1.8.5-1) unstable; urgency=low + + * New upstream release. + * Apply patch from Mike Hommey to enable building against the new libxul + packages (closes: #351976). + - debian/control.in: + + Changed Build-deps from mozilla-browser to libxul-dev. + + Changed epiphany-browser's dependencies and conflicts accordingly. + - debian/rules: Add --with-mozilla=xulrunner to the configure line. + - debian/patches/05_xulrunner.patch: Correctly detect libmozjs location. + * The above removes epiphany's much hated dependency on mozilla-browser, + and closes: #271582). + * debian/rules: don't overwrite DEB_CONFIGURE_EXTRA_FLAGS. + * debian/control.in: + - conflict with epiphany-extensions (<< 1.8.2-5) to ensure we get + a xulrunner-enabled build. + - temporarily depend on xulrunner, to workaround a bug. + + -- Jordi Mallach <jordi@debian.org> Mon, 20 Feb 2006 20:39:59 +0100 + +epiphany-browser (1.8.3-4) unstable; urgency=low + + * debian/control.in: Build-Depend on python-dev. + * debian/rules: add --enable-python to configure flags (closes: #352236). + + -- Jordi Mallach <jordi@debian.org> Fri, 10 Feb 2006 20:32:28 +0100 + +epiphany-browser (1.8.3-3) unstable; urgency=low + + * Upload to unstable + + Loic Minier <lool@dooz.org>: + * Register and unregister a new gnome-www-browser alternative. + [debian/epiphany-browser.postinst, debian/epiphany-browser.prerm] + + Gustavo Noronha: + * debian/control.in: + - bumped Standards-Version to 3.6.2 with no changes + + -- Gustavo Noronha Silva <kov@debian.org> Sat, 7 Jan 2006 19:06:16 -0200 + +epiphany-browser (1.8.3-2) experimental; urgency=low + + * Build against dbus >= 0.60 + + -- Sjoerd Simons <sjoerd@debian.org> Sun, 18 Dec 2005 22:50:26 +0100 + +epiphany-browser (1.8.3-1) experimental; urgency=low + + [ Jordi Mallach ] + * New upstream release. + * 03_ac_init.patch: updated. + + [ Loic Minier ] + * Menu transition, part 1 and 2: move from #!/usr/sbin/install-menu to + #!/usr/bin/install-menu. [debian/epiphany-browser.install] + + [ Sjoerd Simons ] + * Enable zeroconf for bookmarks + + -- Jordi Mallach <jordi@debian.org> Thu, 1 Dec 2005 19:17:12 +0100 + +epiphany-browser (1.8.2-1) experimental; urgency=low + + * New upstream release. + * Don't build-depend on gcc-3.4 for amd64 anymore. + * 03_ac_init.patch: updated. + * Add watch file. + * Require orbit2 2.12.4 for ORBIT2_MAYBE_CONST. + * Cleanup dependencies. + * epiphany-browser.prerm: remove bashism. + + -- Josselin Mouette <joss@debian.org> Sun, 9 Oct 2005 20:09:58 +0200 + +epiphany-browser (1.8.0-1) experimental; urgency=low + + * New upstream release + * Don't build with gcc-3.4 for amd64 anymore + * Build with the experimental dbus packages + * debian/patches/04_debian_user_agent.patch + + Updated + * Sync with ubuntu + - Also rename omf files from epiphany to epiphany-browser + - debian/patches/02_server_path.patch + + Updated + - debian/patches/03_ac_init.patch + + Updated + + -- Sjoerd Simons <sjoerd@debian.org> Thu, 8 Sep 2005 11:29:47 +0200 + +epiphany-browser (1.6.5-1) experimental; urgency=low + + * New upstream version. + * Ondřej Surý: + - debian/paches/03_ac_init.patch: updated. + * Jordi Mallach: + - debian/control: build-depend on mozilla-dev (>= 1.7.10) for C++ + transition. + + -- Jordi Mallach <jordi@debian.org> Wed, 31 Aug 2005 17:26:26 +0200 + +epiphany-browser (1.6.4-1) unstable; urgency=low + + * New upstream release. + * debian/paches/03_ac_init.patch: updated. + + -- Jordi Mallach <jordi@debian.org> Tue, 5 Jul 2005 14:59:54 +0200 + +epiphany-browser (1.6.3-2) unstable; urgency=low + + * The "helix, use this cool Desktop and become a real GNOME Woman!" + release. + * Upload to unstable. + * debian/control.in: update Build-Depends (closes: #309195). + * The blurry icon for bookmarks editor is gone (closes: #287951). + * Ephy no longer shows the "Exit Fullscreen" button on all workspaces + (closes: #229622). + + -- Jordi Mallach <jordi@debian.org> Wed, 8 Jun 2005 01:03:16 +0200 + +epiphany-browser (1.6.3-1) experimental; urgency=low + + * New upstream release. + * debian/paches/03_ac_init.patch: updated. + + -- Jordi Mallach <jordi@debian.org> Wed, 27 Apr 2005 16:09:39 +0200 + +epiphany-browser (1.6.2-1) experimental; urgency=low + + * New upstream version. + * debian/patches/03_ac_init.patch: + - updated. + * debian/patches/05_toolbar_activation.patch: + - fixed with the new version. + + -- Sebastien Bacher <seb128@debian.org> Thu, 14 Apr 2005 15:40:31 +0200 + +epiphany-browser (1.6.1-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - update build-depends and add dbus. + - depend on gnome-icon-theme and iso-codes. + * debian/rules: + - enable dbus support. + - build with gcc/g++ 3.4 for amd64 (closes: #287642). + * debian/patches/03_ac_init.patch: updated. + * debian/patches/01_bookmarks_menu.patch: stolen from Hoary; hide the + bookmarks manager menu item. + * debian/patches/04_debian_user_agent.patch: just identify as "Debian", + don't give the full source version. + * debian/05_toolbar_activation.patch: patch from CVS to fix toolbar + activation. + + -- Jordi Mallach <jordi@debian.org> Sat, 9 Apr 2005 12:33:49 +0200 + +epiphany-browser (1.4.8-2) unstable; urgency=low + + * debian/control.in: bump mozilla requirements to >= 1.7.6 to fix the + IDN domain spoofing security issue (CAN-2005-0238, closes: #294270). + + -- Jordi Mallach <jordi@debian.org> Thu, 24 Mar 2005 17:54:16 +0100 + +epiphany-browser (1.4.8-1) unstable; urgency=low + + * New upstream release. + + -- Jordi Mallach <jordi@debian.org> Sun, 27 Feb 2005 17:31:10 +0100 + +epiphany-browser (1.4.7-3) unstable; urgency=low + + * debian/patches/04_debian_user_agent.patch: add Debian package version to + the User-Agent string (thanks Loïc Minier; closes: #268655). + * debian/rules: add a define to CXXFLAGS with the Debian source version. + * debian/control.in: + - add a suggestion on mozilla-bonobo to epiphany-browser + (closes: #276492). + - recommend epiphany-extensions. + + -- Jordi Mallach <jordi@debian.org> Thu, 10 Feb 2005 23:24:41 +0100 + +epiphany-browser (1.4.7-2) unstable; urgency=medium + + * Rebuild against mozilla 1.7.5 to fix mouse buttons breakage. + * debian/control.in: build-depend and depend on + mozilla-browser (>= 2:1.7.5). + + -- Jordi Mallach <jordi@debian.org> Fri, 7 Jan 2005 17:05:05 +0100 + +epiphany-browser (1.4.7-1) unstable; urgency=low + + * New upstream release. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach <jordi@debian.org> Sun, 26 Dec 2004 01:15:41 +0100 + +epiphany-browser (1.4.6-1) unstable; urgency=low + + * New upstream release. + - fix tabs menu ordering when using the tab groups extension + (closes: #276916). + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach <jordi@debian.org> Thu, 2 Dec 2004 00:16:32 +0100 + +epiphany-browser (1.4.5-2) unstable; urgency=low + + * Upload to unstable. + * debian/control.in: + - put myself as Maintainer. *shiver*. + - remove Mark Howard from uploaders, as he's trying to get galeon + adopted. + - remove build-dep on libc6-dev. + - bump to debhelper (>= 4.2.23). + + -- Jordi Mallach <jordi@debian.org> Fri, 19 Nov 2004 18:34:26 +0100 + +epiphany-browser (1.4.5-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/{epiphany.1,epiphany-browser.mapages}: removed, included upstream. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach <jordi@debian.org> Tue, 16 Nov 2004 02:35:22 +0100 + +epiphany-browser (1.4.4-2) experimental; urgency=low + + * debian/control.in: + - bump cdbs and debhelper requirements, to register epiphany in the + MIME database. + - drop libtool build dependency. + * debian/postrm: remove, handled by debhelper. + * debian/rules: don't relibtoolize on pre-build. + + -- Jordi Mallach <jordi@debian.org> Tue, 9 Nov 2004 20:38:48 +0100 + +epiphany-browser (1.4.4-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/rules: + + remove extra configure flags which aren't needed anymore. + + remove empty /usr/lib/epiphany. + * debian/patches/03_ac_init.patch: update. + + -- Jordi Mallach <jordi@debian.org> Wed, 13 Oct 2004 00:23:27 +0200 + +epiphany-browser (1.4.0-2) experimental; urgency=low + + * GNOME team upload. + * debian/rules: + + don't install /usr/bin/epiphany as a wrapper anymore, according + to Crispin it's not needed anymore (closes: #271986). + + configure with --with-mozilla-snapshot=1.7.2 to workaround a build + failure. + * debian/control.in: tighten mozilla dependencies to 1.7.3. + + -- Jordi Mallach <jordi@debian.org> Fri, 24 Sep 2004 19:28:26 +0200 + +epiphany-browser (1.4.0-1) experimental; urgency=low + + * GNOME team upload. + * New upstream release. + * debian/control.in: update build-depends as per configure.in. + * debian/patches/03_ac_init.patch: update. + * debian/rules: epiphany's binary is now epiphany, not epiphany-bin. + + -- Jordi Mallach <jordi@debian.org> Wed, 15 Sep 2004 23:30:24 +0200 + +epiphany-browser (1.2.9-2) unstable; urgency=low + + * GNOME team upload. + * debian/rules: configure using --with-mozilla-snapshot=1.7.2. + + -- Jordi Mallach <jordi@debian.org> Thu, 21 Oct 2004 11:29:46 +0200 + +epiphany-browser (1.2.9-1) unstable; urgency=low + + * GNOME team upload, by request of Edd. + * New upstream release. + * debian/patches/03_ac_init.patch: updated. + * debian/epiphany.1: apply patch from Andrew Sobala to remove + obsolete/unuseful options from the manpage, thanks! (Closes: #256504) + * debian/rules: don't libtoolize the package automatically in pre-build. + * debian/control.in: drop build-dependency on libtool. + + -- Jordi Mallach <jordi@debian.org> Thu, 21 Oct 2004 00:13:39 +0200 + +epiphany-browser (1.2.8-1) unstable; urgency=high + + * New upstream release. + * Really build against Mozilla 1.7.2. (Closes: #266265) + * High urgency to ensure that middle- and right-mouse clicks + work in the version that ships with sarge. + * Retire 01_package_name.patch, add 03_ac_init.patch to adjust + package name to epiphany-browser. + + -- Edd Dumbill <ejad@debian.org> Mon, 23 Aug 2004 19:19:25 +0100 + +epiphany-browser (1.2.7-2) unstable; urgency=low + + * Force compile against mozilla 1.7.2, fixes mouse button problems + (Closes: #264467) + + -- Edd Dumbill <ejad@debian.org> Mon, 9 Aug 2004 09:43:04 +0100 + +epiphany-browser (1.2.7-1) unstable; urgency=low + + * New upstream release + - build fine with mozilla 1.7.1. + * debian/epiphany-browser.postinst: + - removed the gconf and scrollkeeper parts, CDBS handles this. + * debian/epiphany-browser.postrm: + - removed, CDBS handles this too. + * debian/patches/01_package_name.patch: + - updated. + * debian/rules: + - changed the rules order to get dh_gconf used. + * All the above from Sebastien Bacher <seb128@debian.org>, thanks! + (Closes: #263841) + * Removed mozilla-xft from Recommends, this now included in + mozilla-browser. + + -- Edd Dumbill <ejad@debian.org> Fri, 7 Aug 2004 00:47:03 +0100 + +epiphany-browser (1.2.6-3) unstable; urgency=low + + * Add note to README.Debian to explain about the printing snafu. + * Move gtk-doc output into -dev package. + + -- Edd Dumbill <ejad@debian.org> Fri, 25 Jun 2004 10:17:53 +0100 + +epiphany-browser (1.2.6-2) unstable; urgency=low + + * Build against Mozilla 1.7. + + -- Edd Dumbill <ejad@debian.org> Thu, 24 Jun 2004 01:04:15 +0100 + +epiphany-browser (1.2.6-1) unstable; urgency=low + + * New upstream release. + - Fixes LD_LIBRARY_PATH setting (Closes: #253443) + + -- Edd Dumbill <ejad@debian.org> Mon, 14 Jun 2004 15:14:48 +0100 + +epiphany-browser (1.2.5-2) unstable; urgency=low + + * Upload to unstable. + - Download behavior fixed (Closes: #223591) + - Upload path remembered (Closes: #207829) + - Bookmark searches now case insensitive (Closes: #192929) + - Toolbars options in fullscreen not an issue now (Closes: #203018) + - Import bookmarks dialog offers arbitrary file import (Closes: #209224) + - Spinner no longer part of toolbar (Closes: #229548) + - Closing windows asks for confirmation if they have unsubmitted form + data (Closes: #229588) + * Don't break x-www-browser alternative on uninstall (Closes: #241535) + + -- Edd Dumbill <ejad@debian.org> Fri, 28 May 2004 07:55:32 +0100 + +epiphany-browser (1.2.5-1) experimental; urgency=low + + * New upstream release. + * Added Section: devel to control file for the -dev package. + + -- Edd Dumbill <ejad@debian.org> Wed, 5 May 2004 19:58:54 +0100 + +epiphany-browser (1.2.3-1) experimental; urgency=low + + * New upstream release. + * Add missing libxml-parser-perl builddep. + + -- Edd Dumbill <ejad@debian.org> Fri, 23 Apr 2004 18:24:54 +0100 + +epiphany-browser (1.2.2-3) experimental; urgency=low + + * Add missing gnome-pkg-tools builddep (Closes: #244053) + * Tighten up libtool builddep. + + -- Edd Dumbill <ejad@debian.org> Tue, 13 Apr 2004 10:11:52 +0100 + +epiphany-browser (1.2.2-2) experimental; urgency=low + + * Rebuild against gcc-3.3 not 3.4! + + -- Edd Dumbill <ejad@debian.org> Tue, 13 Apr 2004 09:07:02 +0100 + +epiphany-browser (1.2.2-1) experimental; urgency=low + + * New upstream release. + * Split into epiphany and epiphany-dev. + * Remove alternative in prerm. + + -- Edd Dumbill <ejad@debian.org> Mon, 12 Apr 2004 21:23:52 +0100 + +epiphany-browser (1.2.1-1) experimental; urgency=low + + * New upstream release. + * Updated patches for executable path, removed 04_scrollkeeper_omf patch. + * Remove libnautilus2-dev dependency for now, disable nautilus view + building. + + -- Edd Dumbill <ejad@debian.org> Wed, 24 Mar 2004 15:16:27 +0000 + +epiphany-browser (1.0.8-1) unstable; urgency=low + + * New upstream release. + * Get path right for translated docs (Closes: #231731) + * Make x-www-browser alternative greater than that of Mozilla's + (Closes: #233607) + * Drop yelp to a recommendation (Closes: #229061) + + -- Edd Dumbill <ejad@debian.org> Thu, 18 Mar 2004 13:54:23 +0000 + +epiphany-browser (1.0.7-3) unstable; urgency=low + + * Add libxml2-dev build-dep (Closes: #222453). Tighten the libbonoboui-dev + dependency as well. + * Add simple manpage (Closes: #206702, #221710) + + -- Edd Dumbill <ejad@debian.org> Sun, 25 Jan 2004 18:42:59 +0000 + +epiphany-browser (1.0.7-2) unstable; urgency=low + + * Add libxml-parser-perl as build-dep. Oops. + + -- Edd Dumbill <ejad@debian.org> Fri, 23 Jan 2004 11:52:12 +0000 + +epiphany-browser (1.0.7-1) unstable; urgency=low + + * New upstream release. + * Compile against Mozilla 1.6 (Closes: #229139) + + -- Edd Dumbill <ejad@debian.org> Fri, 23 Jan 2004 09:59:47 +0000 + +epiphany-browser (1.0.6-2) unstable; urgency=low + + * Add GNOME team maintainership stuff. + + -- Edd Dumbill <ejad@debian.org> Tue, 18 Nov 2003 12:26:28 +0000 + +epiphany-browser (1.0.6-1) unstable; urgency=low + + * New upstream release. + * Retire 05_file_uri_security.patch. + + -- Edd Dumbill <ejad@debian.org> Mon, 17 Nov 2003 15:04:01 +0000 + +epiphany-browser (1.0.3-3) unstable; urgency=low + + * Added Conflicts: mozilla-browser >= 1.6 to avoid future snafus + with Mozilla upgrades. + + -- Edd Dumbill <ejad@debian.org> Wed, 22 Oct 2003 09:54:52 +0100 + +epiphany-browser (1.0.3-2) unstable; urgency=low + + * Re-libtoolize to get round breakage with Mozilla 1.5. (Thanks + to Matt Biddulph for helping chase this down.) + + -- Edd Dumbill <ejad@debian.org> Wed, 22 Oct 2003 00:36:52 +0100 + +epiphany-browser (1.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Edd Dumbill <ejad@debian.org> Sat, 18 Oct 2003 12:47:51 +0100 + +epiphany-browser (1.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Edd Dumbill <ejad@debian.org> Mon, 13 Oct 2003 23:10:00 +0100 + +epiphany-browser (1.0-1) unstable; urgency=low + + * New upstream release. Epiphany goes 1.0! + * Add missing libgnome-desktop-dev build-dep (Closes: #211447) + * Use perl instead of sed in debian/rules (Closes: #207735) + * Remove glib2 autotools workaround, set specific libglib2.0-dev + dependency. + * Add in security fix from CVS so file:/// URIs can't be loaded + by pages retrieved from the network (05_file_uri_security.patch). + + -- Edd Dumbill <ejad@debian.org> Thu, 18 Sep 2003 15:41:56 +0100 + +epiphany-browser (0.9.2-2) unstable; urgency=low + + * Added Recommends: for mozilla-xft. + * Added note about mozilla-xft in README.Debian. + + -- Edd Dumbill <ejad@debian.org> Wed, 17 Sep 2003 09:33:52 +0100 + +epiphany-browser (0.9.2-1) unstable; urgency=low + + * New upstream release. + * Depend on gnome-icon-theme >= 1.0.6 now it's released. Thanks Kitame. + (Closes: #207368, #206297) + * Ensure locale location bugfix won't break when glib 2.0 bug which is the + root cause gets fixed. + + -- Edd Dumbill <ejad@debian.org> Thu, 28 Aug 2003 14:45:03 +0100 + +epiphany-browser (0.8.4-2) unstable; urgency=low + + * Move locale .mo files to the right place (Closes: #205304) + + -- Edd Dumbill <ejad@debian.org> Thu, 14 Aug 2003 08:51:06 +0100 + +epiphany-browser (0.8.4-1) unstable; urgency=low + + * New upstream release. + - New tab doesn't grab focus (Closes: #204829) + * Retire patches/05_sign_compile.patch. + * Retire gcc-3.2 dependency, compiles OK with 3.3 now. + + -- Edd Dumbill <ejad@debian.org> Wed, 13 Aug 2003 13:49:35 +0100 + +epiphany-browser (0.8.0-2) unstable; urgency=low + + * Depend on Mozilla 1.4 (Closes: #202069) + + -- Edd Dumbill <ejad@debian.org> Sat, 19 Jul 2003 15:40:03 +0100 + +epiphany-browser (0.8.0-1) unstable; urgency=low + + * New upstream release. + - No more "feeling lucky" + * Move debconf notice into NEWS.Debian (Closes: #201477). Updated + corresponding debhelper dependency to >= 4.1.51. + * Tweak wrapper script to change arguments to simply "$@". + + -- Edd Dumbill <ejad@debian.org> Fri, 18 Jul 2003 17:20:35 +0100 + +epiphany-browser (0.7.3-1) unstable; urgency=low + + * New upstream release. + - Fixes segfault on Mozilla bookmark import (Closes: #198556) + * Build against Mozilla 1.4 (Closes: #190763) + + -- Edd Dumbill <ejad@debian.org> Mon, 14 Jul 2003 21:52:03 +0100 + +epiphany-browser (0.7.1-1) unstable; urgency=low + + * New upstream release. (Closes: #198818) + - Don't crash on adding bookmark without topics (Closes: #197493) + - Search now works after smart bookmark use (Closes: #194208) + - Adding bookmark topic now works properly (Closes: #197869) + - Copy function works properly (Closes: #195357) + - Middle-click paste of keyword now shows proper new URL in + location bar (Closes: #195427) + - Creating new tab now doesn't destroy X selection (Closes: #197227) + * Download directory now remembered (Closes: #196927) + * Retire 02_help_dtd_patch as cdbs makes these corrections now + (Closes: #198181) + * Compile with gcc-3.2, remove -Wno-strict-aliasing (Closes: #197102) + I know this isn't the best-ever solution to this problem. Working + on sorting it out more permanently. + * Retire 05_valist_patch_from_bugzilla.patch, now in upstream + * Added debconf note: upstream have reorganized prefs schema, some of your + preferences will need resetting. + * Depend on gnome-icon-theme >= 1.0.4 (Closes: #197183). If you're still + have trouble with the throbber missing, file a bug on the theme, as + this seems to be theme dependent. + + -- Edd Dumbill <ejad@debian.org> Fri, 27 Jun 2003 16:05:49 +0100 + +epiphany-browser (0.7.0-1) unstable; urgency=low + + * New upstream release. + - Fixes crash on pause download (Closes: #193672) + - Fix smart bookmark non-ASCII problem (Closes: #193981) + * Incorporate 05_valist_patch_from_bugzilla.patch, which fixes + valist usage problems on several platforms. + + -- Edd Dumbill <ejad@debian.org> Sat, 7 Jun 2003 11:15:12 +0100 + +epiphany-browser (0.6.1-1) unstable; urgency=low + + * New upstream (Closes: #194423) + - adds 'remove toolbar' context menu (Closes: #190817) + * Get correct Mozilla dependency (Closes: #193999) + * Change menu hint to "Web browsers" (Closes: #193451) + * Update standards version to 3.5.9 + * Retire CVS Colin's Build System in favour of cdbs + + -- Edd Dumbill <ejad@debian.org> Sun, 25 May 2003 16:49:06 +0100 + +epiphany-browser (0.6.0-3) unstable; urgency=low + + * 05_eel_gconf_ptrsize.patch, add another ia64 fix. Hopefully + this is the final one. + + -- Edd Dumbill <ejad@debian.org> Wed, 14 May 2003 16:12:50 +0100 + +epiphany-browser (0.6.0-2) unstable; urgency=low + + * Moved mozilla-xft dependency to Recommends (Closes: #192895) + * Distribute NEWS file (Closes: #192836) + * Add 05_eel_gconf_ptrsize.patch from CVS to fix ia64 build error. + + -- Edd Dumbill <ejad@debian.org> Tue, 13 May 2003 09:54:14 +0100 + +epiphany-browser (0.6.0-1) unstable; urgency=low + + * New upstream release. + + Remote tab open raises window (Closes: #187663) + * Removed 03_guint_fix_from_cvs.patch, obsoleted by new release. + + -- Edd Dumbill <ejad@debian.org> Fri, 9 May 2003 14:53:25 +0100 + +epiphany-browser (0.5.0-rel-4) unstable; urgency=low + + * Really fix path of help docs in .omf file (Closes: #191282) + + -- Edd Dumbill <ejad@debian.org> Sat, 3 May 2003 16:11:28 +0100 + +epiphany-browser (0.5.0-rel-3) unstable; urgency=low + + * 04_scrollkeeper_omf_path.patch: try to fix path of help file in .omf + file + * debian/rules: update to latest version of Colin's Build System + * debian/rocks: add -fshort-wchar to CXXFLAGS, fixes problem with + context menus on images. + + -- Edd Dumbill <ejad@debian.org> Tue, 29 Apr 2003 20:44:06 +0100 + +epiphany-browser (0.5.0-rel-2) unstable; urgency=low + + * Fix missing bookmark editor icon problem. + + -- Edd Dumbill <ejad@debian.org> Thu, 24 Apr 2003 16:53:58 +0100 + +epiphany-browser (0.5.0-rel-1) unstable; urgency=low + + * New upstream release. I won't be tracking CVS snapshots any + more. (Closes: #189413) + * Compile against mozilla rather than mozilla-snapshot. (Closes: #182199) + * Changed section to 'gnome'. + * Adjusted alternatives priority for x-www-browser to 75. + * 64-bit arch compile patch from CVS (Closes: #190011) + + -- Edd Dumbill <ejad@debian.org> Tue, 22 Apr 2003 19:23:57 +0100 + +epiphany-browser (0.5.0+0.4.99.20030304-1) unstable; urgency=low + + * New CVS export. + + -- Edd Dumbill <ejad@debian.org> Tue, 4 Mar 2003 23:38:46 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-3) unstable; urgency=low + + * Exchanged faulty gconf dependency for gconf2. + + -- Edd Dumbill <ejad@debian.org> Fri, 21 Feb 2003 23:05:02 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-2) unstable; urgency=low + + * Added debian menu entry. + + -- Edd Dumbill <ejad@debian.org> Fri, 21 Feb 2003 10:36:03 +0000 + +epiphany-browser (0.5.0+0.4.99.20030220-1) unstable; urgency=low + + * New CVS export. + + -- Edd Dumbill <ejad@debian.org> Thu, 20 Feb 2003 15:28:02 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-6) unstable; urgency=low + + * Added www-browser to Provides: + * Added to the x-www-browser alternatives selection. + + -- Edd Dumbill <ejad@debian.org> Wed, 19 Feb 2003 13:07:26 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-5) unstable; urgency=low + + * Upload to Debian, co-maintained with Mark Howard (Closes: #173427) + + -- Edd Dumbill <ejad@debian.org> Sun, 16 Feb 2003 21:40:49 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-4) unstable; urgency=low + + * Versioned various dependencies. + * Added gconf dependency. + * Moved epiphany binary to /usr/lib/epiphany/ + * Revert binary name to 'epiphany' + * Clean up after intltool: -extract, -merge, -update + * Added in location of CVS source into debian/copyright + + -- Edd Dumbill <ejad@debian.org> Sun, 16 Feb 2003 14:19:01 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-3) unstable; urgency=low + + * Added mozilla-psm-snapshot as a dependency. + + -- Edd Dumbill <ejad@debian.org> Sat, 15 Feb 2003 03:41:56 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-2) unstable; urgency=low + + * Changed package name to epiphany-browser in the configure + script. + + -- Edd Dumbill <ejad@debian.org> Sat, 15 Feb 2003 03:41:56 +0000 + +epiphany-browser (0.5.0+0.4.99.20030214-1) unstable; urgency=low + + * Initial packaging from CVS. + + -- Edd Dumbill <ejad@debian.org> Fri, 14 Feb 2003 23:05:40 +0000 + --- epiphany-browser-2.21.4.orig/debian/epiphany.sh +++ epiphany-browser-2.21.4/debian/epiphany.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +exec epiphany-browser "$@" --- epiphany-browser-2.21.4.orig/debian/epiphany-gecko.prerm +++ epiphany-browser-2.21.4/debian/epiphany-gecko.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --remove $alt /usr/bin/epiphany-gecko + done +fi + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.21.4.orig/debian/control +++ epiphany-browser-2.21.4/debian/control @@ -0,0 +1,114 @@ +Source: epiphany-browser +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> +XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org> +Build-Depends: debhelper (>= 5), + pkg-config, + libglib2.0-dev (>= 2.13.4), + libgtk2.0-dev (>= 2.11.6), + libxml2-dev (>= 2.6.12), + libxslt1-dev (>= 1.1.7), + libglade2-dev (>= 2.3.1), + libgnomevfs2-dev (>= 2.9.2), + libgnome2-dev (>= 2.14.0), + libgnomeui-dev (>= 2.16.0-2), + libgconf2-dev, + libgnome-desktop-dev (>= 2.9.91), + libstartup-notification0-dev (>= 0.5), + libdbus-glib-1-dev (>= 0.60), + scrollkeeper, + gnome-pkg-tools (>= 0.10), + libxml-parser-perl, + xulrunner-1.9-dev (>= 1.9~b3~), + iso-codes (>= 0.35), + python-dev (>= 2.3), + python-gtk2-dev (>= 2.7.1), + python-gnome2-dev (>= 2.6.0), + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.35.0), + x11proto-core-dev, + network-manager-dev, + quilt, + libenchant-dev (>= 1.0), + gtk-doc-tools (>= 1.0), + liblaunchpad-integration-dev +Standards-Version: 3.7.2 + +Package: epiphany-browser +Architecture: all +Depends: epiphany-gecko | epiphany-webkit +Description: Intuitive web browser - dummy package + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This dummy package installs Epiphany with the Gecko backend by default. + +Package: epiphany-gecko +Architecture: any +Depends: epiphany-browser-data (>= ${gnome:Version}), + epiphany-browser-data (<< ${gnome:NextVersion}), + ${shlibs:Depends}, + gnome-icon-theme (>= 2.9.90), + dbus, + iso-codes, + xulrunner-1.9 (>= 1.9~b3~), + ${misc:Depends} +Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1) +Recommends: yelp, epiphany-extensions +Breaks: epiphany-extensions (<< 2.20.1-2ubuntu3) +Suggests: mozplugger +Provides: www-browser, gnome-www-browser +Description: Intuitive GNOME web browser - Gecko version + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. Simplicity is achieved by a well designed user interface and + reliance on external applications for performing external tasks (such as + reading email). Simplicity should not mean less powerful. Standards + compliance is achieved on the HTML side by using the Gecko + rendering engine, as developed for the Mozilla and Firefox browsers; and + on the user interface side by closely following the GNOME Human Interface + Guidelines (HIG) and by close integration with the GNOME desktop. + . + This version uses the Gecko backend to render web pages. + . + Homepage: http://www.gnome.org/projects/epiphany/ + +Package: epiphany-browser-data +Architecture: all +Depends: ${misc:Depends} +Recommends: epiphany-browser +Conflicts: epiphany-browser (<< 2.20.1-2ubuntu1) +Replaces: epiphany-browser (<< 2.20.1-2ubuntu1) +Description: Data files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains the common files, artwork and translations for + Epiphany. + +Package: epiphany-browser-dev +Architecture: all +Section: devel +Depends: epiphany-gecko (>= ${binary:Version}), libgnomeui-dev (>= 2.16.0-2) +Description: Development files for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package is required to develop extensions for Epiphany. + +Package: epiphany-browser-dbg +Architecture: any +Section: gnome +Priority: extra +Depends: epiphany-gecko (= ${binary:Version}) | epiphany-webkit (= ${binary:Version}) +Description: Debugging symbols for the GNOME web browser + Epiphany is a simple yet powerful GNOME web browser targeted at + non-technical users. Its principles are simplicity and standards + compliance. + . + This package contains detached debugging symbols. --- epiphany-browser-2.21.4.orig/debian/bug/control +++ epiphany-browser-2.21.4/debian/bug/control @@ -0,0 +1 @@ +report-with: epiphany-gecko epiphany-webkit --- epiphany-browser-2.21.4.orig/debian/compat +++ epiphany-browser-2.21.4/debian/compat @@ -0,0 +1 @@ +5 --- epiphany-browser-2.21.4.orig/debian/epiphany-browser-data.dirs +++ epiphany-browser-2.21.4/debian/epiphany-browser-data.dirs @@ -0,0 +1,2 @@ +/etc/gnome/epiphany +/usr --- epiphany-browser-2.21.4.orig/debian/epiphany-gecko.menu +++ epiphany-browser-2.21.4/debian/epiphany-gecko.menu @@ -0,0 +1,6 @@ +?package(epiphany-gecko):needs="x11" \ + section="Applications/Network/Web Browsing" \ + title="Epiphany web browser (Gecko)" \ + longtitle="Epiphany web browser with Gecko backend" \ + command="/usr/bin/epiphany-gecko" \ + hints="Web browsers" --- epiphany-browser-2.21.4.orig/debian/epiphany-browser.links +++ epiphany-browser-2.21.4/debian/epiphany-browser.links @@ -0,0 +1 @@ +/usr/share/man/man1/epiphany-browser.1.gz /usr/share/man/man1/epiphany.1.gz --- epiphany-browser-2.21.4.orig/debian/epiphany-browser-dev.dirs +++ epiphany-browser-2.21.4/debian/epiphany-browser-dev.dirs @@ -0,0 +1,2 @@ +/usr/lib +/usr/share --- epiphany-browser-2.21.4.orig/debian/epiphany-browser-data.links +++ epiphany-browser-2.21.4/debian/epiphany-browser-data.links @@ -0,0 +1,2 @@ +/etc/gnome/epiphany/mime-types-permissions.xml /usr/share/epiphany-browser/mime-types-permissions.xml +/etc/gnome/epiphany/default-prefs.js /usr/share/epiphany-browser/default-prefs.js --- epiphany-browser-2.21.4.orig/debian/patches/98a_nsipromptservice2_workaround.patch +++ epiphany-browser-2.21.4/debian/patches/98a_nsipromptservice2_workaround.patch @@ -0,0 +1,303 @@ +Index: embed/mozilla/EphyPromptService.cpp +=================================================================== +--- a/embed/mozilla/EphyPromptService.cpp (revision 7834) ++++ b/embed/mozilla/EphyPromptService.cpp (working copy) +@@ -31,6 +31,7 @@ + #include <nsCOMPtr.h> + #include <nsIDOMWindow.h> + #include <nsServiceManagerUtils.h> ++#include <nsIStringBundle.h> + + #include "ephy-embed-shell.h" + #include "ephy-gui.h" +@@ -41,6 +42,14 @@ + #include "EphyUtils.h" + + #include "EphyPromptService.h" ++#include "nsIChannel.h" ++#include "nsIProxiedChannel.h" ++#include "nsIProxyInfo.h" ++#include "nsNetCID.h" ++#include "nsIURI.h" ++#include "nsNetUtil.h" ++#include "nsIIDNService.h" ++#include "nsIAuthInformation.h" + + #define TIMEOUT 1000 /* ms */ + #define TIMEOUT_DATA_KEY "timeout" +@@ -645,11 +654,11 @@ + /* FIXME: needs THREADSAFE? */ + #if HAVE_NSINONBLOCKINGALERTSERVICE_H + NS_IMPL_ISUPPORTS2 (EphyPromptService, +- nsIPromptService, ++ nsIPromptService2, + nsINonBlockingAlertService) + #else + NS_IMPL_ISUPPORTS1 (EphyPromptService, +- nsIPromptService) ++ nsIPromptService2) + #endif + + EphyPromptService::EphyPromptService() +@@ -885,4 +894,216 @@ + return NS_OK; + } + ++static void ++NS_GetAuthHostPort(nsIChannel* aChannel, nsIAuthInformation* aAuthInfo, ++ PRBool machineProcessing, nsCString& host, PRInt32* port) ++{ ++ nsCOMPtr<nsIURI> uri; ++ nsresult rv = aChannel->GetURI(getter_AddRefs(uri)); ++ if (NS_FAILED(rv)) ++ return; ++ ++ // Have to distinguish proxy auth and host auth here... ++ PRUint32 flags; ++ aAuthInfo->GetFlags(&flags); ++ if (flags & nsIAuthInformation::AUTH_PROXY) { ++ nsCOMPtr<nsIProxiedChannel> proxied(do_QueryInterface(aChannel)); ++ NS_ASSERTION(proxied, "proxy auth needs nsIProxiedChannel"); ++ ++ nsCOMPtr<nsIProxyInfo> info; ++ proxied->GetProxyInfo(getter_AddRefs(info)); ++ NS_ASSERTION(info, "proxy auth needs nsIProxyInfo"); ++ ++ nsCAutoString idnhost; ++ info->GetHost(idnhost); ++ info->GetPort(port); ++ ++ if (machineProcessing) { ++ nsCOMPtr<nsIIDNService> idnService = ++ do_GetService(NS_IDNSERVICE_CONTRACTID); ++ if (idnService) { ++ idnService->ConvertUTF8toACE(idnhost, host); ++ } else { ++ // Not much we can do here... ++ host = idnhost; ++ } ++ } else { ++ host = idnhost; ++ } ++ } else { ++ if (machineProcessing) { ++ uri->GetAsciiHost(host); ++ *port = NS_GetRealPort(uri); ++ } else { ++ uri->GetHost(host); ++ uri->GetPort(port); ++ } ++ } ++} ++ ++static nsresult ++MakeDialogText(nsIChannel* aChannel, nsIAuthInformation* aAuthInfo, ++ nsString& message) ++{ ++ nsresult rv; ++ nsCOMPtr<nsIStringBundleService> bundleSvc = ++ do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ nsCOMPtr<nsIStringBundle> bundle; ++ rv = bundleSvc->CreateBundle("chrome://global/locale/prompts.properties", ++ getter_AddRefs(bundle)); ++ NS_ENSURE_SUCCESS(rv, rv); ++ ++ // figure out what message to display... ++ nsCAutoString host; ++ PRInt32 port; ++ NS_GetAuthHostPort(aChannel, aAuthInfo, PR_FALSE, host, &port); ++ ++ nsAutoString displayHost; ++ CopyUTF8toUTF16(host, displayHost); ++ ++ nsCOMPtr<nsIURI> uri; ++ aChannel->GetURI(getter_AddRefs(uri)); ++ ++ nsCAutoString scheme; ++ uri->GetScheme(scheme); ++ ++ nsAutoString username; ++ aAuthInfo->GetUsername(username); ++ ++ PRUint32 flags; ++ aAuthInfo->GetFlags(&flags); ++ PRBool proxyAuth = (flags & nsIAuthInformation::AUTH_PROXY) != 0; ++ ++ nsAutoString realm; ++ aAuthInfo->GetRealm(realm); ++ ++ // Append the port if it was specified ++ if (port != -1) { ++ displayHost.Append(PRUnichar(':')); ++ displayHost.AppendInt(port); ++ } ++ ++ NS_NAMED_LITERAL_STRING(proxyText, "EnterUserPasswordForProxy"); ++ NS_NAMED_LITERAL_STRING(originText, "EnterUserPasswordForRealm"); ++ NS_NAMED_LITERAL_STRING(noRealmText, "EnterUserPasswordFor"); ++ NS_NAMED_LITERAL_STRING(passwordText, "EnterPasswordFor"); ++ ++ const PRUnichar *text; ++ if (proxyAuth) { ++ text = proxyText.get(); ++ } else { ++ text = originText.get(); ++ ++ // prepend "scheme://" ++ nsAutoString schemeU; ++ CopyASCIItoUTF16(scheme, schemeU); ++ schemeU.AppendLiteral("://"); ++ displayHost.Insert(schemeU, 0); ++ } ++ ++ const PRUnichar *strings[] = { realm.get(), displayHost.get() }; ++ PRUint32 count = NS_ARRAY_LENGTH(strings); ++ ++ if (flags & nsIAuthInformation::ONLY_PASSWORD) { ++ text = passwordText.get(); ++ strings[0] = username.get(); ++ } else if (!proxyAuth && realm.IsEmpty()) { ++ text = noRealmText.get(); ++ count--; ++ strings[0] = strings[1]; ++ } ++ ++ rv = bundle->FormatStringFromName(text, strings, count, getter_Copies(message)); ++ return rv; ++} ++ ++/* static */ nsresult ++EphyPromptService::PromptPasswordAdapter(nsIPromptService* aService, ++ nsIDOMWindow* aParent, ++ nsIChannel* aChannel, ++ PRUint32 aLevel, ++ nsIAuthInformation* aAuthInfo, ++ const PRUnichar* aCheckLabel, ++ PRBool* aCheckValue, ++ PRBool* retval) ++{ ++ // construct the message string ++ nsString message; ++ MakeDialogText(aChannel, aAuthInfo, message); ++ ++ nsAutoString defaultUser, defaultDomain, defaultPass; ++ aAuthInfo->GetUsername(defaultUser); ++ aAuthInfo->GetDomain(defaultDomain); ++ aAuthInfo->GetPassword(defaultPass); ++ ++ PRUint32 flags; ++ aAuthInfo->GetFlags(&flags); ++ ++ if ((flags & nsIAuthInformation::NEED_DOMAIN) && !defaultDomain.IsEmpty()) { ++ defaultDomain.Append(PRUnichar('\\')); ++ defaultUser.Insert(defaultDomain, 0); ++ } ++ ++ // NOTE: Allocation failure is not fatal here (just default to empty string ++ // if allocation fails) ++ PRUnichar *user = ToNewUnicode(defaultUser), ++ *pass = ToNewUnicode(defaultPass); ++ nsresult rv; ++ if (flags & nsIAuthInformation::ONLY_PASSWORD) ++ rv = aService->PromptPassword(aParent, nsnull, message.get(), ++ &pass, aCheckLabel, ++ aCheckValue, retval); ++ else ++ rv = aService->PromptUsernameAndPassword(aParent, nsnull, message.get(), ++ &user, &pass, aCheckLabel, ++ aCheckValue, retval); ++ ++ nsString userStr(user); ++ nsString passStr(pass); ++ aAuthInfo->SetUsername(userStr); ++ aAuthInfo->SetPassword(passStr); ++ ++ return rv; ++} ++ ++/* boolean promptAuth (in nsIDOMWindow aParent, in nsIChannel aChannel, in PRUint32 level, in nsIAuthInformation authInfo, in wstring checkboxLabel, inout boolean checkValue); */ ++NS_METHOD ++EphyPromptService::PromptAuth(nsIDOMWindow *aParent, ++ nsIChannel *aChannel, ++ PRUint32 level, ++ nsIAuthInformation *authInfo, ++ const PRUnichar *checkboxLabel, ++ PRBool *checkValue, ++ PRBool *_retval) ++{ ++ NS_ENSURE_ARG_POINTER (_retval); ++ NS_ENSURE_ARG_POINTER (authInfo); ++ ++ return EphyPromptService::PromptPasswordAdapter(this, ++ aParent, ++ aChannel, ++ level, ++ authInfo, ++ checkboxLabel, ++ checkValue, ++ _retval); ++} ++ ++/* nsICancelable asyncPromptAuth (in nsIDOMWindow aParent, in nsIChannel aChannel, in nsIAuthPromptCallback aCallback, in nsISupports aContext, in PRUint32 level, in nsIAuthInformation authInfo, in wstring checkboxLabel, inout boolean checkValue); */ ++NS_METHOD EphyPromptService::AsyncPromptAuth(nsIDOMWindow *aParent, ++ nsIChannel *aChannel, ++ nsIAuthPromptCallback *aCallback, ++ nsISupports *aContext, ++ PRUint32 level, ++ nsIAuthInformation *authInfo, ++ const PRUnichar *checkboxLabel, ++ PRBool *checkValue, ++ nsICancelable **_retval) ++{ ++ return NS_ERROR_NOT_IMPLEMENTED; ++} ++ ++ + #endif /* HAVE_NSINONBLOCKINGALERTSERVICE_H */ +Index: embed/mozilla/EphyPromptService.h +=================================================================== +--- a/embed/mozilla/EphyPromptService.h (revision 7834) ++++ b/embed/mozilla/EphyPromptService.h (working copy) +@@ -22,6 +22,7 @@ + #define EPHY_PROMPT_SERVICE_H + + #include <nsIPromptService.h> ++#include <nsIPromptService2.h> + + #if HAVE_NSINONBLOCKINGALERTSERVICE_H + #include <nsINonBlockingAlertService.h> +@@ -34,7 +35,7 @@ + + #define EPHY_PROMPT_SERVICE_CLASSNAME "Epiphany Prompt Service" + +-class EphyPromptService : public nsIPromptService ++class EphyPromptService : public nsIPromptService2 + #if HAVE_NSINONBLOCKINGALERTSERVICE_H + , public nsINonBlockingAlertService + #endif +@@ -42,12 +43,23 @@ + public: + NS_DECL_ISUPPORTS + NS_DECL_NSIPROMPTSERVICE ++ NS_DECL_NSIPROMPTSERVICE2 + #if HAVE_NSINONBLOCKINGALERTSERVICE_H + NS_DECL_NSINONBLOCKINGALERTSERVICE + #endif + + EphyPromptService(); + virtual ~EphyPromptService(); ++ ++ protected: ++ static nsresult PromptPasswordAdapter(nsIPromptService* aService, ++ nsIDOMWindow* aParent, ++ nsIChannel* aChannel, ++ PRUint32 aLevel, ++ nsIAuthInformation* aAuthInfo, ++ const PRUnichar* aCheckLabel, ++ PRBool* aCheckValue, ++ PRBool* retval); + }; + + #endif /* EPHY_PROMPT_SERVICE_H */ --- epiphany-browser-2.21.4.orig/debian/patches/00_browser_wrapper_path.patch +++ epiphany-browser-2.21.4/debian/patches/00_browser_wrapper_path.patch @@ -0,0 +1,27 @@ +Index: epiphany-2.20.0/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200 +@@ -3,7 +3,7 @@ + _Name=Epiphany Web Bookmarks + _GenericName=Web Bookmarks + _Comment=Browse and organize your bookmarks +-Exec=epiphany --bookmarks-editor ++Exec=epiphany-browser --bookmarks-editor + StartupNotify=true + Terminal=false + Type=Application +Index: epiphany-2.20.0/data/epiphany.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/epiphany.desktop.in.in 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/epiphany.desktop.in.in 2007-09-21 14:27:40.254542926 +0200 +@@ -3,7 +3,8 @@ + _Name=Epiphany Web Browser + _GenericName=Web Browser + _Comment=Browse the web +-Exec=epiphany %U ++Exec=epiphany-browser %U ++TryExec=/usr/bin/epiphany-browser + StartupNotify=true + Terminal=false + Type=Application --- epiphany-browser-2.21.4.orig/debian/patches/11_useragent-weasel.patch +++ epiphany-browser-2.21.4/debian/patches/11_useragent-weasel.patch @@ -0,0 +1,18 @@ +Index: epiphany-2.18.3/data/weasel-ua-pref.js.in +=================================================================== +--- epiphany-2.18.3.orig/data/weasel-ua-pref.js.in 2007-07-04 22:20:08.250260516 +0200 ++++ epiphany-2.18.3/data/weasel-ua-pref.js.in 2007-07-04 22:23:24.133423262 +0200 +@@ -1,6 +1,7 @@ +-// Add "Firefox/@WEASEL_UA_VERSION@" to the UA. This fixes +-// [https://bugzilla.mozilla.org/show_bug.cgi?id=334967] +-// Same as Camino [https://bugzilla.mozilla.org/show_bug.cgi?id=384721] and +-// IceApe [https://bugzilla.mozilla.org/show_bug.cgi?id=386113] do. +-// Also see discussion on [https://bugzilla.mozilla.org/show_bug.cgi?id=385999]. +-pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@"); ++ ++// The following breaks the UA by adding Firefox to it, but it also ++// fixes interaction with poorly written websites with broken UA checks. ++// See https://bugzilla.mozilla.org/show_bug.cgi?id=384721#c6 to ++// understand why this is a bad idea and isn't enabled in Debian. ++// ++// pref("general.useragent.extra.firefox", "Firefox/@WEASEL_UA_VERSION@"); --- epiphany-browser-2.21.4.orig/debian/patches/99_autoreconf.patch +++ epiphany-browser-2.21.4/debian/patches/99_autoreconf.patch @@ -0,0 +1,2005 @@ +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/aclocal.m4 epiphany-browser-2.21.4.new/aclocal.m4 +--- epiphany-browser-2.21.4/aclocal.m4 2007-12-16 14:26:10.000000000 +0100 ++++ epiphany-browser-2.21.4.new/aclocal.m4 2007-12-18 16:42:01.000000000 +0100 +@@ -682,7 +682,7 @@ + + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +-# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL ++# serial 51 Debian 1.5.24-2ubuntu1 AC_PROG_LIBTOOL + + + # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/config.h.in epiphany-browser-2.21.4.new/config.h.in +--- epiphany-browser-2.21.4/config.h.in 2007-12-16 14:27:01.000000000 +0100 ++++ epiphany-browser-2.21.4.new/config.h.in 2007-12-18 16:42:08.000000000 +0100 +@@ -54,6 +54,9 @@ + /* Define if gecko is a debug build */ + #undef HAVE_GECKO_DEBUG + ++/* Define if xpcom glue is used */ ++#undef HAVE_GECKO_XPCOM_GLUE ++ + /* Define if the GNU gettext() function is already present or preinstalled. */ + #undef HAVE_GETTEXT + +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/configure epiphany-browser-2.21.4.new/configure +--- epiphany-browser-2.21.4/configure 2007-12-16 14:26:26.000000000 +0100 ++++ epiphany-browser-2.21.4.new/configure 2007-12-18 16:42:05.000000000 +0100 +@@ -727,7 +727,7 @@ + + # Identity of this package. + PACKAGE_NAME='GNOME Web Browser' +-PACKAGE_TARNAME='epiphany' ++PACKAGE_TARNAME='epiphany-browser' + PACKAGE_VERSION='2.21.4' + PACKAGE_STRING='GNOME Web Browser 2.21.4' + PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany' +@@ -921,6 +921,10 @@ + GCONF_SCHEMAS_INSTALL_FALSE + GCONFTOOL + with_engine ++HAVE_GECKO_DEBUG_TRUE ++HAVE_GECKO_DEBUG_FALSE ++HAVE_GECKO_XPCOM_GLUE_TRUE ++HAVE_GECKO_XPCOM_GLUE_FALSE + GECKO + GECKO_FLAVOUR + GECKO_INCLUDE_ROOT +@@ -933,8 +937,6 @@ + WEASEL_UA_VERSION + HAVE_MOZILLA_TOOLKIT_TRUE + HAVE_MOZILLA_TOOLKIT_FALSE +-HAVE_GECKO_DEBUG_TRUE +-HAVE_GECKO_DEBUG_FALSE + HAVE_GECKO_1_7_TRUE + HAVE_GECKO_1_7_FALSE + HAVE_GECKO_1_8_TRUE +@@ -943,6 +945,8 @@ + HAVE_GECKO_1_8_1_FALSE + HAVE_GECKO_1_9_TRUE + HAVE_GECKO_1_9_FALSE ++HAVE_GECKO_HOME_TRUE ++HAVE_GECKO_HOME_FALSE + WITH_GECKO_ENGINE_TRUE + WITH_GECKO_ENGINE_FALSE + HAVE_XULRUNNER_TRUE +@@ -1658,7 +1662,7 @@ + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] +- --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/epiphany-browser] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] +@@ -1736,9 +1740,11 @@ + --with-gconf-schema-file-dir=dir Directory for installing schema files. + --with-engine[=mozilla|webkit|xulrunner] + Which engine to build against [mozilla] +- --with-gecko[=mozilla|firefox|seamonkey|xulrunner] ++ --with-gecko[=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul] + Which gecko engine to use (autodetected by default) + ++ --with-gecko-home[=path] ++ Manually set MOZILLA_FIVE_HOME + --with-help-dir=DIR path to help docs + --with-omf-dir=DIR path to OMF files + --with-help-formats=FORMATS +@@ -2608,7 +2614,7 @@ + + + # Define the identity of the package. +- PACKAGE='epiphany' ++ PACKAGE='epiphany-browser' + VERSION='2.21.4' + + +@@ -4760,7 +4766,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4763 "configure"' > conftest.$ac_ext ++ echo '#line 4769 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7502,11 +7508,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7505: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7511: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7509: \$? = $ac_status" >&5 ++ echo "$as_me:7515: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7792,11 +7798,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7795: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7801: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7799: \$? = $ac_status" >&5 ++ echo "$as_me:7805: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7896,11 +7902,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7899: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7905: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7903: \$? = $ac_status" >&5 ++ echo "$as_me:7909: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10258,7 +10264,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10261 "configure" ++#line 10267 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10358,7 +10364,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 10361 "configure" ++#line 10367 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12778,11 +12784,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12781: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12787: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:12785: \$? = $ac_status" >&5 ++ echo "$as_me:12791: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -12882,11 +12888,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:12885: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:12891: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:12889: \$? = $ac_status" >&5 ++ echo "$as_me:12895: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14459,11 +14465,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14462: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14468: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14466: \$? = $ac_status" >&5 ++ echo "$as_me:14472: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14563,11 +14569,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14566: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14572: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14570: \$? = $ac_status" >&5 ++ echo "$as_me:14576: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16763,11 +16769,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16766: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16772: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16770: \$? = $ac_status" >&5 ++ echo "$as_me:16776: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17053,11 +17059,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17056: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17062: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:17060: \$? = $ac_status" >&5 ++ echo "$as_me:17066: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -17157,11 +17163,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:17160: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17166: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:17164: \$? = $ac_status" >&5 ++ echo "$as_me:17170: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -22946,6 +22952,7 @@ + libxslt >= \$LIBXSLT_REQUIRED + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= \$LIBGLADE_REQUIRED \\ + gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -22962,6 +22969,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -22981,6 +22989,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23009,6 +23018,7 @@ + libxslt >= \$LIBXSLT_REQUIRED + libgnome-2.0 >= \$LIBGNOME_REQUIRED + libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= \$LIBGLADE_REQUIRED \\ + gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23025,6 +23035,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23044,6 +23055,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23078,6 +23090,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23095,6 +23108,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23115,6 +23129,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23141,6 +23156,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +@@ -23872,12 +23888,15 @@ + gecko_cv_gecko=$with_gecko + + # Autodetect gecko +-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" ++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul" + if test -z "$gecko_cv_gecko"; then + for lizard in $_geckos; do + if $PKG_CONFIG --exists $lizard-xpcom; then + gecko_cv_gecko=$lizard + break; ++ elif $PKG_CONFIG --exist $lizard; then ++ gecko_cv_gecko=$lizard ++ break; + fi + done + fi +@@ -23899,6 +23918,18 @@ + gecko_cv_have_gecko=yes + fi + ++{ echo "$as_me:$LINENO: checking manual gecko home set" >&5 ++echo $ECHO_N "checking manual gecko home set... $ECHO_C" >&6; } ++ ++ ++# Check whether --with-gecko-home was given. ++if test "${with_gecko_home+set}" = set; then ++ withval=$with_gecko_home; ++fi ++ ++ ++gecko_cv_gecko_home=$with_gecko_home ++ + # **************** + # Define variables + # **************** +@@ -23910,13 +23941,24 @@ + seamonkey) gecko_cv_gecko_flavour=mozilla ;; + *firefox) gecko_cv_gecko_flavour=toolkit ;; + xulrunner) gecko_cv_gecko_flavour=toolkit ;; ++libxul*) gecko_cv_gecko_flavour=toolkit ;; + esac + +-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" +- ++if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" ++ _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test ++else ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable" ++ _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin" ++ _GECKO_HOME=$with_gecko_home ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`" ++ _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test ++fi + fi # if gecko_cv_have_gecko + + if test "$gecko_cv_gecko_flavour" = "toolkit"; then +@@ -23930,9 +23972,11 @@ + GECKO=$gecko_cv_gecko + GECKO_FLAVOUR=$gecko_cv_gecko_flavour + GECKO_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT ++GECKO_CFLAGS=$_GECKO_CFLAGS + GECKO_LIBDIR=$_GECKO_LIBDIR + GECKO_HOME=$_GECKO_HOME + GECKO_PREFIX=$_GECKO_PREFIX ++GECKO_NSPR=$_GECKO_NSPR + + # ************************************************************** + # This is really gcc-only +@@ -24069,7 +24113,7 @@ + + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS" + + { echo "$as_me:$LINENO: checking whether we have a gtk 2 gecko build" >&5 + echo $ECHO_N "checking whether we have a gtk 2 gecko build... $ECHO_C" >&6; } +@@ -24175,6 +24219,49 @@ + { echo "$as_me:$LINENO: result: $gecko_cv_have_debug" >&5 + echo "${ECHO_T}$gecko_cv_have_debug" >&6; } + ++{ echo "$as_me:$LINENO: checking whether we have a xpcom glue" >&5 ++echo $ECHO_N "checking whether we have a xpcom glue... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ #ifndef XPCOM_GLUE ++ #error "no xpcom glue found" ++ #endif ++ ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_cxx_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ gecko_cv_have_xpcom_glue=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gecko_cv_have_xpcom_glue=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $gecko_cv_have_xpcom_glue" >&5 ++echo "${ECHO_T}$gecko_cv_have_xpcom_glue" >&6; } ++ + CPPFLAGS="$_SAVE_CPPFLAGS" + + ac_ext=c +@@ -24195,8 +24282,32 @@ + + fi + ++if test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_GECKO_XPCOM_GLUE 1 ++_ACEOF ++ ++fi ++ + fi # if gecko_cv_have_gecko + ++ if test "$gecko_cv_have_debug" = "yes"; then ++ HAVE_GECKO_DEBUG_TRUE= ++ HAVE_GECKO_DEBUG_FALSE='#' ++else ++ HAVE_GECKO_DEBUG_TRUE='#' ++ HAVE_GECKO_DEBUG_FALSE= ++fi ++ ++ if test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ HAVE_GECKO_XPCOM_GLUE_TRUE= ++ HAVE_GECKO_XPCOM_GLUE_FALSE='#' ++else ++ HAVE_GECKO_XPCOM_GLUE_TRUE='#' ++ HAVE_GECKO_XPCOM_GLUE_FALSE= ++fi ++ + + # *********************** + # Check for gecko version +@@ -24212,7 +24323,7 @@ + + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS" + + { echo "$as_me:$LINENO: checking for gecko version" >&5 + echo $ECHO_N "checking for gecko version... $ECHO_C" >&6; } +@@ -24373,8 +24484,11 @@ + gecko_cv_extra_pkg_dependencies= + + if test "$gecko_cv_gecko_version_int" -ge "1009000"; then +- gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" +- gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s" ++ if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" ++ else ++ gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue" ++ fi + else + gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" + fi +@@ -24413,6 +24527,7 @@ + + case "$gecko_cv_gecko" in + xulrunner) min_version=1.8 ;; ++libxul*) min_version=1.9 ;; + *firefox) min_version=1.5 ;; + *) { { echo "$as_me:$LINENO: error: Unsupported gecko \"$gecko_cv_gecko\"" >&5 + echo "$as_me: error: Unsupported gecko \"$gecko_cv_gecko\"" >&2;} +@@ -24420,6 +24535,7 @@ + esac + + # Added $gecko_cv_gecko-js for debian xulrunner brokenness ++if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then + + pkg_failed=no + { echo "$as_me:$LINENO: checking for GECKO" >&5 +@@ -24430,12 +24546,12 @@ + pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5 +- ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5 ++ ($PKG_CONFIG --exists --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null` ++ pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24448,12 +24564,12 @@ + pkg_cv_GECKO_LIBS="$GECKO_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5 +- ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" \${gecko_cv_gecko}-xpcom >= \$min_version \${gecko_cv_gecko}-js \$gecko_cv_extra_pkg_dependencies\"") >&5 ++ ($PKG_CONFIG --exists --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null` ++ pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24472,14 +24588,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"` ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"` + else +- GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"` ++ GECKO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GECKO_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements ( ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met: + + $GECKO_PKG_ERRORS + +@@ -24490,7 +24606,7 @@ + and GECKO_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met: ++echo "$as_me: error: Package requirements ( ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies) were not met: + + $GECKO_PKG_ERRORS + +@@ -24531,6 +24647,40 @@ + echo "${ECHO_T}yes" >&6; } + : + fi ++else ++ GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG" ++ GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`" ++fi ++ ++{ echo "$as_me:$LINENO: checking nspr in gecko" >&5 ++echo $ECHO_N "checking nspr in gecko... $ECHO_C" >&6; } ++if ! test "$GECKO_NSPR" = yes; then ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ { echo "$as_me:$LINENO: checking nspr in system" >&5 ++echo $ECHO_N "checking nspr in system... $ECHO_C" >&6; } ++ gecko_nspr= ++ if $PKG_CONFIG --exists mozilla-nspr; then ++ gecko_nspr=mozilla-nspr ++ elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then ++ gecko_nspr=${gecko_cv_gecko}-nspr ++ elif $PKG_CONFIG --exists nspr; then ++ gecko_nspr=nspr ++ else ++ { { echo "$as_me:$LINENO: error: no nspr available" >&5 ++echo "$as_me: error: no nspr available" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ ++ GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`" ++ GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`" ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++else ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++fi ++ + + + +@@ -24587,10 +24737,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="" + +@@ -24599,9 +24759,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + if test "$cross_compiling" = yes; then +@@ -24617,11 +24779,17 @@ + #include <mozilla-config.h> + #include <stdlib.h> + #include <stdio.h> ++ ++#ifdef XPCOM_GLUE ++#include <nsXPCOMGlue.h> ++#else + #include <nsXPCOM.h> ++#endif // XPCOM_GLUE ++ + #include <nsCOMPtr.h> + #include <nsILocalFile.h> + #include <nsIServiceManager.h> +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include <nsStringAPI.h> + #else + #include <nsString.h> +@@ -24632,16 +24800,37 @@ + main () + { + ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr<nsILocalFile> directory; ++nsCOMPtr<nsILocalFile> directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { +@@ -24756,10 +24945,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="" + +@@ -24768,9 +24967,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + if test "$cross_compiling" = yes; then +@@ -24786,11 +24987,17 @@ + #include <mozilla-config.h> + #include <stdlib.h> + #include <stdio.h> ++ ++#ifdef XPCOM_GLUE ++#include <nsXPCOMGlue.h> ++#else + #include <nsXPCOM.h> ++#endif // XPCOM_GLUE ++ + #include <nsCOMPtr.h> + #include <nsILocalFile.h> + #include <nsIServiceManager.h> +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include <nsStringAPI.h> + #else + #include <nsString.h> +@@ -24801,16 +25008,37 @@ + main () + { + ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr<nsILocalFile> directory; ++nsCOMPtr<nsILocalFile> directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { +@@ -24932,10 +25160,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="pipnss" + +@@ -24944,9 +25182,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + +@@ -25188,10 +25428,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="windowwatcher" + +@@ -25200,9 +25450,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + +@@ -25389,10 +25641,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="docshell" + +@@ -25401,9 +25663,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + +@@ -25590,10 +25854,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="necko" + +@@ -25602,9 +25876,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + +@@ -25791,10 +26067,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="xpcom" + +@@ -25803,9 +26089,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + +@@ -25991,10 +26279,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="spellchecker" + +@@ -26003,9 +26301,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + +@@ -26214,10 +26514,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="" + +@@ -26226,9 +26536,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + if test "$cross_compiling" = yes; then +@@ -26244,11 +26556,17 @@ + #include <mozilla-config.h> + #include <stdlib.h> + #include <stdio.h> ++ ++#ifdef XPCOM_GLUE ++#include <nsXPCOMGlue.h> ++#else + #include <nsXPCOM.h> ++#endif // XPCOM_GLUE ++ + #include <nsCOMPtr.h> + #include <nsILocalFile.h> + #include <nsIServiceManager.h> +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include <nsStringAPI.h> + #else + #include <nsString.h> +@@ -26261,16 +26579,37 @@ + main () + { + ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr<nsILocalFile> directory; ++nsCOMPtr<nsILocalFile> directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { +@@ -26438,6 +26777,14 @@ + HAVE_GECKO_1_9_FALSE= + fi + ++ if test "x$_GECKO_HOME" != "x"; then ++ HAVE_GECKO_HOME_TRUE= ++ HAVE_GECKO_HOME_FALSE='#' ++else ++ HAVE_GECKO_HOME_TRUE='#' ++ HAVE_GECKO_HOME_FALSE= ++fi ++ + + if test "$with_engine" = "mozilla"; then + WITH_GECKO_ENGINE_TRUE= +@@ -27761,6 +28108,119 @@ + echo "${ECHO_T}$enable_desktop_file_plugin" >&6; } + + if test "$enable_desktop_file_plugin" = "yes"; then ++ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ ++pkg_failed=no ++{ echo "$as_me:$LINENO: checking for DESKTOP_FILE_PLUGIN_DEP" >&5 ++echo $ECHO_N "checking for DESKTOP_FILE_PLUGIN_DEP... $ECHO_C" >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DESKTOP_FILE_PLUGIN_DEP_CFLAGS"; then ++ pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS="$DESKTOP_FILE_PLUGIN_DEP_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$DESKTOP_FILE_PLUGIN_DEP_LIBS"; then ++ pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS="$DESKTOP_FILE_PLUGIN_DEP_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0"` ++ else ++ DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS" >&5 ++ ++ { { echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0) were not met: ++ ++$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&5 ++echo "$as_me: error: Package requirements (${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0) were not met: ++ ++$DESKTOP_FILE_PLUGIN_DEP_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" >&2;} ++ { (exit 1); exit 1; }; } ++elif test $pkg_failed = untried; then ++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details." >&5 ++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++and DESKTOP_FILE_PLUGIN_DEP_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++else ++ DESKTOP_FILE_PLUGIN_DEP_CFLAGS=$pkg_cv_DESKTOP_FILE_PLUGIN_DEP_CFLAGS ++ DESKTOP_FILE_PLUGIN_DEP_LIBS=$pkg_cv_DESKTOP_FILE_PLUGIN_DEP_LIBS ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ : ++fi ++ else + + pkg_failed=no + { echo "$as_me:$LINENO: checking for DESKTOP_FILE_PLUGIN_DEP" >&5 +@@ -27872,6 +28332,7 @@ + echo "${ECHO_T}yes" >&6; } + : + fi ++ fi + + + fi +@@ -31142,6 +31603,20 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${HAVE_GECKO_DEBUG_TRUE}" && test -z "${HAVE_GECKO_DEBUG_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_DEBUG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_GECKO_DEBUG\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++if test -z "${HAVE_GECKO_XPCOM_GLUE_TRUE}" && test -z "${HAVE_GECKO_XPCOM_GLUE_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_GECKO_XPCOM_GLUE\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${HAVE_MOZILLA_TOOLKIT_TRUE}" && test -z "${HAVE_MOZILLA_TOOLKIT_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_MOZILLA_TOOLKIT\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -31184,6 +31659,13 @@ + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${HAVE_GECKO_HOME_TRUE}" && test -z "${HAVE_GECKO_HOME_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GECKO_HOME\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"HAVE_GECKO_HOME\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${WITH_GECKO_ENGINE_TRUE}" && test -z "${WITH_GECKO_ENGINE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WITH_GECKO_ENGINE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -32089,6 +32571,10 @@ + GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim + GCONFTOOL!$GCONFTOOL$ac_delim + with_engine!$with_engine$ac_delim ++HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim ++HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim ++HAVE_GECKO_XPCOM_GLUE_TRUE!$HAVE_GECKO_XPCOM_GLUE_TRUE$ac_delim ++HAVE_GECKO_XPCOM_GLUE_FALSE!$HAVE_GECKO_XPCOM_GLUE_FALSE$ac_delim + GECKO!$GECKO$ac_delim + GECKO_FLAVOUR!$GECKO_FLAVOUR$ac_delim + GECKO_INCLUDE_ROOT!$GECKO_INCLUDE_ROOT$ac_delim +@@ -32101,8 +32587,6 @@ + WEASEL_UA_VERSION!$WEASEL_UA_VERSION$ac_delim + HAVE_MOZILLA_TOOLKIT_TRUE!$HAVE_MOZILLA_TOOLKIT_TRUE$ac_delim + HAVE_MOZILLA_TOOLKIT_FALSE!$HAVE_MOZILLA_TOOLKIT_FALSE$ac_delim +-HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim +-HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim + HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim + HAVE_GECKO_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$ac_delim + HAVE_GECKO_1_8_TRUE!$HAVE_GECKO_1_8_TRUE$ac_delim +@@ -32111,6 +32595,8 @@ + HAVE_GECKO_1_8_1_FALSE!$HAVE_GECKO_1_8_1_FALSE$ac_delim + HAVE_GECKO_1_9_TRUE!$HAVE_GECKO_1_9_TRUE$ac_delim + HAVE_GECKO_1_9_FALSE!$HAVE_GECKO_1_9_FALSE$ac_delim ++HAVE_GECKO_HOME_TRUE!$HAVE_GECKO_HOME_TRUE$ac_delim ++HAVE_GECKO_HOME_FALSE!$HAVE_GECKO_HOME_FALSE$ac_delim + WITH_GECKO_ENGINE_TRUE!$WITH_GECKO_ENGINE_TRUE$ac_delim + WITH_GECKO_ENGINE_FALSE!$WITH_GECKO_ENGINE_FALSE$ac_delim + HAVE_XULRUNNER_TRUE!$HAVE_XULRUNNER_TRUE$ac_delim +@@ -32127,10 +32613,6 @@ + LIBXUL_CXXCPPFLAGS!$LIBXUL_CXXCPPFLAGS$ac_delim + LIBXUL_CXXFLAGS!$LIBXUL_CXXFLAGS$ac_delim + LIBXUL_LDFLAGS!$LIBXUL_LDFLAGS$ac_delim +-LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim +-HAVE_LIBXUL_TRUE!$HAVE_LIBXUL_TRUE$ac_delim +-HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim +-HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -32172,6 +32654,10 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++LIBXUL_LIBS!$LIBXUL_LIBS$ac_delim ++HAVE_LIBXUL_TRUE!$HAVE_LIBXUL_TRUE$ac_delim ++HAVE_LIBXUL_FALSE!$HAVE_LIBXUL_FALSE$ac_delim ++HAVE_LIBXUL_DEBUG_TRUE!$HAVE_LIBXUL_DEBUG_TRUE$ac_delim + HAVE_LIBXUL_DEBUG_FALSE!$HAVE_LIBXUL_DEBUG_FALSE$ac_delim + WITH_XULRUNNER_ENGINE_TRUE!$WITH_XULRUNNER_ENGINE_TRUE$ac_delim + WITH_XULRUNNER_ENGINE_FALSE!$WITH_XULRUNNER_ENGINE_FALSE$ac_delim +@@ -32265,10 +32751,6 @@ + GNOME_LIBS!$GNOME_LIBS$ac_delim + GVFS_CFLAGS!$GVFS_CFLAGS$ac_delim + GVFS_LIBS!$GVFS_LIBS$ac_delim +-HAVE_GVFS_TRUE!$HAVE_GVFS_TRUE$ac_delim +-HAVE_GVFS_FALSE!$HAVE_GVFS_FALSE$ac_delim +-LSB_RELEASE!$LSB_RELEASE$ac_delim +-GGE_VERSION!$GGE_VERSION$ac_delim + _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then +@@ -32310,12 +32792,16 @@ + ac_delim='%!_!# ' + for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF ++HAVE_GVFS_TRUE!$HAVE_GVFS_TRUE$ac_delim ++HAVE_GVFS_FALSE!$HAVE_GVFS_FALSE$ac_delim ++LSB_RELEASE!$LSB_RELEASE$ac_delim ++GGE_VERSION!$GGE_VERSION$ac_delim + GGE_API_VERSION!$GGE_API_VERSION$ac_delim + LIBOBJS!$LIBOBJS$ac_delim + LTLIBOBJS!$LTLIBOBJS$ac_delim + _ACEOF + +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/doc/reference/Makefile.in epiphany-browser-2.21.4.new/doc/reference/Makefile.in +--- epiphany-browser-2.21.4/doc/reference/Makefile.in 2007-12-16 14:26:19.000000000 +0100 ++++ epiphany-browser-2.21.4.new/doc/reference/Makefile.in 2007-12-18 16:42:09.000000000 +0100 +@@ -473,8 +473,8 @@ + # include $(top_srcdir)/gtk-doc.make + # We need to copy/paste this to be able to change LD_LIBRARY_PATH + @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) ++@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CXX) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) + + # We set GPATH here; this gives us semantics for GNU make + # which are more like other make's VPATH, when it comes to +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/embed/Makefile.in epiphany-browser-2.21.4.new/embed/Makefile.in +--- epiphany-browser-2.21.4/embed/Makefile.in 2007-12-16 14:26:19.000000000 +0100 ++++ epiphany-browser-2.21.4.new/embed/Makefile.in 2007-12-18 16:42:09.000000000 +0100 +@@ -462,6 +462,7 @@ + -I$(top_srcdir)/embed/$(with_engine) $(AM_CPPFLAGS) \ + $(am__append_3) $(am__append_4) + libephyembedfactory_la_CFLAGS = \ ++ $(GECKO_CFLAGS) \ + $(DEPENDENCIES_CFLAGS) \ + $(AM_CFLAGS) + +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/embed/mozilla/Makefile.in epiphany-browser-2.21.4.new/embed/mozilla/Makefile.in +--- epiphany-browser-2.21.4/embed/mozilla/Makefile.in 2007-12-18 16:41:53.000000000 +0100 ++++ epiphany-browser-2.21.4.new/embed/mozilla/Makefile.in 2007-12-18 16:42:09.000000000 +0100 +@@ -32,11 +32,21 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@ENABLE_FILEPICKER_TRUE@am__append_1 = \ ++ ++# XXX asac: 1.9 certificate ++@HAVE_GECKO_1_9_TRUE@am__append_1 = \ ++@HAVE_GECKO_1_9_TRUE@ $(NULL) ++ ++@HAVE_GECKO_1_9_FALSE@am__append_2 = \ ++@HAVE_GECKO_1_9_FALSE@ EphyBadCertRejector.cpp \ ++@HAVE_GECKO_1_9_FALSE@ EphyBadCertRejector.h \ ++@HAVE_GECKO_1_9_FALSE@ $(NULL) ++ ++@ENABLE_FILEPICKER_TRUE@am__append_3 = \ + @ENABLE_FILEPICKER_TRUE@ FilePicker.cpp \ + @ENABLE_FILEPICKER_TRUE@ FilePicker.h + +-@HAVE_MOZILLA_PSM_TRUE@am__append_2 = \ ++@HAVE_MOZILLA_PSM_TRUE@am__append_4 = \ + @HAVE_MOZILLA_PSM_TRUE@ GtkNSSClientAuthDialogs.cpp \ + @HAVE_MOZILLA_PSM_TRUE@ GtkNSSClientAuthDialogs.h \ + @HAVE_MOZILLA_PSM_TRUE@ GtkNSSDialogs.cpp \ +@@ -46,11 +56,11 @@ + @HAVE_MOZILLA_PSM_TRUE@ GtkNSSSecurityWarningDialogs.cpp\ + @HAVE_MOZILLA_PSM_TRUE@ GtkNSSSecurityWarningDialogs.h + +-@ENABLE_CERTIFICATE_MANAGER_TRUE@am__append_3 = \ ++@ENABLE_CERTIFICATE_MANAGER_TRUE@am__append_5 = \ + @ENABLE_CERTIFICATE_MANAGER_TRUE@ mozilla-x509-cert.cpp \ + @ENABLE_CERTIFICATE_MANAGER_TRUE@ mozilla-x509-cert.h + +-@ENABLE_SPELLCHECKER_TRUE@am__append_4 = \ ++@ENABLE_SPELLCHECKER_TRUE@am__append_6 = \ + @ENABLE_SPELLCHECKER_TRUE@ GeckoSpellCheckEngine.cpp \ + @ENABLE_SPELLCHECKER_TRUE@ GeckoSpellCheckEngine.h + +@@ -72,8 +82,7 @@ + am__libephymozillaembed_la_SOURCES_DIST = AutoJSContextStack.cpp \ + AutoJSContextStack.h AutoWindowModalState.cpp \ + AutoWindowModalState.h ContentHandler.cpp ContentHandler.h \ +- EphyAboutModule.cpp EphyAboutModule.h EphyBadCertRejector.cpp \ +- EphyBadCertRejector.h EphyContentPolicy.cpp \ ++ EphyAboutModule.cpp EphyAboutModule.h EphyContentPolicy.cpp \ + EphyContentPolicy.h EphyDirectoryProvider.cpp \ + EphyDirectoryProvider.h EphyHeaderSniffer.cpp \ + EphyHeaderSniffer.h EphyBrowser.cpp EphyBrowser.h EphyFind.cpp \ +@@ -93,7 +102,8 @@ + mozilla-embed-find.cpp mozilla-embed-find.h \ + mozilla-embed-persist.cpp mozilla-embed-persist.h \ + mozilla-embed-single.cpp mozilla-embed-single.h \ +- mozilla-notifiers.cpp mozilla-notifiers.h FilePicker.cpp \ ++ mozilla-notifiers.cpp mozilla-notifiers.h \ ++ EphyBadCertRejector.cpp EphyBadCertRejector.h FilePicker.cpp \ + FilePicker.h GtkNSSClientAuthDialogs.cpp \ + GtkNSSClientAuthDialogs.h GtkNSSDialogs.cpp GtkNSSDialogs.h \ + GtkNSSKeyPairDialogs.cpp GtkNSSKeyPairDialogs.h \ +@@ -101,20 +111,21 @@ + GtkNSSSecurityWarningDialogs.h mozilla-x509-cert.cpp \ + mozilla-x509-cert.h GeckoSpellCheckEngine.cpp \ + GeckoSpellCheckEngine.h +-@ENABLE_FILEPICKER_TRUE@am__objects_1 = \ ++am__objects_1 = ++@HAVE_GECKO_1_9_FALSE@am__objects_2 = libephymozillaembed_la-EphyBadCertRejector.lo ++@ENABLE_FILEPICKER_TRUE@am__objects_3 = \ + @ENABLE_FILEPICKER_TRUE@ libephymozillaembed_la-FilePicker.lo +-@HAVE_MOZILLA_PSM_TRUE@am__objects_2 = libephymozillaembed_la-GtkNSSClientAuthDialogs.lo \ ++@HAVE_MOZILLA_PSM_TRUE@am__objects_4 = libephymozillaembed_la-GtkNSSClientAuthDialogs.lo \ + @HAVE_MOZILLA_PSM_TRUE@ libephymozillaembed_la-GtkNSSDialogs.lo \ + @HAVE_MOZILLA_PSM_TRUE@ libephymozillaembed_la-GtkNSSKeyPairDialogs.lo \ + @HAVE_MOZILLA_PSM_TRUE@ libephymozillaembed_la-GtkNSSSecurityWarningDialogs.lo +-@ENABLE_CERTIFICATE_MANAGER_TRUE@am__objects_3 = libephymozillaembed_la-mozilla-x509-cert.lo +-@ENABLE_SPELLCHECKER_TRUE@am__objects_4 = libephymozillaembed_la-GeckoSpellCheckEngine.lo ++@ENABLE_CERTIFICATE_MANAGER_TRUE@am__objects_5 = libephymozillaembed_la-mozilla-x509-cert.lo ++@ENABLE_SPELLCHECKER_TRUE@am__objects_6 = libephymozillaembed_la-GeckoSpellCheckEngine.lo + am_libephymozillaembed_la_OBJECTS = \ + libephymozillaembed_la-AutoJSContextStack.lo \ + libephymozillaembed_la-AutoWindowModalState.lo \ + libephymozillaembed_la-ContentHandler.lo \ + libephymozillaembed_la-EphyAboutModule.lo \ +- libephymozillaembed_la-EphyBadCertRejector.lo \ + libephymozillaembed_la-EphyContentPolicy.lo \ + libephymozillaembed_la-EphyDirectoryProvider.lo \ + libephymozillaembed_la-EphyHeaderSniffer.lo \ +@@ -141,7 +152,8 @@ + libephymozillaembed_la-mozilla-embed-persist.lo \ + libephymozillaembed_la-mozilla-embed-single.lo \ + libephymozillaembed_la-mozilla-notifiers.lo $(am__objects_1) \ +- $(am__objects_2) $(am__objects_3) $(am__objects_4) ++ $(am__objects_2) $(am__objects_3) $(am__objects_4) \ ++ $(am__objects_5) $(am__objects_6) + libephymozillaembed_la_OBJECTS = $(am_libephymozillaembed_la_OBJECTS) + libephymozillaembed_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +@@ -419,8 +431,7 @@ + libephymozillaembed_la_SOURCES = AutoJSContextStack.cpp \ + AutoJSContextStack.h AutoWindowModalState.cpp \ + AutoWindowModalState.h ContentHandler.cpp ContentHandler.h \ +- EphyAboutModule.cpp EphyAboutModule.h EphyBadCertRejector.cpp \ +- EphyBadCertRejector.h EphyContentPolicy.cpp \ ++ EphyAboutModule.cpp EphyAboutModule.h EphyContentPolicy.cpp \ + EphyContentPolicy.h EphyDirectoryProvider.cpp \ + EphyDirectoryProvider.h EphyHeaderSniffer.cpp \ + EphyHeaderSniffer.h EphyBrowser.cpp EphyBrowser.h EphyFind.cpp \ +@@ -441,7 +452,8 @@ + mozilla-embed-persist.cpp mozilla-embed-persist.h \ + mozilla-embed-single.cpp mozilla-embed-single.h \ + mozilla-notifiers.cpp mozilla-notifiers.h $(am__append_1) \ +- $(am__append_2) $(am__append_3) $(am__append_4) ++ $(am__append_2) $(am__append_3) $(am__append_4) \ ++ $(am__append_5) $(am__append_6) + mozilla_include_subdirs = \ + . \ + caps \ +@@ -470,6 +482,7 @@ + pipnss \ + pref \ + shistory \ ++ string \ + sidebar \ + spellchecker \ + uriloader \ +@@ -495,6 +508,7 @@ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ + -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \ + -DALLOW_PRIVATE_API \ ++ -DXPCOM_GLUE_USE_NSPR \ + $(AM_CPPFLAGS) + + libephymozillaembed_la_CXXFLAGS = \ +@@ -641,13 +655,6 @@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyAboutModule.lo `test -f 'EphyAboutModule.cpp' || echo '$(srcdir)/'`EphyAboutModule.cpp + +-libephymozillaembed_la-EphyBadCertRejector.lo: EphyBadCertRejector.cpp +-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyBadCertRejector.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp +-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Plo +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='EphyBadCertRejector.cpp' object='libephymozillaembed_la-EphyBadCertRejector.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp +- + libephymozillaembed_la-EphyContentPolicy.lo: EphyContentPolicy.cpp + @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyContentPolicy.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Tpo -c -o libephymozillaembed_la-EphyContentPolicy.lo `test -f 'EphyContentPolicy.cpp' || echo '$(srcdir)/'`EphyContentPolicy.cpp + @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Tpo $(DEPDIR)/libephymozillaembed_la-EphyContentPolicy.Plo +@@ -830,6 +837,13 @@ + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-mozilla-notifiers.lo `test -f 'mozilla-notifiers.cpp' || echo '$(srcdir)/'`mozilla-notifiers.cpp + ++libephymozillaembed_la-EphyBadCertRejector.lo: EphyBadCertRejector.cpp ++@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-EphyBadCertRejector.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Tpo $(DEPDIR)/libephymozillaembed_la-EphyBadCertRejector.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='EphyBadCertRejector.cpp' object='libephymozillaembed_la-EphyBadCertRejector.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -c -o libephymozillaembed_la-EphyBadCertRejector.lo `test -f 'EphyBadCertRejector.cpp' || echo '$(srcdir)/'`EphyBadCertRejector.cpp ++ + libephymozillaembed_la-FilePicker.lo: FilePicker.cpp + @am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephymozillaembed_la_CPPFLAGS) $(CPPFLAGS) $(libephymozillaembed_la_CXXFLAGS) $(CXXFLAGS) -MT libephymozillaembed_la-FilePicker.lo -MD -MP -MF $(DEPDIR)/libephymozillaembed_la-FilePicker.Tpo -c -o libephymozillaembed_la-FilePicker.lo `test -f 'FilePicker.cpp' || echo '$(srcdir)/'`FilePicker.cpp + @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libephymozillaembed_la-FilePicker.Tpo $(DEPDIR)/libephymozillaembed_la-FilePicker.Plo +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/gtk-doc.make epiphany-browser-2.21.4.new/gtk-doc.make +--- epiphany-browser-2.21.4/gtk-doc.make 1970-01-01 01:00:00.000000000 +0100 ++++ epiphany-browser-2.21.4.new/gtk-doc.make 2007-12-18 16:41:54.000000000 +0100 +@@ -0,0 +1,174 @@ ++# -*- mode: makefile -*- ++ ++#################################### ++# Everything below here is generic # ++#################################### ++ ++if GTK_DOC_USE_LIBTOOL ++GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) ++else ++GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) ++GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) ++endif ++ ++# We set GPATH here; this gives us semantics for GNU make ++# which are more like other make's VPATH, when it comes to ++# whether a source that is a target of one rule is then ++# searched for in VPATH/GPATH. ++# ++GPATH = $(srcdir) ++ ++TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) ++ ++EXTRA_DIST = \ ++ $(content_files) \ ++ $(HTML_IMAGES) \ ++ $(DOC_MAIN_SGML_FILE) \ ++ $(DOC_MODULE)-sections.txt \ ++ $(DOC_MODULE)-overrides.txt ++ ++DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ ++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ++ ++SCANOBJ_FILES = \ ++ $(DOC_MODULE).args \ ++ $(DOC_MODULE).hierarchy \ ++ $(DOC_MODULE).interfaces \ ++ $(DOC_MODULE).prerequisites \ ++ $(DOC_MODULE).signals ++ ++REPORT_FILES = \ ++ $(DOC_MODULE)-undocumented.txt \ ++ $(DOC_MODULE)-undeclared.txt \ ++ $(DOC_MODULE)-unused.txt ++ ++CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) ++ ++if ENABLE_GTK_DOC ++all-local: html-build.stamp ++else ++all-local: ++endif ++ ++docs: html-build.stamp ++ ++#### scan #### ++ ++scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) ++ @echo 'gtk-doc: Scanning header files' ++ @-chmod -R u+w $(srcdir) ++ cd $(srcdir) && \ ++ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) ++ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ ++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ ++ else \ ++ cd $(srcdir) ; \ ++ for i in $(SCANOBJ_FILES) ; do \ ++ test -f $$i || touch $$i ; \ ++ done \ ++ fi ++ touch scan-build.stamp ++ ++$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp ++ @true ++ ++#### templates #### ++ ++tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt ++ @echo 'gtk-doc: Rebuilding template files' ++ @-chmod -R u+w $(srcdir) ++ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) ++ touch tmpl-build.stamp ++ ++tmpl.stamp: tmpl-build.stamp ++ @true ++ ++tmpl/*.sgml: ++ @true ++ ++ ++#### xml #### ++ ++sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) ++ @echo 'gtk-doc: Building XML' ++ @-chmod -R u+w $(srcdir) ++ cd $(srcdir) && \ ++ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) ++ touch sgml-build.stamp ++ ++sgml.stamp: sgml-build.stamp ++ @true ++ ++#### html #### ++ ++html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) ++ @echo 'gtk-doc: Building HTML' ++ @-chmod -R u+w $(srcdir) ++ rm -rf $(srcdir)/html ++ mkdir $(srcdir)/html ++ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) ++ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) ++ @echo 'gtk-doc: Fixing cross-references' ++ cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) ++ touch html-build.stamp ++ ++############## ++ ++clean-local: ++ rm -f *~ *.bak ++ rm -rf .libs ++ ++distclean-local: ++ cd $(srcdir) && \ ++ rm -rf xml $(REPORT_FILES) \ ++ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt ++ ++maintainer-clean-local: clean ++ cd $(srcdir) && rm -rf xml html ++ ++install-data-local: ++ installfiles=`echo $(srcdir)/html/*`; \ ++ if test "$$installfiles" = '$(srcdir)/html/*'; \ ++ then echo '-- Nothing to install' ; \ ++ else \ ++ $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ ++ for i in $$installfiles; do \ ++ echo '-- Installing '$$i ; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ ++ done; \ ++ echo '-- Installing $(srcdir)/html/index.sgml' ; \ ++ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ ++ if test `which gtkdoc-rebase` != ""; then \ ++ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ ++ fi \ ++ fi ++ ++ ++uninstall-local: ++ rm -f $(DESTDIR)$(TARGET_DIR)/* ++ ++# ++# Require gtk-doc when making dist ++# ++if ENABLE_GTK_DOC ++dist-check-gtkdoc: ++else ++dist-check-gtkdoc: ++ @echo "*** gtk-doc must be installed and enabled in order to make dist" ++ @false ++endif ++ ++dist-hook: dist-check-gtkdoc dist-hook-local ++ mkdir $(distdir)/tmpl ++ mkdir $(distdir)/xml ++ mkdir $(distdir)/html ++ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl ++ -cp $(srcdir)/xml/*.xml $(distdir)/xml ++ cp $(srcdir)/html/* $(distdir)/html ++ cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ ++ cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ ++ cd $(distdir) && rm -f $(DISTCLEANFILES) ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ ++.PHONY : dist-hook-local docs +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in epiphany-browser-2.21.4.new/plugins/desktop-file/Makefile.in +--- epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in 2007-12-18 16:41:53.000000000 +0100 ++++ epiphany-browser-2.21.4.new/plugins/desktop-file/Makefile.in 2007-12-18 16:42:10.000000000 +0100 +@@ -349,7 +349,6 @@ + libdesktopfileplugin_la_LDFLAGS = \ + -module -avoid-version \ + -export-symbols $(srcdir)/plugin.symbols \ +- -R$(GECKO_HOME) \ + $(AM_LDFLAGS) + + EXTRA_DIST = \ +@@ -640,6 +639,12 @@ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pluginLTLIBRARIES + ++ ++@HAVE_GECKO_XPCOM_GLUE_TRUE@ libdesktopfileplugin_la_LDFLAGS += \ ++@HAVE_GECKO_XPCOM_GLUE_TRUE@ $(NULL) ++@HAVE_GECKO_XPCOM_GLUE_FALSE@ libdesktopfileplugin_la_LDFLAGS += \ ++@HAVE_GECKO_XPCOM_GLUE_FALSE@ -R$(GECKO_HOME) \ ++@HAVE_GECKO_XPCOM_GLUE_FALSE@ $(NULL) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Nur -x '*.orig' -x '*~' epiphany-browser-2.21.4/src/Makefile.in epiphany-browser-2.21.4.new/src/Makefile.in +--- epiphany-browser-2.21.4/src/Makefile.in 2007-12-18 16:41:53.000000000 +0100 ++++ epiphany-browser-2.21.4.new/src/Makefile.in 2007-12-18 16:42:11.000000000 +0100 +@@ -58,6 +58,7 @@ + @WITH_XULRUNNER_ENGINE_TRUE@ $(top_builddir)/embed/xulrunner/components/libephycomponents.la + + @WITH_GECKO_ENGINE_TRUE@am__append_7 = \ ++@WITH_GECKO_ENGINE_TRUE@ $(GECKO_LIBS) \ + @WITH_GECKO_ENGINE_TRUE@ $(top_builddir)/embed/mozilla/libephymozillaembed.la + + @WITH_WEBKIT_ENGINE_TRUE@am__append_8 = \ +@@ -65,7 +66,7 @@ + + @WITH_XULRUNNER_ENGINE_TRUE@am__append_9 = -R$(LIBXUL_LIBDIR) + @WITH_XULRUNNER_ENGINE_TRUE@am__append_10 = $(LIBXUL_LIBS) -lxpcomglue +-@WITH_GECKO_ENGINE_TRUE@am__append_11 = -R$(GECKO_HOME) ++@HAVE_GECKO_XPCOM_GLUE_FALSE@@WITH_GECKO_ENGINE_TRUE@am__append_11 = -R$(GECKO_HOME) + @WITH_GECKO_ENGINE_TRUE@am__append_12 = \ + @WITH_GECKO_ENGINE_TRUE@ $(GECKO_LIBS) \ + @WITH_GECKO_ENGINE_TRUE@ $(GECKO_EXTRA_LIBS) \ +@@ -196,13 +197,15 @@ + PROGRAMS = $(bin_PROGRAMS) + am_epiphany_OBJECTS = epiphany-ephy-main.$(OBJEXT) + epiphany_OBJECTS = $(am_epiphany_OBJECTS) +-@WITH_XULRUNNER_ENGINE_TRUE@am__DEPENDENCIES_2 = \ ++@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \ ++@WITH_GECKO_ENGINE_TRUE@ $(top_builddir)/embed/mozilla/libephymozillaembed.la ++@WITH_XULRUNNER_ENGINE_TRUE@am__DEPENDENCIES_3 = \ + @WITH_XULRUNNER_ENGINE_TRUE@ $(am__DEPENDENCIES_1) +-@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \ ++@WITH_GECKO_ENGINE_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) \ + @WITH_GECKO_ENGINE_TRUE@ $(am__DEPENDENCIES_1) \ + @WITH_GECKO_ENGINE_TRUE@ $(am__DEPENDENCIES_1) +-@WITH_WEBKIT_ENGINE_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +-@ENABLE_PYTHON_TRUE@am__DEPENDENCIES_5 = libpyphany.la \ ++@WITH_WEBKIT_ENGINE_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) ++@ENABLE_PYTHON_TRUE@am__DEPENDENCIES_6 = libpyphany.la \ + @ENABLE_PYTHON_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_PYTHON_TRUE@ $(am__DEPENDENCIES_1) \ + @ENABLE_PYTHON_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -210,17 +213,18 @@ + epiphany_DEPENDENCIES = libephymain.la \ + $(top_builddir)/src/bookmarks/libephybookmarks.la \ + $(top_builddir)/embed/libephyembedfactory.la $(am__append_6) \ +- $(am__append_7) $(am__append_8) \ ++ $(am__DEPENDENCIES_2) $(am__append_8) \ + $(top_builddir)/embed/libephyembed.la \ + $(top_builddir)/lib/widgets/libephywidgets.la \ + $(top_builddir)/lib/libephymisc.la \ +- $(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_2) \ +- $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \ ++ $(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_3) \ ++ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1) +-epiphany_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(epiphany_CFLAGS) $(CFLAGS) \ +- $(epiphany_LDFLAGS) $(LDFLAGS) -o $@ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \ ++ $(am__DEPENDENCIES_1) ++epiphany_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ ++ $(CXXFLAGS) $(epiphany_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -233,9 +237,18 @@ + LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ ++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXLD = $(CXX) ++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = $(libephymain_la_SOURCES) $(nodist_libephymain_la_SOURCES) \ + $(libpyphany_la_SOURCES) $(nodist_libpyphany_la_SOURCES) \ +- $(epiphany_SOURCES) ++ $(epiphany_SOURCES) $(nodist_EXTRA_epiphany_SOURCES) + DIST_SOURCES = $(am__libephymain_la_SOURCES_DIST) \ + $(am__libpyphany_la_SOURCES_DIST) $(epiphany_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -618,6 +631,11 @@ + @ENABLE_PYTHON_TRUE@ $(PYTHON_EXTRA_LIBS) \ + @ENABLE_PYTHON_TRUE@ $(PYGTK_LIBS) + ++ ++# we do this to force c++ linkage if we are using the glue and ++# are running gecko 1.9 because standalone glue embedders that use ++# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp> ++@HAVE_GECKO_1_9_TRUE@@HAVE_GECKO_XPCOM_GLUE_TRUE@nodist_EXTRA_epiphany_SOURCES = dummy.cpp + epiphany_SOURCES = ephy-main.c + epiphany_CPPFLAGS = \ + -I$(top_builddir)/lib \ +@@ -631,6 +649,7 @@ + + epiphany_CFLAGS = \ + $(DEPENDENCIES_CFLAGS) \ ++ $(GECKO_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(AM_CFLAGS) + +@@ -643,8 +662,9 @@ + $(top_builddir)/lib/widgets/libephywidgets.la \ + $(top_builddir)/lib/libephymisc.la \ + $(top_builddir)/lib/egg/libegg.la $(am__append_10) \ +- $(am__append_12) $(am__append_13) $(DEPENDENCIES_LIBS) \ +- $(DBUS_LIBS) $(LIBINTL) $(am__append_14) $(am__append_15) ++ $(am__append_12) $(am__append_13) $(GECKO_LIBS) \ ++ $(DEPENDENCIES_LIBS) $(DBUS_LIBS) $(LIBINTL) $(am__append_14) \ ++ $(am__append_15) + @ENABLE_PYTHON_TRUE@pydefsdir = $(datadir)/pygtk/2.0/defs + @ENABLE_PYTHON_TRUE@pydefs_DATA = epiphany.defs + BUILT_SOURCES = $(TYPES_SOURCE) ephy-dbus-client-bindings.h \ +@@ -823,7 +843,7 @@ + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +-.SUFFIXES: .c .lo .o .obj ++.SUFFIXES: .c .cpp .lo .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +@@ -904,6 +924,7 @@ + distclean-compile: + -rm -f *.tab.c + ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epiphany-ephy-main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-action-helper.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephymain_la-ephy-activation.Plo@am__quote@ +@@ -1253,6 +1274,41 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(epiphany_CFLAGS) $(CFLAGS) -c -o epiphany-ephy-main.obj `if test -f 'ephy-main.c'; then $(CYGPATH_W) 'ephy-main.c'; else $(CYGPATH_W) '$(srcdir)/ephy-main.c'; fi` + ++.cpp.o: ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< ++ ++.cpp.obj: ++@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++.cpp.lo: ++@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< ++ ++epiphany-dummy.o: dummy.cpp ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT epiphany-dummy.o -MD -MP -MF $(DEPDIR)/epiphany-dummy.Tpo -c -o epiphany-dummy.o `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/epiphany-dummy.Tpo $(DEPDIR)/epiphany-dummy.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cpp' object='epiphany-dummy.o' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o epiphany-dummy.o `test -f 'dummy.cpp' || echo '$(srcdir)/'`dummy.cpp ++ ++epiphany-dummy.obj: dummy.cpp ++@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT epiphany-dummy.obj -MD -MP -MF $(DEPDIR)/epiphany-dummy.Tpo -c -o epiphany-dummy.obj `if test -f 'dummy.cpp'; then $(CYGPATH_W) 'dummy.cpp'; else $(CYGPATH_W) '$(srcdir)/dummy.cpp'; fi` ++@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/epiphany-dummy.Tpo $(DEPDIR)/epiphany-dummy.Po ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='dummy.cpp' object='epiphany-dummy.obj' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(epiphany_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o epiphany-dummy.obj `if test -f 'dummy.cpp'; then $(CYGPATH_W) 'dummy.cpp'; else $(CYGPATH_W) '$(srcdir)/dummy.cpp'; fi` ++ + mostlyclean-libtool: + -rm -f *.lo + --- epiphany-browser-2.21.4.orig/debian/patches/05_libexecdir.patch +++ epiphany-browser-2.21.4/debian/patches/05_libexecdir.patch @@ -0,0 +1,142 @@ +Index: epiphany-2.20.0/data/epiphany.pc.in +=================================================================== +--- epiphany-2.20.0.orig/data/epiphany.pc.in 2007-09-21 14:41:49.966965277 +0200 ++++ epiphany-2.20.0/data/epiphany.pc.in 2007-09-21 14:45:51.976756629 +0200 +@@ -2,8 +2,8 @@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@ +-extensionsdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/extensions +-loaderdir=@libdir@/epiphany/@EPIPHANY_MAJOR@/loaders ++extensionsdir=@libexecdir@/@EPIPHANY_MAJOR@/extensions ++loaderdir=@libexecdir@/@EPIPHANY_MAJOR@/loaders + datarootdir=@datarootdir@ + datadir=@datadir@ + icondir=@datadir@/@PACKAGE@/icons +Index: epiphany-2.20.0/embed/mozilla/Makefile.am +=================================================================== +--- epiphany-2.20.0.orig/embed/mozilla/Makefile.am 2007-09-21 14:41:35.286128664 +0200 ++++ epiphany-2.20.0/embed/mozilla/Makefile.am 2007-09-21 14:44:45.804985715 +0200 +@@ -141,7 +141,7 @@ + -I$(top_srcdir) \ + $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ ++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ +Index: epiphany-2.20.0/embed/mozilla/Makefile.in +=================================================================== +--- epiphany-2.20.0.orig/embed/mozilla/Makefile.in 2007-09-21 14:41:35.326130943 +0200 ++++ epiphany-2.20.0/embed/mozilla/Makefile.in 2007-09-21 14:44:45.816986398 +0200 +@@ -461,7 +461,7 @@ + -I$(top_srcdir) \ + $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \ ++ -DPLUGINDIR=\"$(libexecdir)/$(EPIPHANY_MAJOR)/plugins\" \ + -DMOZILLA_HOME=\"$(GECKO_HOME)\" \ + -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ +Index: epiphany-2.20.0/lib/Makefile.am +=================================================================== +--- epiphany-2.20.0.orig/lib/Makefile.am 2007-09-21 14:41:42.814557684 +0200 ++++ epiphany-2.20.0/lib/Makefile.am 2007-09-21 14:44:45.816986398 +0200 +@@ -76,7 +76,7 @@ + libephymisc_la_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ + $(AM_CPPFLAGS) + + libephymisc_la_CFLAGS = \ +Index: epiphany-2.20.0/lib/Makefile.in +=================================================================== +--- epiphany-2.20.0.orig/lib/Makefile.in 2007-09-21 14:41:42.854559964 +0200 ++++ epiphany-2.20.0/lib/Makefile.in 2007-09-21 14:44:45.828987082 +0200 +@@ -409,7 +409,7 @@ + libephymisc_la_CPPFLAGS = \ + -I$(top_builddir)/lib \ + -DSHARE_DIR=\"$(pkgdatadir)\" \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ + $(AM_CPPFLAGS) + + libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \ +Index: epiphany-2.20.0/plugins/desktop-file/Makefile.am +=================================================================== +--- epiphany-2.20.0.orig/plugins/desktop-file/Makefile.am 2007-09-21 14:41:24.741527761 +0200 ++++ epiphany-2.20.0/plugins/desktop-file/Makefile.am 2007-09-21 14:44:45.800985487 +0200 +@@ -1,4 +1,4 @@ +-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins ++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins + plugin_LTLIBRARIES = libdesktopfileplugin.la + + libdesktopfileplugin_la_SOURCES = \ +Index: epiphany-2.20.0/plugins/desktop-file/Makefile.in +=================================================================== +--- epiphany-2.20.0.orig/plugins/desktop-file/Makefile.in 2007-09-21 14:41:24.781530041 +0200 ++++ epiphany-2.20.0/plugins/desktop-file/Makefile.in 2007-09-21 14:44:45.804985715 +0200 +@@ -295,7 +295,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + with_engine = @with_engine@ +-plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins ++plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins + plugin_LTLIBRARIES = libdesktopfileplugin.la + libdesktopfileplugin_la_SOURCES = \ + plugin.cpp +Index: epiphany-2.20.0/src/Makefile.am +=================================================================== +--- epiphany-2.20.0.orig/src/Makefile.am 2007-09-21 14:41:15.096978150 +0200 ++++ epiphany-2.20.0/src/Makefile.am 2007-09-21 14:44:45.784984575 +0200 +@@ -112,8 +112,8 @@ + -I$(top_srcdir)/lib/egg \ + -I$(top_srcdir)/lib/widgets \ + -I$(top_srcdir)/src/bookmarks \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(pkgdatadir)"\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + $(AM_CPPFLAGS) +@@ -164,8 +164,8 @@ + -I$(top_builddir)/src \ + -I$(top_builddir)/src/bookmarks \ + $(PYTHON_INCLUDES) \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(datadir)"\" \ + $(AM_CPPFLAGS) + +Index: epiphany-2.20.0/src/Makefile.in +=================================================================== +--- epiphany-2.20.0.orig/src/Makefile.in 2007-09-21 14:41:15.132980201 +0200 ++++ epiphany-2.20.0/src/Makefile.in 2007-09-21 14:44:45.800985487 +0200 +@@ -521,8 +521,8 @@ + -I$(top_srcdir)/lib/egg \ + -I$(top_srcdir)/lib/widgets \ + -I$(top_srcdir)/src/bookmarks \ +- -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +- -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + -DDATADIR=\""$(pkgdatadir)"\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + $(AM_CPPFLAGS) +@@ -560,8 +560,8 @@ + @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \ + @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \ + @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \ +-@ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/extensions"\" \ +-@ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/loaders"\" \ ++@ENABLE_PYTHON_TRUE@ -DEXTENSIONS_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/extensions"\" \ ++@ENABLE_PYTHON_TRUE@ -DLOADER_DIR=\""$(libexecdir)/$(EPIPHANY_MAJOR)/loaders"\" \ + @ENABLE_PYTHON_TRUE@ -DDATADIR=\""$(datadir)"\" \ + @ENABLE_PYTHON_TRUE@ $(AM_CPPFLAGS) + --- epiphany-browser-2.21.4.orig/debian/patches/12_gxx43.patch +++ epiphany-browser-2.21.4/debian/patches/12_gxx43.patch @@ -0,0 +1,26 @@ +only in patch2: +unchanged: +--- epiphany-browser-2.21.4.orig/embed/mozilla/EphyBrowser.h ++++ epiphany-browser-2.21.4/embed/mozilla/EphyBrowser.h +@@ -187,7 +187,7 @@ + + nsresult LoadURI(const char *aURI, + PRUint32 aLoadFlags = nsIWebNavigation::LOAD_FLAGS_NONE, +- nsIURI *aURI = nsnull); ++ nsIURI *aReferrer = nsnull); + + EphyEmbedDocumentType GetDocumentType (); + +only in patch2: +unchanged: +--- epiphany-browser-2.21.4.orig/embed/mozilla/mozilla-x509-cert.h ++++ epiphany-browser-2.21.4/embed/mozilla/mozilla-x509-cert.h +@@ -56,7 +56,7 @@ + + MozillaX509Cert *mozilla_x509_cert_new (nsIX509Cert *aMozCert); + +-nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, nsIX509Cert **cert); ++nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, nsIX509Cert **aCert); + + G_END_DECLS + --- epiphany-browser-2.21.4.orig/debian/patches/06_lpi.patch +++ epiphany-browser-2.21.4/debian/patches/06_lpi.patch @@ -0,0 +1,45 @@ +diff -Nur epiphany-browser-2.15.4/configure.ac epiphany-browser-2.15.4.new/configure.ac +--- epiphany-browser-2.15.4/configure.ac 2006-07-11 10:32:09.000000000 +0200 ++++ epiphany-browser-2.15.4.new/configure.ac 2006-07-11 10:32:36.000000000 +0200 +@@ -95,6 +95,7 @@ + libxslt >= $LIBXSLT_REQUIRED + libgnome-2.0 >= $LIBGNOME_REQUIRED + libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED ++ launchpad-integration + libglade-2.0 >= $LIBGLADE_REQUIRED \ + gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED + gnome-vfs-module-2.0 +diff -Nur epiphany-browser-2.15.4/data/ui/epiphany-ui.xml epiphany-browser-2.15.4.new/data/ui/epiphany-ui.xml +--- epiphany-browser-2.15.4/data/ui/epiphany-ui.xml 2006-05-05 19:27:30.000000000 +0200 ++++ epiphany-browser-2.15.4.new/data/ui/epiphany-ui.xml 2006-07-11 10:32:17.000000000 +0200 +@@ -101,6 +101,9 @@ + + <menu name="HelpMenu" action="Help"> + <menuitem name="HelpContentsMenu" action="HelpContents"/> ++ <separator/> ++ <placeholder name="LaunchpadItems"/> ++ <separator/> + <menuitem name="HelpAboutMenu" action="HelpAbout"/> + </menu> + </menubar> +diff -Nur epiphany-browser-2.15.4/src/ephy-window.c epiphany-browser-2.15.4.new/src/ephy-window.c +--- epiphany-browser-2.15.4/src/ephy-window.c 2006-07-10 21:28:01.000000000 +0200 ++++ epiphany-browser-2.15.4.new/src/ephy-window.c 2006-07-11 10:32:17.000000000 +0200 +@@ -66,6 +66,7 @@ + #include <gtk/gtktoggleaction.h> + #include <gtk/gtkdialog.h> + #include <gtk/gtkmessagedialog.h> ++#include <launchpad-integration.h> + + #ifdef HAVE_X11_XF86KEYSYM_H + #include <X11/XF86keysym.h> +@@ -3125,6 +3126,9 @@ + } + #endif + ++ launchpad_integration_add_ui (window->priv->manager, ++ "ui/menubar/HelpMenu/LaunchpadItems"); ++ + /* Initialize the menus */ + priv->tabs_menu = ephy_tabs_menu_new (window); + priv->enc_menu = ephy_encoding_menu_new (window); --- epiphany-browser-2.21.4.orig/debian/patches/10_url_double-click.patch +++ epiphany-browser-2.21.4/debian/patches/10_url_double-click.patch @@ -0,0 +1,32 @@ +Index: epiphany-2.20.0/lib/widgets/ephy-location-entry.c +=================================================================== +--- epiphany-2.20.0.orig/lib/widgets/ephy-location-entry.c 2007-08-27 22:19:00.000000000 +0200 ++++ epiphany-2.20.0/lib/widgets/ephy-location-entry.c 2007-09-21 14:30:14.987360646 +0200 +@@ -353,18 +353,6 @@ + } + + static gboolean +-entry_button_press_cb (GtkWidget *entry, GdkEventButton *event, EphyLocationEntry *le) +-{ +- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) +- { +- ephy_location_entry_activate (le); +- return TRUE; +- } +- +- return FALSE; +-} +- +-static gboolean + entry_key_press_cb (GtkEntry *entry, + GdkEventKey *event, + EphyLocationEntry *lentry) +@@ -923,8 +911,6 @@ + G_CALLBACK (entry_key_press_after_cb), entry); + g_signal_connect_after (priv->icon_entry->entry, "activate", + G_CALLBACK (entry_activate_after_cb), entry); +- g_signal_connect (priv->icon_entry->entry, "button-press-event", +- G_CALLBACK (entry_button_press_cb), entry); + g_signal_connect (priv->icon_entry->entry, "changed", + G_CALLBACK (editable_changed_cb), entry); + g_signal_connect (priv->icon_entry->entry, "drag-motion", --- epiphany-browser-2.21.4.orig/debian/patches/98_xulrunner1.9_build_changes.patch +++ epiphany-browser-2.21.4/debian/patches/98_xulrunner1.9_build_changes.patch @@ -0,0 +1,1171 @@ +Index: epiphany-browser-2.21.4/m4/gecko.m4 +=================================================================== +--- epiphany-browser-2.21.4/m4/gecko.m4 (revision 7753) ++++ epiphany-browser-2.21.4/m4/gecko.m4 (working copy) +@@ -32,6 +32,7 @@ + # VARIABLE: Which gecko was found (e.g. "xulrunnner", "seamonkey", ...) + # VARIABLE_FLAVOUR: The flavour of the gecko that was found + # VARIABLE_HOME: ++# VARIABLE_NSPR: set if nspr is provided by gecko flags + # VARIABLE_PREFIX: + # VARIABLE_INCLUDE_ROOT: + # VARIABLE_VERSION: The version of the gecko that was found +@@ -51,7 +52,7 @@ + AC_MSG_CHECKING([which gecko to use]) + + AC_ARG_WITH([gecko], +- AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@], ++ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-embedding|libxul@:>@], + [Which gecko engine to use (autodetected by default)])) + + # Backward compat +@@ -60,12 +61,15 @@ + gecko_cv_gecko=$with_gecko + + # Autodetect gecko +-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" ++_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul-embedding libxul" + if test -z "$gecko_cv_gecko"; then + for lizard in $_geckos; do + if $PKG_CONFIG --exists $lizard-xpcom; then + gecko_cv_gecko=$lizard + break; ++ elif $PKG_CONFIG --exist $lizard; then ++ gecko_cv_gecko=$lizard ++ break; + fi + done + fi +@@ -82,6 +86,14 @@ + gecko_cv_have_gecko=yes + fi + ++AC_MSG_CHECKING([manual gecko home set]) ++ ++AC_ARG_WITH([gecko-home], ++ AS_HELP_STRING([--with-gecko-home@<:@=[path]@:>@], ++ [Manually set MOZILLA_FIVE_HOME])) ++ ++gecko_cv_gecko_home=$with_gecko_home ++ + # **************** + # Define variables + # **************** +@@ -93,13 +105,24 @@ + seamonkey) gecko_cv_gecko_flavour=mozilla ;; + *firefox) gecko_cv_gecko_flavour=toolkit ;; + xulrunner) gecko_cv_gecko_flavour=toolkit ;; ++libxul*) gecko_cv_gecko_flavour=toolkit ;; + esac + +-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" +-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" +- ++if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`" ++ _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test ++else ++ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable" ++ _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin" ++ _GECKO_HOME=$with_gecko_home ++ _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`" ++ _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test ++fi + fi # if gecko_cv_have_gecko + + if test "$gecko_cv_gecko_flavour" = "toolkit"; then +@@ -109,9 +132,11 @@ + $1[]=$gecko_cv_gecko + $1[]_FLAVOUR=$gecko_cv_gecko_flavour + $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT ++$1[]_CFLAGS=$_GECKO_CFLAGS + $1[]_LIBDIR=$_GECKO_LIBDIR + $1[]_HOME=$_GECKO_HOME + $1[]_PREFIX=$_GECKO_PREFIX ++$1[]_NSPR=$_GECKO_NSPR + + # ************************************************************** + # This is really gcc-only +@@ -182,7 +207,7 @@ + AC_LANG_PUSH([C++]) + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS" + + AC_MSG_CHECKING([[whether we have a gtk 2 gecko build]]) + AC_RUN_IFELSE( +@@ -215,6 +240,18 @@ + [gecko_cv_have_debug=no]) + AC_MSG_RESULT([$gecko_cv_have_debug]) + ++AC_MSG_CHECKING([[whether we have a xpcom glue]]) ++AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE( ++ [[ ++ #ifndef XPCOM_GLUE ++ #error "no xpcom glue found" ++ #endif]] ++ )], ++ [gecko_cv_have_xpcom_glue=yes], ++ [gecko_cv_have_xpcom_glue=no]) ++AC_MSG_RESULT([$gecko_cv_have_xpcom_glue]) ++ + CPPFLAGS="$_SAVE_CPPFLAGS" + + AC_LANG_POP([C++]) +@@ -226,8 +263,14 @@ + AC_DEFINE([HAVE_GECKO_DEBUG],[1],[Define if gecko is a debug build]) + fi + ++if test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ AC_DEFINE([HAVE_GECKO_XPCOM_GLUE],[1],[Define if xpcom glue is used]) ++fi ++ + fi # if gecko_cv_have_gecko + ++AM_CONDITIONAL([HAVE_GECKO_DEBUG],[test "$gecko_cv_have_debug" = "yes"]) ++AM_CONDITIONAL([HAVE_GECKO_XPCOM_GLUE],[test "$gecko_cv_have_xpcom_glue" = "yes"]) + + # *********************** + # Check for gecko version +@@ -238,7 +281,7 @@ + AC_LANG_PUSH([C++]) + + _SAVE_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT" ++CPPFLAGS="$CPPFLAGS $_GECKO_CFLAGS" + + AC_CACHE_CHECK([for gecko version], + [gecko_cv_gecko_version], +@@ -320,8 +363,11 @@ + gecko_cv_extra_pkg_dependencies= + + if test "$gecko_cv_gecko_version_int" -ge "1009000"; then +- gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" +- gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue_s" ++ if ! test "$gecko_cv_have_xpcom_glue" = "yes"; then ++ gecko_cv_extra_libs="-L$_GECKO_LIBDIR -lxul" ++ else ++ gecko_cv_glue_libs="-L$_GECKO_LIBDIR -lxpcomglue" ++ fi + else + gecko_cv_extra_pkg_dependencies="${gecko_cv_gecko}-gtkmozembed" + fi +@@ -350,6 +396,7 @@ + AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008000"]) + AM_CONDITIONAL([HAVE_GECKO_1_8_1],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1008001"]) + AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_cv_have_gecko" = "yes" -a "$gecko_cv_gecko_version_int" -ge "1009000"]) ++AM_CONDITIONAL([HAVE_GECKO_HOME],[test "x$_GECKO_HOME" != "x"]) + ]) + + # *************************************************************************** +@@ -371,10 +418,20 @@ + _SAVE_CXXFLAGS="$CXXFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + _SAVE_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" +-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" +-LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" +-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-I ${gecko_cv_gecko})" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --define-variable=includetype=unstable --cflags-only-other ${gecko_cv_gecko})" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl" ++else ++ CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" ++ CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" ++ LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" ++fi ++if test -n "$_GECKO_HOME"; then ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" ++else ++ LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS" ++fi + + _GECKO_DISPATCH_INCLUDEDIRS="$2" + +@@ -383,9 +440,11 @@ + # Mind you, it's useful to be able to test against uninstalled mozilla builds... + _GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref" + +-# Now add them to CPPFLAGS ++# Now add them to CPPFLAGS - asac: well ... not anymore since 1.9 -> test whether they exist before adding. + for i in $_GECKO_DISPATCH_INCLUDEDIRS; do +- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ if test -d "$_GECKO_INCLUDE_ROOT/$i"; then ++ CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i" ++ fi + done + + m4_indir([$1],m4_shiftn(2,$@)) +@@ -438,11 +497,17 @@ + #include <mozilla-config.h> + #include <stdlib.h> + #include <stdio.h> ++ ++#ifdef XPCOM_GLUE ++#include <nsXPCOMGlue.h> ++#else + #include <nsXPCOM.h> ++#endif // XPCOM_GLUE ++ + #include <nsCOMPtr.h> + #include <nsILocalFile.h> + #include <nsIServiceManager.h> +-#ifdef HAVE_GECKO_1_8 ++#if defined(HAVE_GECKO_1_8) || defined(HAVE_GECKO_1_9) + #include <nsStringAPI.h> + #else + #include <nsString.h> +@@ -450,16 +515,37 @@ + ]] + [$1], + [[ ++ ++nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.8", PR_TRUE, ++ "1.9.*", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED(rv)) { ++ exit(123); ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED(rv)) { ++ exit(124); ++ } ++#endif // XPCOM_GLUE ++ + // redirect unwanted mozilla debug output to the bit bucket + freopen ("/dev/null", "w", stdout); + +-nsresult rv; +-nsCOMPtr<nsILocalFile> directory; ++nsCOMPtr<nsILocalFile> directory = nsnull; ++#ifndef XPCOM_GLUE + rv = NS_NewNativeLocalFile (NS_LITERAL_CSTRING("$_GECKO_HOME"), PR_FALSE, + getter_AddRefs (directory)); + if (NS_FAILED (rv) || !directory) { + exit (126); + } ++#endif + + rv = NS_InitXPCOM2 (nsnull, directory, nsnull); + if (NS_FAILED (rv)) { +@@ -607,21 +693,22 @@ + AC_DEFUN([GECKO_XPIDL], + [AC_REQUIRE([GECKO_INIT])dnl + +-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then ++ _GECKO_LIBDIR="`$PKG_CONFIG pkg-config --variable=sdkdir ${gecko_cv_gecko}`/bin" ++else ++ _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" ++fi + + AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH]) + ++if test ${gecko_cv_gecko} = "libxul-embedding" -o ${gecko_cv_gecko} = "libxul"; then ++XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`" ++else + XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`" +- +-# Older geckos don't have this variable, see +-# https://bugzilla.mozilla.org/show_bug.cgi?id=240473 +- + if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then + XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`" + fi +- + # Some distributions (Gentoo) have it in unusual places +- + if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then + XPIDL_IDLDIR="$_GECKO_INCLUDE_ROOT/idl" + fi +Index: epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am +=================================================================== +--- epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am (revision 7753) ++++ epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am (working copy) +@@ -25,8 +25,16 @@ + libdesktopfileplugin_la_LDFLAGS = \ + -module -avoid-version \ + -export-symbols $(srcdir)/plugin.symbols \ +- -R$(GECKO_HOME) \ + $(AM_LDFLAGS) + ++if HAVE_GECKO_XPCOM_GLUE ++ libdesktopfileplugin_la_LDFLAGS += \ ++ $(NULL) ++else ++ libdesktopfileplugin_la_LDFLAGS += \ ++ -R$(GECKO_HOME) \ ++ $(NULL) ++endif ++ + EXTRA_DIST = \ + plugin.symbols +Index: epiphany-browser-2.21.4/src/Makefile.am +=================================================================== +--- epiphany-browser-2.21.4/src/Makefile.am (revision 7753) ++++ epiphany-browser-2.21.4/src/Makefile.am (working copy) +@@ -187,6 +187,16 @@ + $(PYGTK_LIBS) + endif + ++ ++# we do this to force c++ linkage if we are using the glue and ++# are running gecko 1.9 because standalone glue embedders that use ++# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp> ++if HAVE_GECKO_1_9 ++if HAVE_GECKO_XPCOM_GLUE ++nodist_EXTRA_epiphany_SOURCES = dummy.cpp ++endif ++endif ++ + epiphany_SOURCES = ephy-main.c + + epiphany_CPPFLAGS = \ +@@ -201,6 +211,7 @@ + + epiphany_CFLAGS = \ + $(DEPENDENCIES_CFLAGS) \ ++ $(GECKO_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(AM_CFLAGS) + +@@ -221,6 +232,7 @@ + + if WITH_GECKO_ENGINE + epiphany_LDADD += \ ++ $(GECKO_LIBS) \ + $(top_builddir)/embed/mozilla/libephymozillaembed.la + endif + +@@ -241,7 +253,9 @@ + endif + + if WITH_GECKO_ENGINE ++if !HAVE_GECKO_XPCOM_GLUE + epiphany_LDFLAGS += -R$(GECKO_HOME) ++endif + + epiphany_LDADD += \ + $(GECKO_LIBS) \ +@@ -255,6 +269,7 @@ + endif + + epiphany_LDADD += \ ++ $(GECKO_LIBS) \ + $(DEPENDENCIES_LIBS) \ + $(DBUS_LIBS) \ + $(LIBINTL) +Index: epiphany-browser-2.21.4/configure.ac +=================================================================== +--- epiphany-browser-2.21.4/configure.ac (revision 7753) ++++ epiphany-browser-2.21.4/configure.ac (working copy) +@@ -1,4 +1,3 @@ +- + # Copyright © 2000-2004 Marco Pesenti Gritti + # Copyright © 2003, 2004, 2005, 2006, 2007 Christian Persch + # +@@ -226,12 +225,41 @@ + + case "$gecko_cv_gecko" in + xulrunner) min_version=1.8 ;; ++libxul*) min_version=1.9 ;; + *firefox) min_version=1.5 ;; + *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;; + esac + + # Added $gecko_cv_gecko-js for debian xulrunner brokenness +-PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies]) ++if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then ++ PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies]) ++else ++ GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG" ++ GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`" ++fi ++ ++AC_MSG_CHECKING(nspr in gecko) ++if ! test "$GECKO_NSPR" = yes; then ++ AC_MSG_RESULT(no) ++ AC_MSG_CHECKING(nspr in system) ++ gecko_nspr= ++ if $PKG_CONFIG --exists mozilla-nspr; then ++ gecko_nspr=mozilla-nspr ++ elif $PKG_CONFIG --exists ${gecko_cv_gecko}-nspr; then ++ gecko_nspr=${gecko_cv_gecko}-nspr ++ elif $PKG_CONFIG --exists nspr; then ++ gecko_nspr=nspr ++ else ++ AC_MSG_ERROR([no nspr available]) ++ fi ++ ++ GECKO_CFLAGS="$GECKO_CFLAGS `$PKG_CONFIG --cflags ${gecko_nspr}`" ++ GECKO_LIBS="$GECKO_LIBS `$PKG_CONFIG --libs ${gecko_nspr}`" ++ AC_MSG_RESULT(yes) ++else ++ AC_MSG_RESULT(yes) ++fi ++ + AC_SUBST([GECKO_CFLAGS]) + AC_SUBST([GECKO_LIBS]) + +@@ -555,7 +583,11 @@ + AC_MSG_RESULT([$enable_desktop_file_plugin]) + + if test "$enable_desktop_file_plugin" = "yes"; then +- PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) ++ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then ++ PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko} mozilla-plugin gtk+-2.0 >= 2.6.0]) ++ else ++ PKG_CHECK_MODULES([DESKTOP_FILE_PLUGIN_DEP],[${gecko_cv_gecko}-xpcom ${gecko_cv_gecko}-plugin gtk+-2.0 >= 2.6.0]) ++ fi + AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_CFLAGS]) + AC_SUBST([DESKTOP_FILE_PLUGIN_DEP_LIBS]) + fi +Index: epiphany-browser-2.21.4/embed/mozilla/EphyDirectoryProvider.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/EphyDirectoryProvider.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/EphyDirectoryProvider.cpp (working copy) +@@ -40,6 +40,11 @@ + #include <nsIToolkitChromeRegistry.h> + #include <nsNetUtil.h> + ++#ifdef HAVE_GECKO_1_9 ++#include <nsIArray.h> ++#include <nsIMutableArray.h> ++#endif ++ + #include "EphyDirectoryProvider.h" + + NS_IMPL_ISUPPORTS2 (EphyDirectoryProvider, +@@ -88,15 +93,25 @@ + getter_AddRefs (chromeDir)); + NS_ENSURE_SUCCESS (rv, rv); + ++#ifndef HAVE_GECKO_1_9 + nsCOMPtr<nsISupportsArray> array; + rv = NS_NewISupportsArray (getter_AddRefs (array)); + NS_ENSURE_SUCCESS (rv, rv); +- + rv = array->AppendElement (manifestDir); + rv |= array->AppendElement (chromeDir); +- NS_ENSURE_SUCCESS (rv, rv); ++ rv = NS_NewArrayEnumerator (_retval, array); ++#else // !HAVE_GECKO_1_9 ++ nsCOMPtr<nsIMutableArray> array; ++ array = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID); ++ if(!array) ++ return NS_ERROR_OUT_OF_MEMORY; ++ rv = array->AppendElement (manifestDir, PR_FALSE); ++ rv |= array->AppendElement (chromeDir, PR_FALSE); ++ NS_ENSURE_SUCCESS (rv, rv); + +- rv = NS_NewArrayEnumerator (_retval, array); ++ rv = array->Enumerate(_retval); ++#endif // HAVE_GECKO_1_9 ++ + NS_ENSURE_SUCCESS (rv, rv); + + rv = NS_SUCCESS_AGGREGATE_RESULT; +Index: epiphany-browser-2.21.4/embed/mozilla/MozRegisterComponents.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/MozRegisterComponents.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/MozRegisterComponents.cpp (working copy) +@@ -137,12 +137,14 @@ + NS_CLIENTAUTHDIALOGS_CONTRACTID, + GtkNSSClientAuthDialogsConstructor + }, ++#ifndef HAVE_GECKO_1_9 + { + GTK_NSSDIALOGS_CLASSNAME, + GTK_NSSDIALOGS_CID, + NS_BADCERTLISTENER_CONTRACTID, + GtkNSSDialogsConstructor + }, ++#endif + { + GTK_NSSDIALOGS_CLASSNAME, + GTK_NSSDIALOGS_CID, +@@ -296,10 +298,16 @@ + for (guint i = 0; i < G_N_ELEMENTS (sAppComps); i++) + { + nsCOMPtr<nsIGenericFactory> componentFactory; +- rv = NS_NewGenericFactory(getter_AddRefs(componentFactory), +- &(sAppComps[i])); +- if (NS_FAILED(rv) || !componentFactory) ++ componentFactory = do_CreateInstance(NS_GENERICFACTORY_CONTRACTID); ++ if(!componentFactory) + { ++ g_warning ("Failed to create a generic factory for %s\n", sAppComps[i].mDescription); ++ ret = FALSE; ++ continue; ++ } ++ rv = componentFactory->SetComponentInfo(&(sAppComps[i])); ++ if (NS_FAILED(rv)) ++ { + g_warning ("Failed to make a factory for %s\n", sAppComps[i].mDescription); + + ret = FALSE; +Index: epiphany-browser-2.21.4/embed/mozilla/GeckoPrintService.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/GeckoPrintService.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/GeckoPrintService.cpp (working copy) +@@ -416,7 +416,7 @@ + + return FALSE; + } +-#endif ++#endif // 0 + + nsresult + GeckoPrintService::PrintUnattended (nsIDOMWindow *aParent, +@@ -665,7 +665,10 @@ + aSettings->SetPrintInColor (gtk_print_settings_get_use_color (aGtkSettings)); + + aSettings->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters); ++ ++#ifndef HAVE_GECKO_1_9 + aSettings->SetPaperSize (nsIPrintSettings::kPaperSizeDefined); ++#endif + + GtkPaperSize *paperSize = gtk_page_setup_get_paper_size (aPageSetup); + if (!paperSize) { +Index: epiphany-browser-2.21.4/embed/mozilla/EphyFind.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/EphyFind.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/EphyFind.cpp (working copy) +@@ -48,6 +48,7 @@ + #include <nsIWebBrowserFocus.h> + #include <nsIWebBrowser.h> + #include <nsServiceManagerUtils.h> ++#include <nsPIDOMWindow.h> + + #ifndef HAVE_GECKO_1_9 + #include <nsIDocShellTreeItem.h> +@@ -91,16 +92,26 @@ + getter_AddRefs (mWebBrowser)); + NS_ENSURE_TRUE (mWebBrowser, rv); + +- nsCOMPtr<nsIDocShell> docShell (do_GetInterface (mWebBrowser, &rv)); ++#ifndef HAVE_GECKO_1_9 ++ nsCOMPtr<nsIDOMWindow> domWindow; ++ rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow)); + NS_ENSURE_SUCCESS (rv, rv); + ++ nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv)); ++ NS_ENSURE_SUCCESS (rv, rv); ++ ++ nsCOMPtr<nsIDocShell> docShell (window->GetDocShell()); ++#else ++ nsCOMPtr<nsIDocShell> docShell = do_GetInterface (mWebBrowser); ++#endif ++ + if (!mFinder) { + mFinder = do_CreateInstance (NS_TYPEAHEADFIND_CONTRACTID, &rv); + NS_ENSURE_SUCCESS (rv, rv); + + rv = mFinder->Init (docShell); + #ifdef HAVE_GECKO_1_9 +-// mFinder->SetSelectionModeAndRepaint (nsISelectionController::SELECTION_ON); ++ mFinder->SetSelectionModeAndRepaint (nsISelectionController::SELECTION_ON); + #else + mFinder->SetFocusLinks (PR_TRUE); + #endif +Index: epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp (working copy) +@@ -110,12 +110,20 @@ + { + } + ++#ifdef HAVE_GECKO_1_9 ++NS_IMPL_THREADSAFE_ISUPPORTS4 (GtkNSSDialogs, ++ nsICertificateDialogs, ++ nsITokenPasswordDialogs, ++ nsITokenDialogs, ++ nsIDOMCryptoDialogs) ++#else + NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs, + nsICertificateDialogs, + nsIBadCertListener, + nsITokenPasswordDialogs, + nsITokenDialogs, + nsIDOMCryptoDialogs) ++#endif + + /* There's also nsICertPickDialogs which is implemented in mozilla + * but has no callers. So we don't implement it. +@@ -383,7 +391,7 @@ + return NS_OK; + } + +-/* nsICertificateDialogs */ ++#ifndef HAVE_GECKO_1_9 + + NS_IMETHODIMP + GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx, +@@ -600,6 +608,8 @@ + return NS_OK; + } + ++#endif // HAVE_GECKO_1_9 ++ + NS_IMETHODIMP + GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, + nsIX509Cert *cert, +@@ -692,7 +702,6 @@ + return NS_OK; + } + +- + NS_IMETHODIMP + GtkNSSDialogs::NotifyCACertExists (nsIInterfaceRequestor *ctx) + { +Index: epiphany-browser-2.21.4/embed/mozilla/mozilla-embed-single.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/mozilla-embed-single.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/mozilla-embed-single.cpp (working copy) +@@ -33,6 +33,11 @@ + + #include <nsStringAPI.h> + ++#ifdef XPCOM_GLUE ++#include <nsXPCOMGlue.h> ++#include <gtkmozembed_glue.cpp> ++#endif ++ + #include <gtkmozembed.h> + #include <gtkmozembed_internal.h> + #include <nsComponentManagerUtils.h> +@@ -577,6 +582,7 @@ + static gboolean + impl_init (EphyEmbedSingle *esingle) + { ++ g_warning ("Could not determine locale 111!\n"); + MozillaEmbedSingle *single = MOZILLA_EMBED_SINGLE (esingle); + + g_setenv ("MOZILLA_POSTSCRIPT_ENABLED", "1", TRUE); +@@ -591,6 +597,50 @@ + NS_LogInit (); + #endif + ++ nsresult rv; ++#ifdef XPCOM_GLUE ++ static const GREVersionRange greVersion = { ++ "1.9a", PR_TRUE, ++ "2", PR_TRUE ++ }; ++ char xpcomLocation[4096]; ++ rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0, xpcomLocation, 4096); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not determine locale!\n"); ++ return FALSE; ++ } ++ ++ // Startup the XPCOM Glue that links us up with XPCOM. ++ rv = XPCOMGlueStartup(xpcomLocation); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not determine locale!\n"); ++ return FALSE; ++ } ++ ++ rv = GTKEmbedGlueStartup(); ++ if (NS_FAILED (rv)) ++ { ++ g_warning ("Could not determine locale!\n"); ++ return FALSE; ++ } ++ ++ char *lastSlash = strrchr(xpcomLocation, '/'); ++ if (lastSlash) ++ *lastSlash = '\0'; ++ ++ gtk_moz_embed_set_path(xpcomLocation); ++#else ++#ifdef HAVE_GECKO_1_9 ++ gtk_moz_embed_set_path (MOZILLA_HOME); ++#else ++ gtk_moz_embed_set_comp_path (MOZILLA_HOME); ++#endif ++#endif // XPCOM_GLUE ++ /* Fire up the beast */ ++ gtk_moz_embed_push_startup (); ++ + /* Pre initialization */ + mozilla_init_plugin_path (); + +@@ -607,8 +657,6 @@ + + gtk_moz_embed_set_directory_service_provider (dp); + +- /* Fire up the beast */ +- gtk_moz_embed_push_startup (); + /* FIXME check that it succeeded! */ + + mozilla_register_components (); +Index: epiphany-browser-2.21.4/embed/mozilla/EphyAboutModule.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/EphyAboutModule.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/EphyAboutModule.cpp (working copy) +@@ -30,19 +30,23 @@ + #include <gtk/gtk.h> + + // we need nsEscape which depends on internal strings :((( ++#ifndef HAVE_GECKO_1_9 + #define MOZILLA_INTERNAL_API 1 + #include <nsString.h> ++#endif + + #include <nsAutoPtr.h> + #include <nsCOMPtr.h> ++#ifdef MOZILLA_INTERNAL_API + #include <nsEscape.h> ++#endif + #include <nsIChannel.h> + #include <nsIInputStreamChannel.h> + #include <nsIInputStream.h> + #include <nsIIOService.h> + #include <nsIOutputStream.h> + #include <nsIScriptSecurityManager.h> +-#include <nsIStorageStream.h> ++#include <nsStorageStream.h> + #include <nsIURI.h> + #include <nsNetCID.h> + #include <nsNetUtil.h> +@@ -149,6 +153,8 @@ + nsACString &aTitle) + { + /* The page URL is of the form "about:neterror?e=<errorcode>&u=<URL>&c=<charset>&d=<description>" */ ++ ++ printf (" ===> about module::parse url - %s \n", aURL); + const char *query = strstr (aURL, "?"); + if (!query) return NS_ERROR_FAILURE; + +@@ -167,18 +173,18 @@ + switch (param[0]) + { + case 'e': +- aCode.Assign (nsUnescape (param + 2)); ++ aCode.Assign (param + 2); + break; + case 'u': + aRawOriginURL.Assign (param + 2); +- aOriginURL.Assign (nsUnescape (param + 2)); ++ aOriginURL.Assign (param + 2); + break; + case 'c': +- aOriginCharset.Assign (nsUnescape (param + 2)); ++ aOriginCharset.Assign (param + 2); + break; + /* The next one is not used in neterror but recover: */ + case 't': +- aTitle.Assign (nsUnescape (param + 2)); ++ aTitle.Assign (param + 2); + break; + case 'd': + /* we don't need mozilla's description parameter */ +@@ -187,6 +193,8 @@ + } + } + ++ printf(" ===> parsed: %s || %s || %s || %s\n", ((nsCString&) aCode).get(), ((nsCString&) aRawOriginURL).get(), ((nsCString&) aOriginURL).get(), ((nsCString&)aOriginCharset).get()); ++ + g_strfreev (params); + + return NS_OK; +@@ -451,7 +459,7 @@ + return NS_ERROR_ILLEGAL_VALUE; + } + +- return NS_OK; ++ return NS_ERROR_ILLEGAL_VALUE; + } + + nsresult +@@ -472,7 +480,7 @@ + if (error.IsEmpty () || rawurl.IsEmpty () || url.IsEmpty()) return NS_ERROR_FAILURE; + + nsCOMPtr<nsIURI> uri; +- rv = NS_NewURI (getter_AddRefs (uri), url, charset.get()); ++ rv = NS_NewURI (getter_AddRefs (uri), nsCString(spec), charset.get()); + /* FIXME can uri be NULL if the original url was invalid? */ + NS_ENSURE_SUCCESS (rv, rv); + +@@ -493,6 +501,7 @@ + /* remove "about:neterror" part and insert mozilla's error page url */ + newurl.Cut(0, strlen ("about:neterror")); + newurl.Insert("chrome://global/content/netError.xhtml", 0); ++ printf(" ===> going for netError.xhtml\n"); + + return Redirect (newurl, _retval); + } +@@ -573,7 +582,8 @@ + + nsresult rv; + nsCOMPtr<nsIStorageStream> storageStream; +- rv = NS_NewStorageStream (16384, (PRUint32) -1, getter_AddRefs (storageStream)); ++ storageStream = do_CreateInstance(NS_STORAGESTREAM_CONTRACTID); ++ rv = storageStream->Init(16384, (PRUint32) -1, nsnull); + NS_ENSURE_SUCCESS (rv, rv); + + nsCOMPtr<nsIOutputStream> stream; +Index: epiphany-browser-2.21.4/embed/mozilla/EphyBrowser.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/EphyBrowser.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/EphyBrowser.cpp (working copy) +@@ -1,3 +1,4 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + /* + * Copyright © 2000-2004 Marco Pesenti Gritti + * Copyright © 2003, 2004, 2005 Christian Persch +@@ -484,7 +485,6 @@ + + MozillaEmbedEvent *info; + info = mozilla_embed_event_new (static_cast<gpointer>(aDOMEvent)); +- + nsresult rv; + EventContext context; + context.Init (mOwner); +@@ -574,6 +574,7 @@ + + gtk_moz_embed_get_nsIWebBrowser (GTK_MOZ_EMBED (gtk_bin_get_child (GTK_BIN (embed))), + getter_AddRefs(mWebBrowser)); ++ + NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE); + + mWebBrowserFocus = do_QueryInterface (mWebBrowser); +@@ -613,9 +614,21 @@ + NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE); + + #ifdef HAVE_MOZILLA_PSM +- nsCOMPtr<nsIDocShell> docShell (do_GetInterface (mWebBrowser, &rv)); ++ ++#ifdef HAVE_GECKO_1_9 ++ nsCOMPtr<nsIDocShell> docShell = do_GetInterface (mWebBrowser); ++#else ++ nsCOMPtr<nsIDOMWindow> domWindow; ++ rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow)); + NS_ENSURE_SUCCESS (rv, rv); + ++ nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv)); ++ NS_ENSURE_SUCCESS (rv, rv); ++ ++ nsCOMPtr<nsIDocShell> docShell (window->GetDocShell()); ++#endif ++ NS_ENSURE_TRUE (docShell, NS_ERROR_FAILURE); ++ + rv = docShell->GetSecurityUI (getter_AddRefs (mSecurityInfo)); + if (!mSecurityInfo) + { +@@ -894,23 +907,37 @@ + + nsresult EphyBrowser::SetZoom (float aZoom) + { +- NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE); +- +- nsCOMPtr<nsIContentViewer> contentViewer; ++ nsCOMPtr<nsIContentViewer> contentViewer; + GetContentViewer (getter_AddRefs(contentViewer)); + NS_ENSURE_TRUE (contentViewer, NS_ERROR_FAILURE); + + nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(contentViewer); + NS_ENSURE_TRUE (mdv, NS_ERROR_FAILURE); + ++#ifdef HAVE_GECKO_1_9 ++ return mdv->SetFullZoom (aZoom); ++#else + return mdv->SetTextZoom (aZoom); ++#endif + } + + nsresult EphyBrowser::GetContentViewer (nsIContentViewer **aViewer) + { ++ nsresult rv; + NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE); + +- nsCOMPtr<nsIDocShell> ourDocShell(do_GetInterface(mWebBrowser)); ++#ifdef HAVE_GECKO_1_9 ++ nsCOMPtr<nsIDOMWindow> domWindow; ++ rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow)); ++ NS_ENSURE_SUCCESS (rv, rv); ++ ++ nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv)); ++ NS_ENSURE_SUCCESS (rv, rv); ++ ++ nsCOMPtr<nsIDocShell> ourDocShell (window->GetDocShell()); ++#else ++ nsCOMPtr<nsIDocShell> ourDocShell = do_GetInterface (mWebBrowser); ++#endif + NS_ENSURE_TRUE (ourDocShell, NS_ERROR_FAILURE); + + return ourDocShell->GetContentViewer(aViewer); +@@ -918,16 +945,18 @@ + + nsresult EphyBrowser::GetZoom (float *aZoom) + { +- NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE); +- +- nsCOMPtr<nsIContentViewer> contentViewer; ++ nsCOMPtr<nsIContentViewer> contentViewer; + GetContentViewer (getter_AddRefs(contentViewer)); + NS_ENSURE_TRUE (contentViewer, NS_ERROR_FAILURE); + + nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(contentViewer); + NS_ENSURE_TRUE (mdv, NS_ERROR_FAILURE); + ++#ifdef HAVE_GECKO_1_9 ++ return mdv->GetFullZoom (aZoom); ++#else + return mdv->GetTextZoom (aZoom); ++#endif + } + + nsresult +@@ -1070,9 +1099,22 @@ + + nsresult EphyBrowser::GetPageDescriptor(nsISupports **aPageDescriptor) + { ++ nsresult rv; + NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE); + ++#ifdef HAVE_GECKO_1_9 ++ nsCOMPtr<nsIDOMWindow> domWindow; ++ rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow)); ++ NS_ENSURE_SUCCESS (rv, rv); ++ ++ nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv)); ++ NS_ENSURE_SUCCESS (rv, rv); ++ ++ nsCOMPtr<nsIDocShell> ds (window->GetDocShell()); ++#else + nsCOMPtr<nsIDocShell> ds = do_GetInterface (mWebBrowser); ++#endif ++ NS_ENSURE_TRUE (ds, NS_ERROR_FAILURE); + + nsCOMPtr<nsIWebPageDescriptor> wpd = do_QueryInterface (ds); + NS_ENSURE_TRUE (wpd, NS_ERROR_FAILURE); +@@ -1423,11 +1465,23 @@ + + nsresult EphyBrowser::GetHasModifiedForms (PRBool *modified) + { ++ nsresult rv; + *modified = PR_FALSE; + + NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE); + ++#ifdef HAVE_GECKO_1_9 ++ nsCOMPtr<nsIDOMWindow> domWindow; ++ rv = mWebBrowser->GetContentDOMWindow (getter_AddRefs (domWindow)); ++ NS_ENSURE_SUCCESS (rv, rv); ++ ++ nsCOMPtr<nsPIDOMWindow> window(do_QueryInterface(domWindow, &rv)); ++ NS_ENSURE_SUCCESS (rv, rv); ++ ++ nsCOMPtr<nsIDocShell> rootDocShell (window->GetDocShell()); ++#else + nsCOMPtr<nsIDocShell> rootDocShell = do_GetInterface (mWebBrowser); ++#endif + NS_ENSURE_TRUE (rootDocShell, NS_ERROR_FAILURE); + + nsCOMPtr<nsISimpleEnumerator> enumerator; +Index: epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.h +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.h (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.h (working copy) +@@ -22,7 +22,9 @@ + #ifndef GTKNSSDIALOGS_H + #define GTKNSSDIALOGS_H 1 + ++#ifndef HAVE_GECKO_1_9 + #include <nsIBadCertListener.h> ++#endif + #include <nsICertificateDialogs.h> + #include <nsITokenPasswordDialogs.h> + #include <nsITokenDialogs.h> +@@ -37,7 +39,10 @@ + + #define GTK_NSSDIALOGS_CLASSNAME "Gtk NSS Dialogs" + +-class GtkNSSDialogs : public nsIBadCertListener, ++class GtkNSSDialogs : ++#ifndef HAVE_GECKO_1_9 ++ public nsIBadCertListener, ++#endif + public nsICertificateDialogs, + public nsITokenPasswordDialogs, + public nsITokenDialogs, +@@ -45,7 +50,9 @@ + { + public: + NS_DECL_ISUPPORTS ++#ifndef HAVE_GECKO_1_9 + NS_DECL_NSIBADCERTLISTENER ++#endif + NS_DECL_NSICERTIFICATEDIALOGS + NS_DECL_NSITOKENPASSWORDDIALOGS + NS_DECL_NSITOKENDIALOGS +Index: epiphany-browser-2.21.4/embed/mozilla/EphyUtils.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/EphyUtils.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/EphyUtils.cpp (working copy) +@@ -39,7 +39,6 @@ + + #ifdef HAVE_GECKO_1_9 + #include <nsPIDOMWindow.h> +-#include <nsDOMJSUtils.h> /* for GetScriptContextFromJSContext */ + #include <nsIScriptContext.h> + #include <nsIScriptGlobalObject.h> + #endif +@@ -187,10 +186,11 @@ + nsIDOMWindow * + EphyJSUtils::GetDOMWindowFromCallContext () + { +- /* TODO: We can do this on 1.8 too, but we'd need to use headers which include private string API ++ /* TODO: We could do this on 1.8, but we'd need to use headers which include private string API + * so we'll have to move this to MozillaPrivate + */ +-#ifdef HAVE_GECKO_1_9 ++#if 0 ++ // XXX asac: example code that doesn't work + nsresult rv; + nsCOMPtr<nsIXPConnect> xpc (do_GetService(nsIXPConnect::GetCID(), &rv)); + NS_ENSURE_SUCCESS (rv, nsnull); +Index: epiphany-browser-2.21.4/embed/mozilla/Makefile.am +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/Makefile.am (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/Makefile.am (working copy) +@@ -9,8 +9,6 @@ + ContentHandler.h \ + EphyAboutModule.cpp \ + EphyAboutModule.h \ +- EphyBadCertRejector.cpp \ +- EphyBadCertRejector.h \ + EphyContentPolicy.cpp \ + EphyContentPolicy.h \ + EphyDirectoryProvider.cpp \ +@@ -64,6 +62,17 @@ + mozilla-notifiers.cpp \ + mozilla-notifiers.h + ++# XXX asac: 1.9 certificate ++if HAVE_GECKO_1_9 ++libephymozillaembed_la_SOURCES += \ ++ $(NULL) ++else ++libephymozillaembed_la_SOURCES += \ ++ EphyBadCertRejector.cpp \ ++ EphyBadCertRejector.h \ ++ $(NULL) ++endif ++ + if ENABLE_FILEPICKER + libephymozillaembed_la_SOURCES += \ + FilePicker.cpp \ +@@ -122,6 +131,7 @@ + pipnss \ + pref \ + shistory \ ++ string \ + sidebar \ + spellchecker \ + uriloader \ +@@ -147,6 +157,7 @@ + -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \ + -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \ + -DALLOW_PRIVATE_API \ ++ -DXPCOM_GLUE_USE_NSPR \ + $(AM_CPPFLAGS) + + libephymozillaembed_la_CXXFLAGS = \ +Index: epiphany-browser-2.21.4/embed/mozilla/EphyHeaderSniffer.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/EphyHeaderSniffer.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/EphyHeaderSniffer.cpp (working copy) +@@ -73,7 +73,9 @@ + #include "ephy-gui.h" + #include "ephy-prefs.h" + ++#ifndef HAVE_GECKO_1_9 + #include "EphyBadCertRejector.h" ++#endif + #include "MozDownload.h" + + #include "EphyHeaderSniffer.h" +@@ -223,6 +225,7 @@ + NS_IMETHODIMP + EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result) + { ++#ifndef HAVE_GECKO_1_9 // XXX asac: 1.9 certificate + if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) && + mEmbedPersist) + { +@@ -241,6 +244,7 @@ + return NS_OK; + } + } ++#endif + + return NS_ERROR_NO_INTERFACE; + } +Index: epiphany-browser-2.21.4/embed/mozilla/MozDownload.cpp +=================================================================== +--- epiphany-browser-2.21.4/embed/mozilla/MozDownload.cpp (revision 7753) ++++ epiphany-browser-2.21.4/embed/mozilla/MozDownload.cpp (working copy) +@@ -69,7 +69,10 @@ + #include <nsNetError.h> + #include <nsServiceManagerUtils.h> + ++#ifndef HAVE_GECKO_1_9 + #include "EphyBadCertRejector.h" ++#endif ++ + #include "EphyUtils.h" + + #include "eel-gconf-extensions.h" +@@ -505,6 +508,7 @@ + NS_IMETHODIMP + MozDownload::GetInterface(const nsIID & uuid, void * *result) + { ++#ifndef HAVE_GECKO_1_9 // XXX asac: 1.9 certificate + if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) && + mEmbedPersist) + { +@@ -523,7 +527,7 @@ + return NS_OK; + } + } +- ++#endif + return NS_ERROR_NO_INTERFACE; + } + +Index: epiphany-browser-2.21.4/embed/Makefile.am +=================================================================== +--- epiphany-browser-2.21.4/embed/Makefile.am (revision 7753) ++++ epiphany-browser-2.21.4/embed/Makefile.am (working copy) +@@ -115,6 +115,7 @@ + endif + + libephyembedfactory_la_CFLAGS = \ ++ $(GECKO_CFLAGS) \ + $(DEPENDENCIES_CFLAGS) \ + $(AM_CFLAGS) + --- epiphany-browser-2.21.4.orig/debian/patches/series +++ epiphany-browser-2.21.4/debian/patches/series @@ -0,0 +1,19 @@ +00_browser_wrapper_path.patch +01_bookmarks_menu.patch +02_ac_init.patch +#03_dbus.patch +#04_move_tabs.patch +05_libexecdir.patch +06_lpi.patch +06_ssl_weak_ciphers.patch +07_bookmarks.patch +#08_load_on_new_tab.patch +08_localized_startup_page.patch +09_download_dialog.patch -p0 +10_url_double-click.patch +#11_useragent-weasel.patch +12_gxx43.patch +98_xulrunner1.9_build_changes.patch +98a_nsipromptservice2_workaround.patch +98b_gtk_nss_dialog_missing_symbol.patch +99_autoreconf.patch --- epiphany-browser-2.21.4.orig/debian/patches/09_download_dialog.patch +++ epiphany-browser-2.21.4/debian/patches/09_download_dialog.patch @@ -0,0 +1,147 @@ +Index: embed/mozilla/ContentHandler.cpp +=================================================================== +--- embed/mozilla/ContentHandler.cpp.orig 2007-08-27 22:19:02.000000000 +0200 ++++ embed/mozilla/ContentHandler.cpp 2007-09-21 14:30:06.194859590 +0200 +@@ -336,8 +336,11 @@ + + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); +- gtk_dialog_add_button (GTK_DIALOG (dialog), +- action_label, mAction); ++ if (mAction != CONTENT_ACTION_NONE) ++ { ++ gtk_dialog_add_button (GTK_DIALOG (dialog), ++ action_label, mAction); ++ } + + gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY); + +@@ -385,20 +388,16 @@ + } + + if (auto_downloads) +- { +- mAction = CONTENT_ACTION_OPEN; +- } ++ mAction = mHelperApp ? CONTENT_ACTION_OPEN : CONTENT_ACTION_DOWNLOAD; + else +- { +- mAction = CONTENT_ACTION_OPEN_TMP; +- } ++ mAction = mHelperApp ? CONTENT_ACTION_OPEN_TMP : CONTENT_ACTION_SAVEAS; + +- if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE) ++ if (mPermission != EPHY_MIME_PERMISSION_SAFE) + { +- mAction = CONTENT_ACTION_DOWNLOAD; ++ mAction = auto_downloads ? CONTENT_ACTION_DOWNLOAD : CONTENT_ACTION_NONE; ++ MIMEConfirmAction (); + } +- +- if (!auto_downloads || mAction == CONTENT_ACTION_DOWNLOAD) ++ else if (mAction == CONTENT_ACTION_OPEN_TMP) + { + MIMEConfirmAction (); + } +Index: data/glade/prefs-dialog.glade +=================================================================== +--- data/glade/prefs-dialog.glade.orig 2007-08-27 22:19:01.000000000 +0200 ++++ data/glade/prefs-dialog.glade 2007-09-21 14:30:06.198859818 +0200 +@@ -303,6 +303,25 @@ + <property name="spacing">6</property> + + <child> ++ <widget class="GtkCheckButton" id="automatic_downloads_checkbutton"> ++ <property name="visible">True</property> ++ <property name="can_focus">True</property> ++ <property name="label" translatable="yes">A_utomatically download and open files</property> ++ <property name="use_underline">True</property> ++ <property name="relief">GTK_RELIEF_NORMAL</property> ++ <property name="focus_on_click">True</property> ++ <property name="active">False</property> ++ <property name="inconsistent">False</property> ++ <property name="draw_indicator">True</property> ++ </widget> ++ <packing> ++ <property name="padding">0</property> ++ <property name="expand">False</property> ++ <property name="fill">False</property> ++ </packing> ++ </child> ++ ++ <child> + <widget class="GtkHBox" id="download_button_hbox"> + <property name="visible">True</property> + <property name="homogeneous">False</property> +@@ -343,25 +362,6 @@ + <property name="fill">True</property> + </packing> + </child> +- +- <child> +- <widget class="GtkCheckButton" id="automatic_downloads_checkbutton"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="label" translatable="yes">A_utomatically download and open files</property> +- <property name="use_underline">True</property> +- <property name="relief">GTK_RELIEF_NORMAL</property> +- <property name="focus_on_click">True</property> +- <property name="active">False</property> +- <property name="inconsistent">False</property> +- <property name="draw_indicator">True</property> +- </widget> +- <packing> +- <property name="padding">0</property> +- <property name="expand">False</property> +- <property name="fill">False</property> +- </packing> +- </child> + </widget> + </child> + </widget> +Index: src/prefs-dialog.c +=================================================================== +--- src/prefs-dialog.c.orig 2007-08-27 22:18:55.000000000 +0200 ++++ src/prefs-dialog.c 2007-09-21 14:30:06.198859818 +0200 +@@ -391,6 +391,13 @@ + } + + static void ++automatic_downloads_toggled (GtkToggleButton *button, ++ GtkWidget *widget) ++{ ++ g_object_set (widget, "sensitive", gtk_toggle_button_get_active (button), NULL); ++} ++ ++static void + setup_font_combo (EphyDialog *dialog, + const char *type, + const char *code, +@@ -1525,6 +1532,7 @@ + EphyDialog *dialog = EPHY_DIALOG (pd); + EphyEncodings *encodings; + GtkWidget *window, *curr_button, *blank_button; ++ GtkWidget *automatic_downloads_checkbutton, *download_button_hbox; + GtkWidget *clear_cache_button, *font_prefs_button; + GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container; + gboolean sensitive; +@@ -1545,6 +1553,8 @@ + properties[WINDOW_PROP].id, &window, + properties[HOMEPAGE_CURRENT_PROP].id, &curr_button, + properties[HOMEPAGE_BLANK_PROP].id, &blank_button, ++ properties[AUTO_OPEN_PROP].id, &automatic_downloads_checkbutton, ++ properties[DOWNLOAD_PATH_HBOX_PROP].id, &download_button_hbox, + properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button, + properties[CSS_CHECKBOX_PROP].id, &css_checkbox, + properties[CSS_EDIT_BOX_PROP].id, &css_edit_box, +@@ -1568,6 +1578,10 @@ + gtk_widget_set_sensitive (curr_button, sensitive); + gtk_widget_set_sensitive (blank_button, sensitive); + ++ automatic_downloads_toggled (GTK_TOGGLE_BUTTON (automatic_downloads_checkbutton), download_button_hbox); ++ g_signal_connect (automatic_downloads_checkbutton, "toggled", ++ G_CALLBACK (automatic_downloads_toggled), download_button_hbox); ++ + g_signal_connect (font_prefs_button, "clicked", + G_CALLBACK (font_prefs_button_clicked_cb), dialog); + --- epiphany-browser-2.21.4.orig/debian/patches/08_load_on_new_tab.patch +++ epiphany-browser-2.21.4/debian/patches/08_load_on_new_tab.patch @@ -0,0 +1,90 @@ +Index: epiphany-browser-2.18.0/data/epiphany.schemas.in +=================================================================== +--- epiphany-browser-2.18.0.orig/data/epiphany.schemas.in 2007-03-06 12:31:58.000000000 +0000 ++++ epiphany-browser-2.18.0/data/epiphany.schemas.in 2007-03-11 21:01:46.000000000 +0000 +@@ -168,6 +168,21 @@ + </locale> + </schema> + <schema> ++ <key>/schemas/apps/epiphany/general/load_on_new_tab</key> ++ <applyto>/apps/epiphany/general/load_on_new_tab</applyto> ++ <owner>epiphany</owner> ++ <type>int</type> ++ <default>1</default> ++ <locale name="C"> ++ <short>Page to open when opening a new tab</short> ++ <long>Page to open when opening a new tab. Allowed values are -1 ++ (browser startup page), 0 (blank page), 1 (homepage), 2 (last visited ++ page), as defined for mozilla's browser.tab.loadOnNewTab about:config ++ option. Both -1 and 1 are implemented the same way; 2 is not ++ implemented.</long> ++ </locale> ++ </schema> ++ <schema> + <key>/schemas/apps/epiphany/general/show_bookmarks_bar</key> + <applyto>/apps/epiphany/general/show_bookmarks_bar</applyto> + <owner>epiphany</owner> +Index: epiphany-browser-2.18.0/lib/ephy-prefs.h +=================================================================== +--- epiphany-browser-2.18.0.orig/lib/ephy-prefs.h 2007-03-06 12:31:55.000000000 +0000 ++++ epiphany-browser-2.18.0/lib/ephy-prefs.h 2007-03-11 21:01:46.000000000 +0000 +@@ -37,6 +37,7 @@ + #define CONF_AUTO_DOWNLOADS "/apps/epiphany/general/automatic_downloads" + #define CONF_DESKTOP_IS_HOME_DIR "/apps/nautilus/preferences/desktop_is_home_dir" + #define CONF_NETWORK_MANAGED "/apps/epiphany/general/managed_network" ++#define CONF_BROWSER_TABS_LOADONNEWTAB "/apps/epiphany/general/load_on_new_tab" + + /* i18n pref */ + #define CONF_GECKO_ENABLE_PANGO "/apps/epiphany/web/enable_pango" +Index: epiphany-browser-2.18.0/src/ephy-shell.c +=================================================================== +--- epiphany-browser-2.18.0.orig/src/ephy-shell.c 2007-03-06 12:31:28.000000000 +0000 ++++ epiphany-browser-2.18.0/src/ephy-shell.c 2007-03-11 21:01:46.000000000 +0000 +@@ -530,14 +530,45 @@ + gtk_window_fullscreen (GTK_WINDOW (window)); + } + +- if (flags & EPHY_NEW_TAB_HOME_PAGE || +- flags & EPHY_NEW_TAB_NEW_PAGE) ++ if (flags & EPHY_NEW_TAB_HOME_PAGE) + { + ephy_tab_set_typed_address (tab, "", + EPHY_TAB_ADDRESS_EXPIRE_NEXT); + ephy_toolbar_activate_location (toolbar); + is_empty = load_homepage (embed); + } ++ else if (flags & EPHY_NEW_TAB_NEW_PAGE) ++ { ++ /* Simulate mozilla's browser.tabs.loadOnNewTab option through ++ * a gconf option. ++ * ++ * Documentation at: http://kb.mozillazine.org/About:config_entries ++ * ++ * To ensure that no blank page is displayed by default, this key ++ * is set to 1 by default in the schema (see data/epiphany.schema.in) ++ */ ++ int load_on_new_tab = eel_gconf_get_integer (CONF_BROWSER_TABS_LOADONNEWTAB); ++ ++ switch (load_on_new_tab) ++ { ++ case 0: /* Blank page */ ++ ephy_embed_load_url (embed, "about:blank"); ++ is_empty = url_is_empty ("about:blank"); ++ break; ++ ++ case 2: /* Last visited */ ++ /* NOT IMPLEMENTED */ ++ ++ case -1: /* Start-up page */ ++ case 1: /* Homepage */ ++ default: ++ /* Same as in the previous 'if' test */ ++ ephy_tab_set_typed_address (tab, "", ++ EPHY_TAB_ADDRESS_EXPIRE_NEXT); ++ ephy_toolbar_activate_location (toolbar); ++ is_empty = load_homepage (embed); ++ } ++ } + else if (flags & EPHY_NEW_TAB_OPEN_PAGE) + { + EphyEmbedLoadFlags load_flags = 0; --- epiphany-browser-2.21.4.orig/debian/patches/07_bookmarks.patch +++ epiphany-browser-2.21.4/debian/patches/07_bookmarks.patch @@ -0,0 +1,15 @@ +Index: epiphany-browser-2.18.0/src/bookmarks/ephy-bookmarks.c +=================================================================== +--- epiphany-browser-2.18.0.orig/src/bookmarks/ephy-bookmarks.c 2007-03-06 12:31:26.000000000 +0000 ++++ epiphany-browser-2.18.0/src/bookmarks/ephy-bookmarks.c 2007-03-11 21:01:42.000000000 +0000 +@@ -102,6 +102,10 @@ + * For instance in .nl these should be + * "http://www.google.nl" and "http://www.google.nl/search?q=%s" + */ ++ { N_("Debian"), N_("http://www.debian.org/") }, ++ { N_("GNOME"), N_("http://www.gnome.org/") }, ++ { N_("Planet Debian"), N_("http://planet.debian.org/") }, ++ { N_("Debian Bug Tracking System"), N_("http://bugs.debian.org/%s") }, + { N_("Search the web"), N_("http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8") } + }; + --- epiphany-browser-2.21.4.orig/debian/patches/04_move_tabs.patch +++ epiphany-browser-2.21.4/debian/patches/04_move_tabs.patch @@ -0,0 +1,13 @@ +Index: epiphany-browser-2.18.0/src/ephy-notebook.c +=================================================================== +--- epiphany-browser-2.18.0.orig/src/ephy-notebook.c 2007-03-06 12:31:28.000000000 +0000 ++++ epiphany-browser-2.18.0/src/ephy-notebook.c 2007-03-11 20:57:46.000000000 +0000 +@@ -58,7 +58,7 @@ + #define TOOLTIP_MAX_LENGTH 256 + + /* Until https://bugzilla.mozilla.org/show_bug.cgi?id=296002 is fixed */ +-#define KEEP_TAB_IN_SAME_TOPLEVEL ++#undef KEEP_TAB_IN_SAME_TOPLEVEL + + #define EPHY_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NOTEBOOK, EphyNotebookPrivate)) + --- epiphany-browser-2.21.4.orig/debian/patches/06_ssl_weak_ciphers.patch +++ epiphany-browser-2.21.4/debian/patches/06_ssl_weak_ciphers.patch @@ -0,0 +1,11 @@ +Index: epiphany-2.20.0/data/default-prefs-common.js +=================================================================== +--- epiphany-2.20.0.orig/data/default-prefs-common.js 2007-08-27 22:19:01.000000000 +0200 ++++ epiphany-2.20.0/data/default-prefs-common.js 2007-09-21 14:29:58.022393868 +0200 +@@ -163,3 +163,6 @@ + // set to true for parity with gtk entries + pref("bidi.edit.delete_immediately", true); + ++// enable weak SSL ciphers, as Epiphany warns about them anyway ++pref("security.ssl3.rsa_rc4_40_md5", true); ++pref("security.ssl3.rsa_rc2_40_md5", true); --- epiphany-browser-2.21.4.orig/debian/patches/03_dbus.patch +++ epiphany-browser-2.21.4/debian/patches/03_dbus.patch @@ -0,0 +1,23 @@ +Index: epiphany-2.20.0/src/ephy-main.c +=================================================================== +--- epiphany-2.20.0.orig/src/ephy-main.c 2007-09-21 14:46:15.134076289 +0200 ++++ epiphany-2.20.0/src/ephy-main.c 2007-09-21 14:47:40.806958509 +0200 +@@ -624,11 +624,13 @@ + + if (!_ephy_dbus_startup (!private_instance, &error)) + { +- _ephy_dbus_release (); +- +- show_error_message (&error); +- +- exit (1); ++ GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, ++ GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, ++ "Epiphany could not connect to the session message bus. " ++ "Your default settings will not be available."); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ private_instance = TRUE; + } + + /* If we're remoting, no need to start up any further services, --- epiphany-browser-2.21.4.orig/debian/patches/01_bookmarks_menu.patch +++ epiphany-browser-2.21.4/debian/patches/01_bookmarks_menu.patch @@ -0,0 +1,12 @@ +Index: epiphany-2.20.0/data/bme.desktop.in.in +=================================================================== +--- epiphany-2.20.0.orig/data/bme.desktop.in.in 2007-09-21 14:26:35.018825354 +0200 ++++ epiphany-2.20.0/data/bme.desktop.in.in 2007-09-21 14:28:35.273678287 +0200 +@@ -8,6 +8,7 @@ + Terminal=false + Type=Application + Icon=epiphany-bookmarks ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=epiphany + X-GNOME-Bugzilla-Component=BugBuddyBugs --- epiphany-browser-2.21.4.orig/debian/patches/02_ac_init.patch +++ epiphany-browser-2.21.4/debian/patches/02_ac_init.patch @@ -0,0 +1,13 @@ +Index: epiphany-browser-2.21.4/configure.ac +=================================================================== +--- epiphany-browser-2.21.4.orig/configure.ac 2007-12-16 14:25:57.000000000 +0100 ++++ epiphany-browser-2.21.4/configure.ac 2007-12-17 10:43:57.000000000 +0100 +@@ -24,7 +24,7 @@ + # This can be either "trunk" or "branches/gnome-x-y" + m4_define([epiphany_branch],["trunk"]) + +-AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) ++AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser]) + + GNOME_COMMON_INIT + --- epiphany-browser-2.21.4.orig/debian/patches/08_localized_startup_page.patch +++ epiphany-browser-2.21.4/debian/patches/08_localized_startup_page.patch @@ -0,0 +1,212 @@ +Index: epiphany-browser-2.21.4/src/ephy-home-action.c +=================================================================== +--- epiphany-browser-2.21.4.orig/src/ephy-home-action.c 2007-09-12 20:35:23.000000000 +0200 ++++ epiphany-browser-2.21.4/src/ephy-home-action.c 2007-12-17 10:49:07.000000000 +0100 +@@ -156,16 +156,95 @@ + } + } + ++static char * ++escape_homepage (char *homepage, char *languages) ++{ ++ const char *inptr, *start; ++ GString *page; ++ ++ languages = g_strdelimit (languages, ".@:", '\0'); ++ ++ page = g_string_new (NULL); ++ ++ start = inptr = homepage; ++ while ((inptr = strchr (inptr, '%')) != NULL) { ++ g_string_append_len (page, start, inptr - start); ++ inptr++; ++ switch (*inptr) { ++ case 'l': ++ g_string_append (page, languages); ++ break; ++ case '%': ++ g_string_append_c (page, '%'); ++ break; ++ default: ++ g_string_append_c (page, '%'); ++ if (*inptr) ++ g_string_append_c (page, *inptr); ++ break; ++ } ++ ++ if (*inptr) ++ inptr++; ++ start = inptr; ++ } ++ ++ g_string_append (page, start); ++ ++ return g_string_free (page, FALSE); ++} ++ + static void + ephy_home_action_activate (GtkAction *action) + { + char *action_name; + char *address; ++ const char * const * languages; ++ char *homepage; + + g_object_get (G_OBJECT (action), "name", &action_name, NULL); + + address = eel_gconf_get_string (CONF_GENERAL_HOMEPAGE); + ++ if (address != NULL && address[0] != '\0' && (*address == '/' || !strncmp(address, "file://", 7))) ++ { ++ languages = g_get_language_names (); ++ if (languages) ++ { ++ int i; ++ gboolean page_set = FALSE; ++ ++ for (i = 0; languages[i] != NULL; i++) ++ { ++ if (page_set) ++ break; ++ ++ homepage = escape_homepage (address, languages[i]); ++ ++ if (!strncmp(address, "file://", 7)) ++ { ++ char *path; ++ path = homepage + 7; ++ ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ ++ } ++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ } ++ ++ if (!page_set) ++ homepage = escape_homepage (address, "C"); ++ } ++ else ++ homepage = escape_homepage (address, "C"); ++ ++ g_free (address); ++ address = g_strdup (homepage); ++ g_free (homepage); ++ } ++ + action_name_association (action, action_name, address, FALSE); + + g_free (address); +Index: epiphany-browser-2.21.4/src/ephy-shell.c +=================================================================== +--- epiphany-browser-2.21.4.orig/src/ephy-shell.c 2007-11-16 16:09:42.000000000 +0100 ++++ epiphany-browser-2.21.4/src/ephy-shell.c 2007-12-17 10:46:49.000000000 +0100 +@@ -26,6 +26,7 @@ + #include <gtk/gtknotebook.h> + #include <dirent.h> + #include <unistd.h> ++#include <locale.h> + + #include "ephy-shell.h" + #include "ephy-type-builtins.h" +@@ -394,6 +395,44 @@ + return ephy_shell; + } + ++static char * ++escape_homepage (char *homepage, char *languages) ++{ ++ const char *inptr, *start; ++ GString *page; ++ ++ languages = g_strdelimit (languages, ".@:", '\0'); ++ ++ page = g_string_new (NULL); ++ ++ start = inptr = homepage; ++ while ((inptr = strchr (inptr, '%')) != NULL) { ++ g_string_append_len (page, start, inptr - start); ++ inptr++; ++ switch (*inptr) { ++ case 'l': ++ g_string_append (page, languages); ++ break; ++ case '%': ++ g_string_append_c (page, '%'); ++ break; ++ default: ++ g_string_append_c (page, '%'); ++ if (*inptr) ++ g_string_append_c (page, *inptr); ++ break; ++ } ++ ++ if (*inptr) ++ inptr++; ++ start = inptr; ++ } ++ ++ g_string_append (page, start); ++ ++ return g_string_free (page, FALSE); ++} ++ + static gboolean + url_is_empty (const char *location) + { +@@ -411,7 +450,8 @@ + static gboolean + load_homepage (EphyEmbed *embed) + { +- char *home; ++ const char * const * languages; ++ char *homepage, *home; + gboolean is_empty; + + home = eel_gconf_get_string(CONF_GENERAL_HOMEPAGE); +@@ -422,6 +462,44 @@ + + home = g_strdup ("about:blank"); + } ++ else if (*home == '/' || !strncmp(home, "file://", 7)) ++ { ++ languages = g_get_language_names (); ++ if (languages) ++ { ++ int i; ++ gboolean page_set = FALSE; ++ ++ for (i = 0; languages[i] != NULL; i++) ++ { ++ if (page_set) ++ break; ++ ++ homepage = escape_homepage (home, languages[i]); ++ ++ if (!strncmp(home, "file://", 7)) ++ { ++ char *path; ++ path = homepage + 7; ++ ++ if (g_file_test (path, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ ++ } ++ else if (g_file_test (homepage, G_FILE_TEST_EXISTS)) ++ page_set = TRUE; ++ } ++ ++ if (!page_set) ++ homepage = escape_homepage (home, "C"); ++ } ++ else ++ homepage = escape_homepage (home, "C"); ++ ++ g_free (home); ++ home = g_strdup (homepage); ++ g_free (homepage); ++ } + + is_empty = url_is_empty (home); + --- epiphany-browser-2.21.4.orig/debian/patches/98b_gtk_nss_dialog_missing_symbol.patch +++ epiphany-browser-2.21.4/debian/patches/98b_gtk_nss_dialog_missing_symbol.patch @@ -0,0 +1,40 @@ +--- + embed/mozilla/GtkNSSDialogs.cpp | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +Index: epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp +=================================================================== +--- epiphany-browser-2.21.4.orig/embed/mozilla/GtkNSSDialogs.cpp ++++ epiphany-browser-2.21.4/embed/mozilla/GtkNSSDialogs.cpp +@@ -1551,16 +1551,31 @@ + static void + SelectionChangedCallback (GtkComboBox *combo, + GtkDialog *dialog) + { + int active = gtk_combo_box_get_active (combo); + gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_ACCEPT, active >= 0); + } + ++#ifdef HAVE_GECKO_1_9 ++/** ++* displayProtectedAuth - displays notification dialog to the user ++* that he is expected to authenticate to the token using its ++* "protected authentication path" feature ++*/ ++/* void displayProtectedAuth (in nsIInterfaceRequestor ctx, in nsIProtectedAuthThread runnable); */ ++NS_IMETHODIMP ++GtkNSSDialogs::DisplayProtectedAuth (nsIInterfaceRequestor *ctx, ++ nsIProtectedAuthThread *runnable) ++{ ++ return NS_OK; ++} ++#endif ++ + /* void ChooseToken (in nsIInterfaceRequestor ctx, + [array, size_is (count)] in wstring tokenNameList, + in unsigned long count, + out wstring tokenName, + out boolean canceled); */ + NS_IMETHODIMP + GtkNSSDialogs::ChooseToken (nsIInterfaceRequestor *aContext, + const PRUnichar **tokenNameList, --- epiphany-browser-2.21.4.orig/debian/epiphany-webkit.prerm +++ epiphany-browser-2.21.4/debian/epiphany-webkit.prerm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then + for alt in epiphany-browser x-www-browser gnome-www-browser; do + update-alternatives --remove $alt /usr/bin/epiphany-webkit + done +fi + +#DEBHELPER# + +exit 0 --- epiphany-browser-2.21.4.orig/debian/epiphany-webkit.menu +++ epiphany-browser-2.21.4/debian/epiphany-webkit.menu @@ -0,0 +1,6 @@ +?package(epiphany-webkit):needs="x11" \ + section="Applications/Network/Web Browsing" \ + title="Epiphany web browser (Webkit)" \ + longtitle="Epiphany web browser with Webkit backend" \ + command="/usr/bin/epiphany-webkit" \ + hints="Web browsers"

-EphyGlade +EphyGlade

EphyGlade — Load a glade XML definition