diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/epiphany.defs | 7 | ||||
| -rw-r--r-- | src/epiphany.override | 3 |
4 files changed, 20 insertions, 1 deletions
@@ -1,5 +1,13 @@ 2005-07-31 Christian Persch <chpe@cvs.gnome.org> + * src/Makefile.am: + * src/epiphany.defs: + * src/epiphany.override: + + Wrap MozillaEmbedEvent, to prevent crash from bug #310910. + +2005-07-31 Christian Persch <chpe@cvs.gnome.org> + * src/epiphany.defs: More bindings. diff --git a/src/Makefile.am b/src/Makefile.am index f052c51f3..80e8031d3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -304,6 +304,7 @@ MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) if ENABLE_PYTHON BINDING_HEADERS_SRCDIR_IN = \ + embed/mozilla/mozilla-embed-event.h \ embed/ephy-command-manager.h \ embed/ephy-cookie-manager.h \ embed/ephy-embed-event.h \ @@ -325,7 +326,6 @@ BINDING_HEADERS_SRCDIR_IN = \ lib/widgets/ephy-search-entry.h \ lib/widgets/ephy-spinner.h \ src/bookmarks/ephy-bookmarksbar.h \ - src/bookmarks/ephy-bookmarksbar-model.h \ src/bookmarks/ephy-bookmarks.h \ src/ephy-extension.h \ src/ephy-extensions-manager.h \ @@ -379,6 +379,7 @@ BINDING_HEADERS_SRCDIR_IGNORE_IN = \ lib/widgets/ephy-zoom-control.h \ src/bookmarks/ephy-bookmark-action.h \ src/bookmarks/ephy-bookmark-properties.h \ + src/bookmarks/ephy-bookmarksbar-model.h \ src/bookmarks/ephy-bookmarks-editor.h \ src/bookmarks/ephy-bookmarks-export.h \ src/bookmarks/ephy-bookmarks-import.h \ diff --git a/src/epiphany.defs b/src/epiphany.defs index ef7ae1843..fdb691de5 100644 --- a/src/epiphany.defs +++ b/src/epiphany.defs @@ -204,6 +204,13 @@ (gtype-id "EPHY_TYPE_WINDOW") ) +(define-object MozillaEmbedEvent + (in-module "Mozilla") + (parent "GObject") + (c-name "MozillaEmbedEvent") + (gtype-id "MOZILLA_TYPE_EMBED_EVENT") +) + ;; Enumerations and flags ... (define-flags EmbedEventContext diff --git a/src/epiphany.override b/src/epiphany.override index 439ca3c2e..2737ab0dc 100644 --- a/src/epiphany.override +++ b/src/epiphany.override @@ -66,6 +66,9 @@ headers #include "ephy-favicon-cache.h" #include "eggtypebuiltins.h" +/* Mozilla types */ +#include "mozilla-embed-event.h" + void pyepiphany_register_classes (PyObject *d); void pyepiphany_add_constants (PyObject *module, const gchar *strip_prefix); |