Remove pepper dependancy

- Pepper is replaced with TBM

Change-Id: I7a58fd454a240b0b7b4263f226887eb4614948ee
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>

diff --git a/packaging/libwidget_viewer.spec b/packaging/libwidget_viewer.spec
index d84f3e5..bb7bdd8 100644 (file)
--- a/packaging/libwidget_viewer.spec
+++ b/packaging/libwidget_viewer.spec
@@ -29,7 +29,6 @@ BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(wayland-client)
 BuildRequires: pkgconfig(libtbm)
-BuildRequires: pkgconfig(libpepper-efl)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(dali-adaptor)
 BuildRequires: pkgconfig(dali-toolkit)

diff --git a/watch-control/src/control.c b/watch-control/src/control.c
index f595fe7..e3f4cb8 100644 (file)
--- a/watch-control/src/control.c
+++ b/watch-control/src/control.c
@@ -111,7 +111,7 @@ static int __watch_screen_get_height()
        return 0;
 }
 
-static void __pepper_cb(const char *app_id, const char *event, Evas_Object *obj, void *data)
+static void __tbm_cb(const char *app_id, const char *event, Evas_Object *obj, void *data)
 {
        int w, h, x, y;
        Evas_Object *surface = obj;
@@ -134,7 +134,7 @@ static void __pepper_cb(const char *app_id, const char *event, Evas_Object *obj,
 
 API int watch_manager_set_resource_id(int resource_id)
 {
-       return _compositor_set_handler_by_rid(resource_id, __pepper_cb, NULL);
+       return _compositor_set_handler_by_rid(resource_id, __tbm_cb, NULL);
 }
 
 API int watch_manager_get_resource_id(Evas_Object *watch, int *resource_id)
@@ -192,7 +192,7 @@ API int watch_manager_get_app_control(const char *app_id, app_control_h *app_con
 
        app_control_set_operation(*app_control, APP_CONTROL_OPERATION_MAIN);
 
-       _compositor_set_handler(app_id, __pepper_cb, NULL);
+       _compositor_set_handler(app_id, __tbm_cb, NULL);
 
        app_control_to_bundle(*app_control, &b);
        if (b) {

diff --git a/widget_toolkit/CMakeLists.txt b/widget_toolkit/CMakeLists.txt
index 5d5cc1f..beee753 100644 (file)
--- a/widget_toolkit/CMakeLists.txt
+++ b/widget_toolkit/CMakeLists.txt
@@ -14,7 +14,6 @@ pkg_check_modules(widget_toolkit REQUIRED
        elementary
        pkgmgr-info
        capi-system-info
-       libpepper-efl
        capi-appfw-application
        aul
        ecore-wayland

diff --git a/widget_toolkit/widget_toolkit.pc.in b/widget_toolkit/widget_toolkit.pc.in
index b2278cf..083a5a1 100644 (file)
--- a/widget_toolkit/widget_toolkit.pc.in
+++ b/widget_toolkit/widget_toolkit.pc.in
@@ -6,7 +6,6 @@ includedir=@INCLUDEDIR@
 Name: widget_toolkit
 Description: Support development of the widget Viewer Library
 Version: @VERSION@
-Requires: libpepper-efl
-Libs: -L${libdir} -lpepper-efl -lwidget_toolkit
+Libs: -L${libdir} -lwidget_toolkit
 Cflags: -I${includedir}
 cppflags: -I${includedir}

diff --git a/widget_viewer_evas/res/widget_viewer_evas.edc b/widget_viewer_evas/res/widget_viewer_evas.edc
index 009e5b8..6e7d194 100644 (file)
--- a/widget_viewer_evas/res/widget_viewer_evas.edc
+++ b/widget_viewer_evas/res/widget_viewer_evas.edc
@@ -51,7 +51,7 @@ collections {
                        }
 
                        part {
-                               name: "pepper,widget";
+                               name: "tbm,widget";
                                type: SWALLOW;
                                description {
                                        state: "default" 0.0;

diff --git a/widget_viewer_evas/src/widget_viewer_evas.c b/widget_viewer_evas/src/widget_viewer_evas.c
index a6a088a..c4aa58e 100644 (file)
--- a/widget_viewer_evas/src/widget_viewer_evas.c
+++ b/widget_viewer_evas/src/widget_viewer_evas.c
@@ -280,7 +280,7 @@ static void widget_object_cb(const char *instance_id, const char *event, Evas_Ob
                DbgPrint("widget added: %s", instance_id);
                evas_object_geometry_get(surface, &x, &y, &w, &h);
                DbgPrint("widget geometry:%d %d %d %d", x, y, w, h);
-               elm_object_part_content_set(info->layout, "pepper,widget", surface);
+               elm_object_part_content_set(info->layout, "tbm,widget", surface);
 
                if (!info->disable_preview)
                        elm_object_signal_emit(info->layout, "disable", "preview");
@@ -298,7 +298,7 @@ static void widget_object_cb(const char *instance_id, const char *event, Evas_Ob
                 */
        } else if (strcmp(event, "removed") == 0) {
                DbgPrint("widget removed: %s", instance_id);
-               elm_object_part_content_set(info->layout, "pepper,widget", NULL);
+               elm_object_part_content_set(info->layout, "tbm,widget", NULL);
 
                if (info->disable_preview)
                        elm_object_signal_emit(info->layout, "enable", "previewe");
@@ -737,7 +737,7 @@ static void resize_cb(void *data, Evas *e, Evas_Object *layout, void *event_info
        } else {
                /**
                 * @note
-                * Layout will be resized, consequently, the pepper object also will be resized.
+                * Layout will be resized, consequently, the tbm object also will be resized.
                 */
        }
 }
@@ -1036,7 +1036,7 @@ EAPI const char *widget_viewer_evas_get_content_info(Evas_Object *widget)
 
 EAPI const char *widget_viewer_evas_get_title_string(Evas_Object *widget)
 {
-       Evas_Object *pepper_obj = NULL;
+       Evas_Object *tbm_obj = NULL;
        const char *title = NULL;
        struct widget_info *info;
 
@@ -1064,8 +1064,8 @@ EAPI const char *widget_viewer_evas_get_title_string(Evas_Object *widget)
                return NULL;
        }
 
-       pepper_obj = elm_object_part_content_get(widget, "pepper,widget");
-       if (!pepper_obj) {
+       tbm_obj = elm_object_part_content_get(widget, "tbm,widget");
+       if (!tbm_obj) {
                set_last_result(WIDGET_ERROR_INVALID_PARAMETER);
                ErrPrint("widget object is invalid");
                return NULL;
@@ -1164,7 +1164,7 @@ EAPI void widget_viewer_evas_cancel_click_event(Evas_Object *widget)
 
        info->cancel_click = 1;
 
-       remote_obj = elm_object_part_content_get(widget, "pepper,widget");
+       remote_obj = elm_object_part_content_get(widget, "tbm,widget");
        if (!remote_obj) {
                set_last_result(WIDGET_ERROR_INVALID_PARAMETER);
                ErrPrint("widget object is invalid");
@@ -1200,7 +1200,7 @@ EAPI int widget_viewer_evas_feed_mouse_up_event(Evas_Object *widget)
                return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
-       remote_obj = elm_object_part_content_get(widget, "pepper,widget");
+       remote_obj = elm_object_part_content_get(widget, "tbm,widget");
        if (!remote_obj) {
                ErrPrint("widget object is invalid");
                return WIDGET_ERROR_INVALID_PARAMETER;
@@ -1428,7 +1428,7 @@ EAPI int widget_viewer_evas_freeze_visibility(Evas_Object *widget, widget_visibi
 {
        struct widget_info *info;
        int ret = 0;
-       Evas_Object *pepper_obj;
+       Evas_Object *tbm_obj;
 
        if (!is_widget_feature_enabled()) {
                return WIDGET_ERROR_NOT_SUPPORTED;
@@ -1450,21 +1450,21 @@ EAPI int widget_viewer_evas_freeze_visibility(Evas_Object *widget, widget_visibi
                return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
-       pepper_obj = elm_object_part_content_get(widget, "pepper,widget");
-       if (!pepper_obj) {
+       tbm_obj = elm_object_part_content_get(widget, "tbm,widget");
+       if (!tbm_obj) {
                ErrPrint("widget object is invalid\n");
                return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
        if (status == WIDGET_VISIBILITY_STATUS_SHOW_FIXED) {
-               ret = _compositor_freeze_visibility(pepper_obj, VISIBILITY_TYPE_UNOBSCURED);
+               ret = _compositor_freeze_visibility(tbm_obj, VISIBILITY_TYPE_UNOBSCURED);
                if (ret < 0) {
                        ErrPrint("Fail to resume the widget(%p):(%d)", widget, ret);
                        return ret;
                }
                info->visibility_freeze = status;
        } else if (status == WIDGET_VISIBILITY_STATUS_HIDE_FIXED) {
-               ret = _compositor_freeze_visibility(pepper_obj, VISIBILITY_TYPE_FULLY_OBSCURED);
+               ret = _compositor_freeze_visibility(tbm_obj, VISIBILITY_TYPE_FULLY_OBSCURED);
                if (ret < 0) {
                        ErrPrint("Fail to pause the widget(%p):(%d)", widget, ret);
                        return ret;
@@ -1482,7 +1482,7 @@ EAPI int widget_viewer_evas_freeze_visibility(Evas_Object *widget, widget_visibi
 EAPI int widget_viewer_evas_thaw_visibility(Evas_Object *widget)
 {
        struct widget_info *info;
-       Evas_Object *pepper_obj;
+       Evas_Object *tbm_obj;
 
        if (!is_widget_feature_enabled())
                return WIDGET_ERROR_NOT_SUPPORTED;
@@ -1503,13 +1503,13 @@ EAPI int widget_viewer_evas_thaw_visibility(Evas_Object *widget)
                return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
-       pepper_obj = elm_object_part_content_get(widget, "pepper,widget");
-       if (!pepper_obj) {
+       tbm_obj = elm_object_part_content_get(widget, "tbm,widget");
+       if (!tbm_obj) {
                ErrPrint("widget object is invalid\n");
                return WIDGET_ERROR_INVALID_PARAMETER;
        }
 
-       _compositor_thaw_visibility(pepper_obj);
+       _compositor_thaw_visibility(tbm_obj);
        info->visibility_freeze = 0;
 
        return WIDGET_ERROR_NONE;