ryuan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f4d48471e227d560d1ba386483fed0407a4197df
commit f4d48471e227d560d1ba386483fed0407a4197df Author: Ryuan Choi <[email protected]> Date: Thu Jan 9 21:10:57 2014 +0900 web: Move EWebKit headers out of Elementary.h again Since rELM166ca9e86a72, I moved EWebKit header into Elementary.h like other libraries. But, it made possible build break while building test browser in webkit. It's because EWebKit.h and EWebKit2.h have same symbols and test browser should be compiled with EWebKit2.h although Elementary was built with ewebkit. This patch reverts a part of changes in rELM166ca9e86a72, which includes EWebkit.h in Elementary.h --- src/lib/Elementary.h.in | 8 -------- src/lib/elm_web.c | 1 + src/lib/elm_web2.c | 1 + 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index c2a8660..30164d9 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -93,14 +93,6 @@ #include <EMap.h> #endif -#ifdef ELM_WEB -#include <EWebKit.h> -#endif - -#ifdef ELM_WEB2 -#include <EWebKit2.h> -#endif - #ifdef EAPI # undef EAPI #endif diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c index c9bac2a..24059ea 100644 --- a/src/lib/elm_web.c +++ b/src/lib/elm_web.c @@ -22,6 +22,7 @@ EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP; #define MY_CLASS_NAME_LEGACY "elm_web" #ifdef HAVE_ELEMENTARY_WEB +#include <EWebKit.h> /* Similar to iPhone */ // TODO: switch between iPhone, iPad or Chrome/Safari based on some diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c index be4ecd2..b042ec1 100644 --- a/src/lib/elm_web2.c +++ b/src/lib/elm_web2.c @@ -8,6 +8,7 @@ #include "elm_widget_web.h" #if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2) +#include <EWebKit2.h> EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP; --
