[Widget-viewer-evas] Fixed build error

Change-Id: I6b736050aa53cd31e3f6d7b3c2c04e459fdad1a3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8605f2e2fb2eea19246cc7d0ffebf01ced30b34..6af271453e6df7c96cf9d561449bd834404c6080 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
+ADD_SUBDIRECTORY(widget_viewer)
 ADD_SUBDIRECTORY(widget_viewer_evas)
 ADD_SUBDIRECTORY(widget_viewer_sdk)
 

diff --git a/packaging/libwidget_viewer.spec b/packaging/libwidget_viewer.spec
index 0a2704fe195081a4f0f521c29723580951532cb5..87b25a781b1724fde6dc9ca51ea2705b5cca282b 100644 (file)
--- a/packaging/libwidget_viewer.spec
+++ b/packaging/libwidget_viewer.spec
@@ -7,7 +7,7 @@ Release: 1
 Group: Applications/Core Applications
 License: Flora-1.1
 Source0: %{name}-%{version}.tar.gz
-Source1001: %{name}.manifest
+Source1001: %{name}_evas.manifest
 Source1002: org.tizen.widget_viewer_sdk.manifest
 BuildRequires: cmake, gettext-tools, coreutils, edje-bin
 BuildRequires: pkgconfig(dlog)
@@ -27,6 +27,7 @@ BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(wayland-client)
 BuildRequires: pkgconfig(libtbm)
+BuildRequires: pkgconfig(libpepper-efl)
 
 %description
 API for creating a new instance of the widget and managing its life-cycle.
@@ -56,13 +57,11 @@ rm -rf %{buildroot}
 %postun -n %{name} -p /sbin/ldconfig
 
 %files -n %{name}
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so*
 %{_datarootdir}/license/%{name}
 
 %files devel
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/widget_viewer/widget_viewer.h
 %{_libdir}/pkgconfig/widget_viewer.pc
@@ -104,13 +103,13 @@ While developing the widget applications, this viewer will load it and execute i
 %postun -n org.tizen.widget_viewer_sdk -p /sbin/ldconfig
 
 %files -n %{name}_evas
-%manifest %{name}.manifest
+%manifest %{name}_evas.manifest
 %defattr(-,root,root,-)
 %{_libdir}/%{name}_evas.so*
 %{_datarootdir}/license/%{name}_evas
 
 %files -n %{name}_evas-devel
-%manifest %{name}.manifest
+%manifest %{name}_evas.manifest
 %defattr(-,root,root,-)
 %{_includedir}/widget_viewer_evas/widget_viewer_evas.h
 %{_libdir}/pkgconfig/widget_viewer_evas.pc

diff --git a/packaging/libwidget_viewer_evas.spec b/packaging/libwidget_viewer_evas.spec
index 1cc42a3f6ef6b4c1e7fce4eca7f5315da7412764..bc064351a739612940418eb38d4fb1764f63567a 100644 (file)
--- a/packaging/libwidget_viewer_evas.spec
+++ b/packaging/libwidget_viewer_evas.spec
@@ -7,7 +7,7 @@ Release: 1
 Group: Applications/Core Applications
 License: Flora-1.1
 Source0: %{name}-%{version}.tar.gz
-Source1001: %{name}.manifest
+Source1001: %{name}_evas.manifest
 Source1002: org.tizen.widget_viewer_sdk.manifest
 BuildRequires: cmake, gettext-tools, coreutils, edje-bin
 BuildRequires: pkgconfig(dlog)
@@ -27,6 +27,7 @@ BuildRequires: pkgconfig(capi-system-info)
 BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(wayland-client)
 BuildRequires: pkgconfig(libtbm)
+BuildRequires: pkgconfig(libpepper-efl)
 
 %description
 Provider APIs to develop the widget viewer EFL application.
@@ -56,13 +57,11 @@ rm -rf %{buildroot}
 %postun -n %{name} -p /sbin/ldconfig
 
 %files -n %{name}
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/%{name}.so*
 %{_datarootdir}/license/%{name}
 
 %files devel
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_includedir}/widget_viewer/widget_viewer.h
 %{_libdir}/pkgconfig/widget_viewer.pc

diff --git a/widget_viewer/CMakeLists.txt b/widget_viewer/CMakeLists.txt
index bc2d2f2df9d07421274601a5021e75ee4f0043ea..711900a0bb65cfcbfb04a2a897d7571c8bdfeccb 100644 (file)
--- a/widget_viewer/CMakeLists.txt
+++ b/widget_viewer/CMakeLists.txt
@@ -44,7 +44,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-               
+
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/widget_viewer.h DESTINATION include/${PROJECT_NAME})
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}")

