shell: support version 5 and fix warning

Change-Id: I983671cb414c334595bb66ab97c11d82a691c251
Signed-off-by: Sangjin Lee <lsj119@samsung.com>

diff --git a/src/examples/pepper_efl_simple.c b/src/examples/pepper_efl_simple.c
index 8a84a543f979651859f61d2c55a63f6bb386dc2f..a4b54b986a476270f68507c002c2d7ab1d9dd32c 100644 (file)
--- a/src/examples/pepper_efl_simple.c
+++ b/src/examples/pepper_efl_simple.c
@@ -9,18 +9,11 @@ typedef struct
    Evas_Object *win;
 } app_data;
 
-static void
-_close_cb(void *data, Evas_Object *obj, void *event_info)
-{
-   elm_exit();
-}
-
 static void
 _add_object_cb (void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Coord x, y, w,h;
    Evas_Object *img = event_info;
-   app_data *d = data;
 
    evas_object_geometry_get(img, &x, &y, &w, &h);
    fprintf(stderr, "[ECOMP] _add_object_cb %p:%p(%dx%d+%d+%d)\n",obj, img, w, h, x, y);
@@ -67,9 +60,7 @@ elm_main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
    app_data *d;
    Evas_Object *win;
    const char *comp_name;
-   char border_path[64];
    int ret = EXIT_FAILURE;
-   int i, j;
 
    d = calloc(1, sizeof(app_data));
 

diff --git a/src/examples/touch_sample.c b/src/examples/touch_sample.c
index 87a05a54db7002c21b317d10a91cd2d6a8c09099..18fac05affba25b8ca0456016a04feab0f38e0da 100644 (file)
--- a/src/examples/touch_sample.c
+++ b/src/examples/touch_sample.c
@@ -53,7 +53,7 @@ int
 main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
 {
    Evas_Object *win;
-   Evas_Object *button, *rect;
+   Evas_Object *button, *rect=NULL;
    Evas_Object *bx;
 
    elm_init(argc, argv);
@@ -66,6 +66,13 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
    elm_win_resize_object_add(win, bx);
    evas_object_show(bx);
 
+   rect = evas_object_rectangle_add(win);
+   evas_object_color_set(rect, 125, 0, 0, 255);
+   evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx, rect);
+   evas_object_show(rect);
+
    button = elm_button_add(win);
    evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -74,13 +81,6 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
    evas_object_event_callback_add(button, EVAS_CALLBACK_MOUSE_UP, bt_cb, rect);
    evas_object_show(button);
 
-   rect = evas_object_rectangle_add(win);
-   evas_object_color_set(rect, 125, 0, 0, 255);
-   evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_box_pack_end(bx, rect);
-   evas_object_show(rect);
-
    elm_run();
    elm_shutdown();
 

diff --git a/src/lib/object.c b/src/lib/object.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/lib/output.c b/src/lib/output.c
index 364d4457833979e8a803092215eb9fc7ebfccc7f..1fd97c57a20cc29869dc44a23c381d0e34345407 100644 (file)
--- a/src/lib/output.c
+++ b/src/lib/output.c
@@ -103,7 +103,6 @@ static void
 _pepper_efl_output_cb_render_post(void *data, Evas *e EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    pepper_efl_output_t *output = data;
-   pepper_efl_surface_t *es;
    struct timespec     ts;
 
    DBG("render post");
@@ -152,10 +151,11 @@ end:
 }
 
 static void
-_pepper_efl_output_flush_surface(void *o, pepper_surface_t *surface)
+_pepper_efl_output_flush_surface(void *o, pepper_surface_t *surface, pepper_bool_t *keep_buffer)
 {
    (void)o;
    (void)surface;
+   (void)keep_buffer;
 }
 
 static const struct pepper_output_backend output_interface =

diff --git a/src/lib/shell.c b/src/lib/shell.c
index 7198e2b7511ad791ec4d9aa8b2f0f09c0f4616e0..b28301a1d6eead59ea330fe76b78f17bbefcade9 100644 (file)
--- a/src/lib/shell.c
+++ b/src/lib/shell.c
@@ -206,6 +206,12 @@ static const struct xdg_surface_interface xdg_surface_implementation =
    xdg_surface_set_minimized,
 };
 
+static void xdg_shell_cb_destroy(struct wl_client *client,
+         struct wl_resource *resource)
+{
+   DBG("-");
+}
+
 static void
 xdg_shell_cb_use_unstable_version(struct wl_client *client, struct wl_resource *resource, int32_t version)
 {
@@ -278,7 +284,7 @@ err:
 }
 
 static void
-xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface_resource, struct wl_resource *parent_resource, struct wl_resource *seat_resource, uint32_t serial, int32_t x, int32_t y, uint32_t flags)
+xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface_resource, struct wl_resource *parent_resource, struct wl_resource *seat_resource, uint32_t serial, int32_t x, int32_t y)
 {
    DBG("-");
 }
@@ -290,6 +296,7 @@ xdg_shell_cb_pong(struct wl_client *client, struct wl_resource *resource, uint32
 }
 
 static const struct xdg_shell_interface xdg_implementation = {
+   xdg_shell_cb_destroy,
    xdg_shell_cb_use_unstable_version,
    xdg_shell_cb_surface_get,
    xdg_shell_cb_popup_get,