From 67d8bd6e343ec14f4c50fae5392a3816dde1732c Mon Sep 17 00:00:00 2001 From: Daniel Zaoui Date: Thu, 24 Apr 2014 11:04:35 +0300 Subject: [PATCH] FlipSelector: fix callback type. Evas_Smart_Cb was used in legacy while flipselector_func_type was used in Eo. That made the compilation failing in E. --- legacy/elementary/src/lib/elm_flipselector.c | 4 ++-- legacy/elementary/src/lib/elm_flipselector.eo | 4 ++-- legacy/elementary/src/lib/elm_flipselector_eo.h | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/legacy/elementary/src/lib/elm_flipselector.c index cd09946ef4..9c5cd5d202 100644 --- a/legacy/elementary/src/lib/elm_flipselector.c +++ b/legacy/elementary/src/lib/elm_flipselector.c @@ -629,7 +629,7 @@ _elm_flipselector_flip_prev(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *sd) } EOLIAN static Elm_Object_Item * -_elm_flipselector_item_append(Eo *obj, Elm_Flipselector_Data *sd, const char *label, flipselector_func_type func, const void *data) +_elm_flipselector_item_append(Eo *obj, Elm_Flipselector_Data *sd, const char *label, Evas_Smart_Cb func, const void *data) { Elm_Flipselector_Item *item; @@ -658,7 +658,7 @@ _elm_flipselector_item_append(Eo *obj, Elm_Flipselector_Data *sd, const char *la } EOLIAN static Elm_Object_Item * -_elm_flipselector_item_prepend(Eo *obj, Elm_Flipselector_Data *sd, const char *label, flipselector_func_type func, void *data) +_elm_flipselector_item_prepend(Eo *obj, Elm_Flipselector_Data *sd, const char *label, Evas_Smart_Cb func, void *data) { Elm_Flipselector_Item *item; diff --git a/legacy/elementary/src/lib/elm_flipselector.eo b/legacy/elementary/src/lib/elm_flipselector.eo index e4d22a5f3c..f06e4f2f44 100644 --- a/legacy/elementary/src/lib/elm_flipselector.eo +++ b/legacy/elementary/src/lib/elm_flipselector.eo @@ -135,7 +135,7 @@ class Elm_Flipselector (Elm_Layout) return Elm_Object_Item *; params { @in const char *label; /*@ The (text) label of the new item */ - @in flipselector_func_type func; /*@ Convenience callback function to take place when + @in Evas_Smart_Cb func; /*@ Convenience callback function to take place when item is selected */ @in void *data; /*@ Data passed to @p func, above */ } @@ -174,7 +174,7 @@ class Elm_Flipselector (Elm_Layout) return Elm_Object_Item *; params { @in const char *label; /*@ The (text) label of the new item */ - @in flipselector_func_type func; /*@ Convenience callback function to take place when + @in Evas_Smart_Cb func; /*@ Convenience callback function to take place when item is selected */ @in const void *data; /*@ Data passed to @p func, above */ } diff --git a/legacy/elementary/src/lib/elm_flipselector_eo.h b/legacy/elementary/src/lib/elm_flipselector_eo.h index 2219554b4e..8a2bc09856 100644 --- a/legacy/elementary/src/lib/elm_flipselector_eo.h +++ b/legacy/elementary/src/lib/elm_flipselector_eo.h @@ -1,3 +1 @@ -typedef void (*flipselector_func_type)(void *, Evas_Object *, void *); - -#include "elm_flipselector.eo.h" \ No newline at end of file +#include "elm_flipselector.eo.h"