[Patch] Applied Mike's patch for webview split from elementary.

diff --git a/configure.ac b/configure.ac
index d7bf3a4..2bf3e76 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -409,34 +409,6 @@ if test "x$want_elementary_eweather" = "xyes" -a "x$have_elementary_eweather" =
 fi
 AC_SUBST(ELM_EWEATHER_DEF)
 
-ELM_EWEBKIT_DEF="#undef"
-have_elementary_ewebkit="no"
-want_elementary_ewebkit="auto"
-AC_ARG_ENABLE([ewebkit],
-   [AC_HELP_STRING([--disable-ewebkit], [disable ewebkit support. @<:@default=detect@:>@])],
-   [want_elementary_ewebkit=$enableval], [])
-
-if test "x$want_elementary_ewebkit" != "xno"; then
-    PKG_CHECK_MODULES([ELEMENTARY_EWEBKIT],
-       [
-        ewebkit
-       ],
-       [
-        AC_DEFINE(HAVE_ELEMENTARY_EWEBKIT, 1, [EWebKit support for Elementary])
-        have_elementary_ewebkit="yes"
-        ELM_EWEBKIT_DEF="#define"
-        requirement_elm="ewebkit ${requirement_elm}"
-       ],
-       [have_elementary_ewebkit="no"]
-    )
-else
-    have_elementary_ewebkit="no"
-fi
-if test "x$want_elementary_ewebkit" = "xyes" -a "x$have_elementary_ewebkit" = "xno"; then
-    AC_MSG_ERROR([EWebKit support requested, but no ewebkit found by pkg-config.])
-fi
-AC_SUBST(ELM_EWEBKIT_DEF)
-
 ELM_ETHUMB_DEF="#undef"
 have_elementary_ethumb="no"
 want_elementary_ethumb="auto"

diff --git a/debian/control b/debian/control
index 8d851f4..8e4cb8a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: x11
 Priority: optional
 Maintainer: Jaehwan Kim <jae.hwan.kim@samsung.com>, Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Jihoon Kim <jihoon48.kim@samsung.com>
 Uploaders: Doyoun Kang <doyoun.kang@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>
-Build-Depends: debhelper (>= 6), cdbs, libecore-dev, libevas-dev, libeet-dev, libeet-bin, libedje-dev, pkg-config, libtool, libeina-dev, libefreet-dev, libethumb-dev, libwebkit-engine-dev 
+Build-Depends: debhelper (>= 6), cdbs, libecore-dev, libevas-dev, libeet-dev, libeet-bin, libedje-dev, pkg-config, libtool, libeina-dev, libefreet-dev, libethumb-dev
 Standards-Version: 3.8.1
 Homepage: http://www.enlightenment.org
 
 Package: libelm-dev
 Section: libdevel
 Architecture: any
-Depends: libelm (= ${binary:Version}), libecore-dev, libevas-dev, libeet-dev, libedje-dev, libedbus-dev, libefreet-dev, libethumb-dev, libwebkit-engine-dev
+Depends: libelm (= ${binary:Version}), libecore-dev, libevas-dev, libeet-dev, libedje-dev, libedbus-dev, libefreet-dev, libethumb-dev
 Description: Elementary - a basic widget set that is easy to use based on EFL for mobile
  This package contains devel content.
 

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index a820eb3..976d133 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -18,7 +18,6 @@
 @ELM_EDBUS_DEF@ ELM_EDBUS
 @ELM_EFREET_DEF@ ELM_EFREET
 @ELM_ETHUMB_DEF@ ELM_ETHUMB
-@ELM_EWEBKIT_DEF@ ELM_EWEBKIT
 @ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
 @ELM_LIBINTL_H_DEF@ ELM_LIBINTL_H
 
