Sync with the tizen 2.4

Change-Id: I4ce2a6e9647529a2536239bd90a7d7740c2b4e07
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>

diff --git a/packaging/libwidget_viewer.spec b/packaging/libwidget_viewer.spec
index fb3275f..641e1e4 100644 (file)
--- a/packaging/libwidget_viewer.spec
+++ b/packaging/libwidget_viewer.spec
@@ -96,7 +96,7 @@ License: Flora License, Version 1.1
 Provider APIs to develop the widget viewer EFL application.
 
 %package -n %{name}_evas-devel
-Summary: widget provider application development library (dev) (EFL version)
+Summary: Widget provider application development library (dev) (EFL version)
 Group: Development/Libraries
 Requires: %{name}_evas
 
@@ -107,7 +107,7 @@ Header & package configuration files to support development of the widget viewer
 %postun -n %{name}_evas -p /sbin/ldconfig
 
 #################################################
-# libwidget_viewer_sdk
+# org.tizen.widget_viewer_sdk
 %package -n org.tizen.widget_viewer_sdk
 Summary: The widget viewer for development using SDK(IDE)
 Version: 0.0.1

diff --git a/widget_viewer_sdk/CMakeLists.txt b/widget_viewer_sdk/CMakeLists.txt
index c799994..2060235 100644 (file)
--- a/widget_viewer_sdk/CMakeLists.txt
+++ b/widget_viewer_sdk/CMakeLists.txt
@@ -34,7 +34,6 @@ INCLUDE(FindPkgConfig)
 pkg_check_modules(sdk_pkgs REQUIRED
        capi-appfw-application
        appcore-efl
-       ecore-x
        ecore
        evas
        edje

diff --git a/widget_viewer_sdk/src/main.c b/widget_viewer_sdk/src/main.c
index e06bc5b..99b3b81 100644 (file)
--- a/widget_viewer_sdk/src/main.c
+++ b/widget_viewer_sdk/src/main.c
@@ -253,7 +253,7 @@ static void list_item_clicked_cb(void *data, Evas_Object *obj, void *event_info)
        int w;
        int h;
 
-       if (widget_service_get_size(s_info.ctx.size_types[(int)data], &w, &h) != WIDGET_ERROR_NONE) {
+       if (widget_service_get_size(s_info.ctx.size_types[(long)data], &w, &h) != WIDGET_ERROR_NONE) {
                return;
        }
 
@@ -378,7 +378,7 @@ static char *list_item_text_get_cb(void *data, Evas_Object *obj, const char *par
        int w;
        int h;
 
-       ret = widget_service_get_size(s_info.ctx.size_types[(int)data], &w, &h);
+       ret = widget_service_get_size(s_info.ctx.size_types[(long)data], &w, &h);
        if (ret != WIDGET_ERROR_NONE) {
                return strdup("Invalid");
        }
@@ -396,7 +396,7 @@ static Evas_Object *list_item_content_get_cb(void *data, Evas_Object *obj, const
 
        widget_id = widget_viewer_evas_get_widget_id(s_info.ctx.widget);
 
-       icon_filename = widget_service_get_preview_image_path(widget_id, s_info.ctx.size_types[(int)data]);
+       icon_filename = widget_service_get_preview_image_path(widget_id, s_info.ctx.size_types[(long)data]);
        if (icon_filename) {
                icon = elm_icon_add(s_info.win);
                if (icon) {
@@ -416,7 +416,7 @@ static int prepare_widget(const char *widget_id, app_control_h control)
        int ret;
        Evas_Object *size_list;
        Elm_Object_Item *item;
-       int i;
+       long i;
        int w;
        int h;
        bundle *b;