diff --git a/widget_viewer_evas/CMakeLists.txt b/widget_viewer_evas/CMakeLists.txt
index f823937e02e72d8ea739ac8943d93c19a99e2f0e..0c66b27c74f2498e8daf7d23bcb306fb69871858 100644 (file)
--- a/widget_viewer_evas/CMakeLists.txt
+++ b/widget_viewer_evas/CMakeLists.txt
@@ -19,6 +19,7 @@ pkg_check_modules(viewer_evas REQUIRED
        elementary
        pkgmgr-info
        capi-system-info
+       libpepper-efl
 )
 
 SET(BUILD_SOURCE

diff --git a/widget_viewer_evas/src/widget_viewer_evas.c b/widget_viewer_evas/src/widget_viewer_evas.c
index 6b341daf200c238e68c57bef9a76d7669cba394c..45dbab486bbfb84003c81bf83438b89df21245ea 100644 (file)
--- a/widget_viewer_evas/src/widget_viewer_evas.c
+++ b/widget_viewer_evas/src/widget_viewer_evas.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <glib.h>
 
 #include <Elementary.h>
 #include <Ecore.h>
@@ -35,8 +36,6 @@
 #include <widget_instance.h>
 #include <Pepper_Efl.h>
 
-#include "util.h"
-
 #if defined(LOG_TAG)
 #undef LOG_TAG
 #endif
@@ -134,7 +133,7 @@ static struct info {
        int w;
        int h;
        Evas_Object *win;
-       char *compositor_name;
+       const char *compositor_name;
        GHashTable *widget_table;
 } s_info = {
        .w = 0,
@@ -301,8 +300,8 @@ static void del_cb(void *data, Evas *e, Evas_Object *layout, void *event_info)
 {
        struct widget_info *info = data;
 
-       if (info->pid > 0) {
-               widget_instance_terminate(info->pid);
+       if (info->widget_id && info->instance_id) {
+               widget_instance_terminate(info->widget_id, info->instance_id);
                info->pid = 0;
        }
 
@@ -316,7 +315,7 @@ static void del_cb(void *data, Evas *e, Evas_Object *layout, void *event_info)
        free(info->widget_id);
        free(info->instance_id);
        free(info->content_info);
-       bundle_del(info->b);
+       bundle_free(info->b);
        free(info);
 }
 
@@ -406,10 +405,10 @@ static inline struct widget_info *create_info(Evas_Object *parent, const char *w
 
 EAPI Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char *widget_id, const char *content_info, double period)
 {
-       char buf[256];
        char *instance_id = NULL;
        bundle *b = NULL;
        struct widget_info *info = NULL;
+       const bundle_raw *bundle_info = NULL;
 
        if (!is_widget_feature_enabled()) {
                ErrPrint("Widget Feature is disabled\n");
@@ -417,20 +416,21 @@ EAPI Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char
        }
 
        if (content_info) {
-               b = bundle_decode(content_info, strlen(content_info));
+               bundle_info = (bundle_raw *) content_info;
+               b = bundle_decode(bundle_info, strlen(content_info));
                if (b == NULL) {
                        ErrPrint("Invalid content format: [%s]\n", content_info);
                }
        }
 
        if (b) {
-               instance_id = bundle_get_val(b, WIDGET_K_INSTANCE);
+               bundle_get_str(b, WIDGET_K_INSTANCE, &instance_id);
        }
 
        if (!instance_id) {
                if (widget_instance_create(widget_id, &instance_id) < 0) {
                        if (b) {
-                               bundle_del(b);
+                               bundle_free(b);
                        }
                        return NULL;
                }
@@ -439,7 +439,7 @@ EAPI Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char
                        ErrPrint("Failed to get instance_id: %s\n", widget_id);
                        widget_instance_destroy(widget_id, instance_id);
                        if (b) {
-                               bundle_del(b);
+                               bundle_free(b);
                        }
                        return NULL;
                }
@@ -449,7 +449,7 @@ EAPI Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char
                        ErrPrint("Unable to create an information object\n");
                        widget_instance_destroy(widget_id, instance_id);
                        if (b) {
-                               bundle_del(b);
+                               bundle_free(b);
                        }
                        return NULL;
                }
@@ -464,7 +464,7 @@ EAPI Evas_Object *widget_viewer_evas_add_widget(Evas_Object *parent, const char
                        info = create_info(parent, widget_id, instance_id, content_info);
                        if (!info) {
                                if (b) {
-                                       bundle_del(b);
+                                       bundle_free(b);
                                }
                                return NULL;
                        }
@@ -512,7 +512,7 @@ EAPI int widget_viewer_evas_resume_widget(Evas_Object *widget)
 static int foreach_cb(widget_instance_h handle, void *data)
 {
        struct widget_info *info = data;
-       char *content_info = NULL;
+       bundle_raw *content_info = NULL;
        int content_len = 0;
        bundle *b = NULL;
 
@@ -529,7 +529,7 @@ static int foreach_cb(widget_instance_h handle, void *data)
        }
 
        free(info->content_info);
-       info->content_info = content_info;
+       info->content_info = (char *)content_info;
        return 0;
 }
 
@@ -635,7 +635,7 @@ EAPI void widget_viewer_evas_disable_preview(Evas_Object *widget)
        struct widget_info *info;
 
        if (!is_widget_feature_enabled()) {
-               return WIDGET_ERROR_NOT_SUPPORTED;
+               return;
        }
 
        info = evas_object_data_get(widget, WIDGET_INFO_TAG);
@@ -659,7 +659,7 @@ EAPI void widget_viewer_evas_disable_overlay_text(Evas_Object *widget)
        struct widget_info *info;
 
        if (!is_widget_feature_enabled()) {
-               return WIDGET_ERROR_NOT_SUPPORTED;
+               return;
        }
 
        info = evas_object_data_get(widget, WIDGET_INFO_TAG);