@@ -2790,6 +2789,7 @@ extern "C" {
    EAPI Eina_Bool    elm_dayselector_check_state_get(Evas_Object *obj, Elm_DaySelector_Day day);
    EAPI void         elm_dayselector_check_state_set(Evas_Object *obj, Elm_DaySelector_Day day, Eina_Bool checked);
    
+#if 0
    /* WebView */
    typedef Eina_Bool (*Elm_WebView_Mime_Cb)(Evas_Object *obj, const char *uri);
    EAPI Evas_Object *elm_webview_add(Evas_Object *parent, Eina_Bool tiled);
@@ -2806,6 +2806,7 @@ extern "C" {
    EAPI void         elm_webview_scheme_callback_set(Evas_Object *obj, const char *scheme, Elm_WebView_Mime_Cb func);
    EAPI void         elm_webview_default_layout_width_set(Evas_Object *obj, int width);
    EAPI void         elm_webview_layout_width_set_to_container(Evas_Object *obj);
+#endif
 
    /* NoContents */
    EAPI Evas_Object *elm_nocontents_add(Evas_Object *parent);

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index acc1b7b..1fd505c 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -18,7 +18,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_EDBUS_CFLAGS@ \
 @ELEMENTARY_EFREET_CFLAGS@ \
 @ELEMENTARY_ETHUMB_CFLAGS@ \
-@ELEMENTARY_EWEBKIT_CFLAGS@ \
 @ELEMENTARY_LIBXML2_CFLAGS@
 
 if ELEMENTARY_WINDOWS_BUILD
@@ -27,7 +26,7 @@ endif
 
 lib_LTLIBRARIES = libelementary.la
 
-includes_HEADERS = Elementary.h
+includes_HEADERS = Elementary.h elm_priv.h
 includesdir = $(includedir)/elementary-@VMAJ@
 
 libelementary_la_SOURCES = \
@@ -126,7 +125,6 @@ elm_coverflow.c \
 elm_cabinet.c \
 elm_dayselector.c \
 elm_cnp_helper.c \
-elm_webview.c \
 elm_cbhm_helper.c \
 elm_datefield.c \
 elm_nocontents.c \
@@ -157,9 +155,7 @@ els_icon.c \
 els_icon.h \
 \
 els_touch.c \
-els_touch.h \
-els_webview.c \
-els_webview_container.c
+els_touch.h
 
 
 libelementary_la_CFLAGS =

diff --git a/src/lib/elm_carousel.c b/src/lib/elm_carousel.c
index 24b325d..dff4e3e 100644 (file)
--- a/src/lib/elm_carousel.c
+++ b/src/lib/elm_carousel.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 // FIXME: this is NOT the carousel - yet!
 

diff --git a/src/lib/elm_diskcontroller.c b/src/lib/elm_diskcontroller.c
index b2ff7e0..fa10c0e 100644 (file)
--- a/src/lib/elm_diskcontroller.c
+++ b/src/lib/elm_diskcontroller.c
@@ -24,6 +24,7 @@
 \r
 #include <Elementary.h>\r
 #include "elm_priv.h"\r
+#include "els_scroller.h"\r
 \r
 #ifndef EAPI\r
 #define EAPI __attribute__ ((visibility("default")))\r

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 443f545..b79fa50 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -4,6 +4,7 @@
 
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 /**
  * @defgroup Genlist Genlist

diff --git a/src/lib/elm_hor_scroller.c b/src/lib/elm_hor_scroller.c
index 6b2a34e..a502204 100644 (file)
--- a/src/lib/elm_hor_scroller.c
+++ b/src/lib/elm_hor_scroller.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 /**
  * @defgroup Scroller Scroller

diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index a435f64..1c56503 100644 (file)
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 /**
  * @defgroup Panel Panel

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 05abc03..5bdbe68 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -13,15 +13,6 @@
 # include <Ecore_WinCE.h>
 #endif
 
-#include "els_pan.h"
-#include "els_scroller.h"
-#include "els_box.h"
-#include "els_icon.h"
-#include "els_hor_scroller.h"
-#include "els_touch.h"
-#include "els_webview.h"
-#include "els_webview_container.h"
-
 // FIXME: totally disorganised. clean this up!
 // 
 // Why EAPI in a private header ?

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 1e476a8..64e0c85 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 /**
  * @defgroup Scroller Scroller

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 1f8b5a5..9a3d381 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1,5 +1,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 /**
  * @defgroup Toolbar Toolbar

diff --git a/src/lib/elm_toolbar2.c b/src/lib/elm_toolbar2.c
index d306115..2a77dab 100644 (file)
--- a/src/lib/elm_toolbar2.c
+++ b/src/lib/elm_toolbar2.c
@@ -3,6 +3,7 @@
  */
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
 
 /**
  * @defgroup Toolbar Toolbar

diff --git a/src/lib/els_hor_scroller.c b/src/lib/els_hor_scroller.c
index 4d0a78d..c59b7fb 100644 (file)
--- a/src/lib/els_hor_scroller.c
+++ b/src/lib/els_hor_scroller.c
@@ -1,5 +1,7 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_pan.h"
+#include "els_hor_scroller.h"
 
 #define SMART_NAME "els_hor_scroller"
 #define API_ENTRY Hor_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))

diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c
index 2920180..e24802b 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c
@@ -1,5 +1,7 @@
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "els_scroller.h"
+#include "els_pan.h"
 
 #define SMART_NAME "els_scroller"
 #define API_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))