diff options
| author | Xan Lopez <xan@gnome.org> | 2007-07-28 04:27:56 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2007-07-28 04:27:56 +0800 |
| commit | c75bf8633191306efc4120fd589d0c375f286e71 (patch) | |
| tree | e573b99549ca95c38ef67c9dd5d53829cb545a30 /embed/ephy-embed-factory.c | |
| parent | ec7067fd30fe1bd5d0b69a648359d8085328f398 (diff) | |
| download | gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.gz gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.bz2 gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.lz gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.xz gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.tar.zst gsoc2013-epiphany-c75bf8633191306efc4120fd589d0c375f286e71.zip | |
Add support for the WebKit engine, compile with --with-engine=webkit to
2007-07-27 Xan Lopez <xan@gnome.org>
* Makefile.am:
* configure.ac:
* doc/reference/Makefile.am:
* embed/Makefile.am:
* embed/ephy-embed-factory.c: (ephy_embed_factory_new_object):
* embed/ephy-embed-persist.c:
* embed/ephy-embed-shell.c:
* embed/ephy-embed.c:
* embed/webkit/Makefile.am:
* embed/webkit/webkit-embed-find.cpp:
* embed/webkit/webkit-embed-find.h:
* embed/webkit/webkit-embed-persist.cpp:
* embed/webkit/webkit-embed-persist.h:
* embed/webkit/webkit-embed-single.cpp:
* embed/webkit/webkit-embed-single.h:
* embed/webkit/webkit-embed.cpp:
* embed/webkit/webkit-embed.h:
* src/Makefile.am:
Add support for the WebKit engine, compile with
--with-engine=webkit to activate.
* embed/mozilla/mozilla-embed-single.cpp:
Move to the G_DEFINE_TYPE_WITH_CODE macro.
svn path=/trunk/; revision=7208
Diffstat (limited to 'embed/ephy-embed-factory.c')
| -rw-r--r-- | embed/ephy-embed-factory.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/embed/ephy-embed-factory.c b/embed/ephy-embed-factory.c index d5d43ac39..1ab59f4a5 100644 --- a/embed/ephy-embed-factory.c +++ b/embed/ephy-embed-factory.c @@ -21,10 +21,17 @@ #include "config.h" #include "ephy-embed-factory.h" +#if defined(WITH_GECKO_ENGINE) #include "mozilla-embed.h" #include "mozilla-embed-find.h" #include "mozilla-embed-persist.h" #include "mozilla-embed-single.h" +#elif defined(WITH_WEBKIT_ENGINE) +#include "webkit-embed.h" +#include "webkit-embed-find.h" +#include "webkit-embed-persist.h" +#include "webkit-embed-single.h" +#endif #include "ephy-embed.h" #include "ephy-embed-find.h" #include "ephy-embed-persist.h" @@ -45,19 +52,35 @@ ephy_embed_factory_new_object (GType type) if (type == EPHY_TYPE_EMBED) { +#if 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); +#endif } else if (type == EPHY_TYPE_EMBED_PERSIST) { +#if 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); +#endif } else if (type == EPHY_TYPE_EMBED_FIND) { +#if 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); +#endif } else if (type == EPHY_TYPE_EMBED_SINGLE) { +#if 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); +#endif } else { |