diff options
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/Makefile.am | 14 | ||||
| -rw-r--r-- | embed/ephy-embed-factory.c | 23 |
2 files changed, 30 insertions, 7 deletions
diff --git a/embed/Makefile.am b/embed/Makefile.am index e073b5d57..f6b432aab 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -1,9 +1,12 @@ SUBDIRS = $(with_engine) -DIST_SUBDIRS = mozilla webkit + +DIST_SUBDIRS = xulrunner mozilla webkit + +NULL = noinst_LTLIBRARIES = libephyembed.la libephyembedfactory.la -headerdir = $(prefix)/include/epiphany/@EPIPHANY_MAJOR@/epiphany +headerdir = $(prefix)/include/epiphany/$(EPIPHANY_MAJOR)/epiphany header_DATA = \ ephy-embed-type-builtins.h \ $(INST_H_FILES) @@ -91,6 +94,13 @@ libephyembedfactory_la_CPPFLAGS = \ -I$(top_srcdir)/embed/$(with_engine) \ $(AM_CPPFLAGS) +if WITH_XULRUNNER_ENGINE +libephyembedfactory_la_CPPFLAGS += \ + -I$(srcdir)xulrunner/embed \ + $(LIBXUL_INCLUDES) \ + $(NULL) +endif + if WITH_GECKO_ENGINE libephyembedfactory_la_CPPFLAGS += -I$(GECKO_INCLUDE_ROOT)/gtkembedmoz endif diff --git a/embed/ephy-embed-factory.c b/embed/ephy-embed-factory.c index 1ab59f4a5..6a80faf41 100644 --- a/embed/ephy-embed-factory.c +++ b/embed/ephy-embed-factory.c @@ -21,7 +21,12 @@ #include "config.h" #include "ephy-embed-factory.h" -#if defined(WITH_GECKO_ENGINE) +#if defined(WITH_XULRUNNER_ENGINE) +#include "mozilla-embed.h" +#include "mozilla-embed-find.h" +#include "mozilla-embed-persist.h" +#include "mozilla-embed-single.h" +#elif defined(WITH_GECKO_ENGINE) #include "mozilla-embed.h" #include "mozilla-embed-find.h" #include "mozilla-embed-persist.h" @@ -52,7 +57,9 @@ ephy_embed_factory_new_object (GType type) if (type == EPHY_TYPE_EMBED) { -#if defined(WITH_GECKO_ENGINE) +#if defined(WITH_XULRUNNER_ENGINE) + object = g_object_new (MOZILLA_TYPE_EMBED, NULL); +#elif defined(WITH_GECKO_ENGINE) object = g_object_new (MOZILLA_TYPE_EMBED, NULL); #elif defined(WITH_WEBKIT_ENGINE) object = g_object_new (WEBKIT_TYPE_EMBED, NULL); @@ -60,7 +67,9 @@ ephy_embed_factory_new_object (GType type) } else if (type == EPHY_TYPE_EMBED_PERSIST) { -#if defined(WITH_GECKO_ENGINE) +#if defined(WITH_XULRUNNER_ENGINE) + object = g_object_new (MOZILLA_TYPE_EMBED_PERSIST, NULL); +#elif defined(WITH_GECKO_ENGINE) object = g_object_new (MOZILLA_TYPE_EMBED_PERSIST, NULL); #elif defined(WITH_WEBKIT_ENGINE) object = g_object_new (WEBKIT_TYPE_EMBED_PERSIST, NULL); @@ -68,7 +77,9 @@ ephy_embed_factory_new_object (GType type) } else if (type == EPHY_TYPE_EMBED_FIND) { -#if defined(WITH_GECKO_ENGINE) +#if defined(WITH_XULRUNNER_ENGINE) + object = g_object_new (MOZILLA_TYPE_EMBED_FIND, NULL); +#elif defined(WITH_GECKO_ENGINE) object = g_object_new (MOZILLA_TYPE_EMBED_FIND, NULL); #elif defined(WITH_WEBKIT_ENGINE) object = g_object_new (WEBKIT_TYPE_EMBED_FIND, NULL); @@ -76,7 +87,9 @@ ephy_embed_factory_new_object (GType type) } else if (type == EPHY_TYPE_EMBED_SINGLE) { -#if defined(WITH_GECKO_ENGINE) +#if defined(WITH_XULRUNNER_ENGINE) + object = g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL); +#elif defined(WITH_GECKO_ENGINE) object = g_object_new (MOZILLA_TYPE_EMBED_SINGLE, NULL); #elif defined(WITH_WEBKIT_ENGINE) object = g_object_new (WEBKIT_TYPE_EMBED_SINGLE, NULL); |