* elementary: fix Ecore API changes.

SVN revision: 49860

diff --git a/configure.ac b/configure.ac
index 5e71d32..b289d1a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -169,6 +169,7 @@ PKG_CHECK_MODULES([ELEMENTARY],
     ecore >= 0.9.9
     ecore-evas >= 0.9.9
     ecore-file >= 0.9.9
+    ecore-imf >= 0.9.9
     edje >= 0.9.9
    ]
 )

diff --git a/src/bin/config.c b/src/bin/config.c
index f700cc5..a01afb2 100644 (file)
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -651,11 +651,11 @@ status_win(void)
    evas_object_show(win);
 }
 
-static int
+static Eina_Bool
 _exit_timer(void *data)
 {
    elm_exit();
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 /* this is your elementary main function - it MUSt be called IMMEDIATELY

diff --git a/src/bin/test_anim.c b/src/bin/test_anim.c
index 42f220d..f7a0661 100644 (file)
--- a/src/bin/test_anim.c
+++ b/src/bin/test_anim.c
@@ -17,7 +17,7 @@ _del(void *data, Evas *evas, Evas_Object *obj, void *event_info)
    ecore_animator_del(ani);
 }
 
-static int
+static Eina_Bool
 anim(void *data)
 {
    Evas_Object *win = data;
@@ -57,7 +57,7 @@ anim(void *data)
         evas_object_move(sh, x, y);
         evas_object_resize(sh, w, h);
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 void

diff --git a/src/bin/test_floating.c b/src/bin/test_floating.c
index 28abf34..10e7199 100644 (file)
--- a/src/bin/test_floating.c
+++ b/src/bin/test_floating.c
@@ -39,7 +39,7 @@ gl_sel(void *data, Evas_Object *obj, void *event_info)
    printf("sel item data [%p] on genlist obj [%p], item pointer [%p]\n", data, obj, event_info);
 }
 
-static int
+static Eina_Bool
 anim(void *data)
 {
    Evas_Object *gl = data;
@@ -48,7 +48,7 @@ anim(void *data)
    y = 0;
    x = (sin(ecore_loop_time_get()) * 500);
    evas_object_move(gl, x, y);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void

diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index f0c24c5..c70588b 100644 (file)
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -15,7 +15,7 @@ typedef struct Progressbar
 
 static Progressbar _test_progressbar;
 
-static int
+static Eina_Bool
 _my_progressbar_value_set (void *data)
 {
    double progress;

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 94ea598..26f1f98 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -69,6 +69,7 @@
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Ecore_File.h>
+#include <Ecore_IMF.h>
 #include <Edje.h>
 
 #ifdef ELM_EDBUS

diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 90a2e09..fceded7 100644 (file)
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -172,7 +172,7 @@ _contract_req(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 }
 
 /***  PRIVATES  ***/
-static int
+static Eina_Bool
 _sel_do(void *data)
 {
    struct sel_data *sd;

diff --git a/src/lib/elc_notepad.c b/src/lib/elc_notepad.c
index 743303e..dd82b51 100644 (file)
--- a/src/lib/elc_notepad.c
+++ b/src/lib/elc_notepad.c
@@ -200,14 +200,14 @@ _save(Evas_Object *obj)
      }
 }
 
-static int
+static Eina_Bool
 _delay_write(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    _save(data);
    wd->delay_write = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 506c2de..037cbb5 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -161,7 +161,7 @@ _signal_clicked(void *data, Evas_Object *obj, const char *emission, const char *
    _signal_unpressed(data, obj, emission, source); /* safe guard when the theme does not emit the 'unpress' signal */
 }
 
-static int
+static Eina_Bool
 _autorepeat_send(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
@@ -177,7 +177,7 @@ _autorepeat_send(void *data)
    return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _autorepeat_initial_send(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);

diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index 9f8ee87..f30b97f 100644 (file)
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -38,9 +38,9 @@ struct _Widget_Data
 static const char *widtype = NULL;
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
-static int _ticker(void *data);
-static int _signal_clock_val_up(void *data);
-static int _signal_clock_val_down(void *data);
+static Eina_Bool _ticker(void *data);
+static Eina_Bool _signal_clock_val_up(void *data);
+static Eina_Bool _signal_clock_val_down(void *data);
 static void _time_update(Evas_Object *obj);
 
 static void
@@ -83,7 +83,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
      edje_object_signal_emit(wd->clk, "elm,action,unfocus", "elm");
 }
 
-static int
+static Eina_Bool
 _ticker(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
@@ -91,7 +91,7 @@ _ticker(void *data)
    struct timeval timev;
    struct tm *tm;
    time_t tt;
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    gettimeofday(&timev, NULL);
    t = ((double)(1000000 - timev.tv_usec)) / 1000000.0;
    wd->ticker = ecore_timer_add(t, _ticker, data);
@@ -108,10 +108,10 @@ _ticker(void *data)
             _time_update(data);
          }
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _signal_clock_val_up(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
@@ -163,7 +163,7 @@ clock_val_up_cancel:
    return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _signal_clock_val_down(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);

diff --git a/src/lib/elm_cnp_helper.c b/src/lib/elm_cnp_helper.c
index a4ea838..b8bc276 100644 (file)
--- a/src/lib/elm_cnp_helper.c
+++ b/src/lib/elm_cnp_helper.c
@@ -72,8 +72,8 @@ static const struct escapes {
 
 
 static Eina_Bool _elm_cnp_init(void);
-static int selection_clear(void *udata __UNUSED__, int type, void *event);
-static int selection_notify(void *udata __UNUSED__, int type, void *event);
+static Eina_Bool selection_clear(void *udata __UNUSED__, int type, void *event);
+static Eina_Bool selection_notify(void *udata __UNUSED__, int type, void *event);
 static char *remove_tags(const char *p, int *len);
 static char *mark_up(const char *start, int *lenp);
 
@@ -226,7 +226,7 @@ _elm_cnp_init(void){
     return true;
 }
 
-static int
+static Eina_Bool
 selection_clear(void *udata __UNUSED__, int type, void *event){
    Ecore_X_Event_Selection_Clear *ev = event;
    struct _elm_cnp_selection *sel;
@@ -237,20 +237,20 @@ selection_clear(void *udata __UNUSED__, int type, void *event){
        if (selections[i].ecore_sel == ev->selection) break;
      }
    /* Not me... Don't care */
-   if (i == ELM_SEL_MAX) return true;
+   if (i == ELM_SEL_MAX) return ECORE_CALLBACK_PASS_ON;
 
    sel = selections + i;
    sel->active = 0;
    sel->widget = NULL;
    sel->selbuf = NULL;
 
-   return true;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /**
  * Response to a selection notify
  */
-static int
+static Eina_Bool
 selection_notify(void *udata __UNUSED__, int type, void *event){
    Ecore_X_Event_Selection_Notify *ev = event;
    struct _elm_cnp_selection *sel;
@@ -268,7 +268,7 @@ selection_notify(void *udata __UNUSED__, int type, void *event){
         sel = selections + ELM_SEL_SECONDARY;
         break;
       default:
-        return 1;
+        return ECORE_CALLBACK_PASS_ON;
    }
 
    for (i = 0 ; i < CNP_N_ATOMS ; i ++)
@@ -283,7 +283,7 @@ selection_notify(void *udata __UNUSED__, int type, void *event){
          }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 44b36be..a8315e3 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -43,7 +43,7 @@ static const char *_atom_names[ATOM_COUNT] =
 #define ATOM_E_CONFIG 4
 
 static Eina_Bool _prop_config_get(void);
-static int _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
+static Eina_Bool _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
 
 static Eina_Bool
 _prop_config_get(void)
@@ -51,8 +51,9 @@ _prop_config_get(void)
    int size = 0;
    Ecore_X_Atom atom;
    char buf[512];
-   unsigned char *data = NULL, *config_data;
-   
+   unsigned char *data = NULL;
+   Elm_Config *config_data;
+
    snprintf(buf, sizeof(buf), "ENLIGHTENMENT_CONFIG_%s", _elm_profile);
    atom = ecore_x_atom_get(buf);
    _atom_config = atom;
@@ -85,7 +86,7 @@ _prop_config_get(void)
    return EINA_TRUE;
 }
 
-static int
+static Eina_Bool
 _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_X_Event_Window_Property *event = ev;
@@ -171,7 +172,7 @@ _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
              _prop_config_get();
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 #endif
 

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 03f35fa..9d26116 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -29,7 +29,7 @@ static const char *widtype = NULL;
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
-static int _prop_change(void *data, int type, void *event);
+static Eina_Bool _prop_change(void *data, int type, void *event);
 
 /* local functions */
 static void 
@@ -139,13 +139,13 @@ _autoscroll_mode_disable(Evas_Object *obj)
 }
 */
 
-static int 
+static Eina_Bool
 _prop_change(void *data, int type __UNUSED__, void *event) 
 {
 #ifdef HAVE_ELEMENTARY_X
    Ecore_X_Event_Window_Property *ev;
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return 1;
+   if (!wd) return ECORE_CALLBACK_PASS_ON;
    ev = event;
    if (ev->atom == ECORE_X_ATOM_E_ILLUME_ZONE) 
      {
@@ -197,7 +197,7 @@ _prop_change(void *data, int type __UNUSED__, void *event)
      }
 #endif
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /**

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 7327c5a..2efc359 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -530,14 +530,14 @@ _item_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
    if (it->func) it->func(it->data, obj2, NULL);
 }
 
-static int
+static Eina_Bool
 _long_press(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    Evas_Object *top;
    const Eina_List *l;
    const Elm_Entry_Context_Menu_Item *it;
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    if ((wd->api) && (wd->api->obj_longpress))
      {
         wd->api->obj_longpress(data);
@@ -604,7 +604,7 @@ _long_press(void *data)
      }
    wd->longpress_timer = NULL;
    evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1171,13 +1171,13 @@ _signal_mouse_double(void *data, Evas_Object *obj __UNUSED__, const char *emissi
 }
 
 #ifdef HAVE_ELEMENTARY_X
-static int
+static Eina_Bool
 _event_selection_notify(void *data, int type __UNUSED__, void *event)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    Ecore_X_Event_Selection_Notify *ev = event;
-   if (!wd) return 1;
-   if (!wd->selection_asked) return 1;
+   if (!wd) return ECORE_CALLBACK_PASS_ON;
+   if (!wd->selection_asked) return ECORE_CALLBACK_PASS_ON;
 
    if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) ||
        (ev->selection == ECORE_X_SELECTION_PRIMARY))
@@ -1200,10 +1200,10 @@ _event_selection_notify(void *data, int type __UNUSED__, void *event)
          }
        wd->selection_asked = EINA_FALSE;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _event_selection_clear(void *data, int type __UNUSED__, void *event)
 {
    Widget_Data *wd = elm_widget_data_get(data);
@@ -1217,7 +1217,7 @@ _event_selection_clear(void *data, int type __UNUSED__, void *event)
        elm_entry_select_none(data);
      }
    return 1;*/
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 #endif
 

diff --git a/src/lib/elm_flip.c b/src/lib/elm_flip.c
index 0bca0b3..e82023a 100644 (file)
--- a/src/lib/elm_flip.c
+++ b/src/lib/elm_flip.c
@@ -114,7 +114,7 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
      }
 }
 
-static int
+static Eina_Bool
 _flip(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -124,11 +124,11 @@ _flip(Evas_Object *obj)
    Evas_Map *mf, *mb;
    Evas_Coord cx, cy, px, py, foc;
    int lx, ly, lz, lr, lg, lb, lar, lag, lab;
-   if (!wd->animator) return 0;
+   if (!wd->animator) return ECORE_CALLBACK_CANCEL;
    t = t / wd->len;
    if (t > 1.0) t = 1.0;
 
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    evas_object_geometry_get(obj, &x, &y, &w, &h);
 
    mf = evas_map_new(4);
@@ -228,9 +228,9 @@ _flip(Evas_Object *obj)
         wd->state = !wd->state;
         _configure(obj);
         evas_object_smart_callback_call(obj, "animate,done", NULL);
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -267,7 +267,7 @@ _resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event
    _configure(obj);
 }
 
-static int
+static Eina_Bool
 _animate(void *data)
 {
    return _flip(data);

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 3fa4b63..9763b01 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -319,16 +319,16 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf
      }
 }
 
-static int
+static Eina_Bool
 _long_press(void *data)
 {
    Elm_Gengrid_Item *item = data;
 
    item->long_timer = NULL;
-   if ((item->disabled) || (item->dragging)) return 0;
+   if ((item->disabled) || (item->dragging)) return ECORE_CALLBACK_CANCEL;
    item->wd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(item->wd->self, "longpressed", item);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index fac0cff..123409a 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -661,16 +661,16 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_inf
      }
 }
 
-static int
+static Eina_Bool
 _long_press(void *data)
 {
    Elm_Genlist_Item *it = data;
 
    it->long_timer = NULL;
-   if ((it->disabled) || (it->dragging)) return 0;
+   if ((it->disabled) || (it->dragging)) return ECORE_CALLBACK_CANCEL;
    it->wd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(it->wd->obj, "longpressed", it);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1732,7 +1732,7 @@ _queue_proecess(Widget_Data *wd, int norender)
    return n;
 }
 
-static int
+static Eina_Bool
 _item_idler(void *data)
 {
    Widget_Data *wd = data;
@@ -1745,9 +1745,9 @@ _item_idler(void *data)
    if (!wd->queue)
      {
        wd->queue_idler = NULL;
-       return 0;
+       return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 48c547f..46e568d 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -247,16 +247,16 @@ _index_box_clear(Evas_Object *obj, Evas_Object *box __UNUSED__, int level)
    wd->level_active[level] = 0;
 }
 
-static int
+static Eina_Bool
 _delay_change(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    void *d;
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->delay = NULL;
    d = (void *)elm_index_item_selected_get(data, wd->level);
    if (d) evas_object_smart_callback_call(data, "delay,changed", d);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 40300f1..0d4877c 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -372,18 +372,18 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
      }
 }
 
-static int
+static Eina_Bool
 _long_press(void *data)
 {
    Elm_List_Item *it = data;
    Widget_Data *wd = elm_widget_data_get(it->obj);
 
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    it->long_timer = NULL;
    ELM_LIST_ITEM_CHECK_DELETED_RETURN(it, 0);
    wd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(it->obj, "longpressed", it);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 389dbba..f3a9efe 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -262,7 +262,7 @@ myapp_CFLAGS =
  *
  */
 
-static int _elm_signal_exit(void *data, int ev_type, void *ev);
+static Eina_Bool _elm_signal_exit(void *data, int ev_type, void *ev);
 
 char *_elm_appname = NULL;
 const char *_elm_data_dir = NULL;
@@ -275,11 +275,11 @@ static int _elm_init_count = 0;
 static int _elm_policies[ELM_POLICY_LAST];
 static Ecore_Event_Handler *_elm_exit_handler = NULL;
 
-static int
+static Eina_Bool
 _elm_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
 {
    elm_exit();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 void

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 945a2b2..b54decc 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -914,15 +914,15 @@ _grid_raise(Grid *g)
    eina_iterator_free(it);
 }
 
-static int
+static Eina_Bool
 _scr_timeout(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->nosmooth--;
    if (wd->nosmooth == 0) _smooth_update(data);
    wd->scr_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -939,7 +939,7 @@ _scr(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    wd->scr_timer = ecore_timer_add(0.5, _scr_timeout, data);
 }
 
-static int
+static Eina_Bool
 zoom_do(Evas_Object *obj, double t)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -980,12 +980,12 @@ zoom_do(Evas_Object *obj, double t)
    wd->calc_job = ecore_job_add(_calc_job, wd);
    if (t >= 1.0)
      {
-       return 0;
+       return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _zoom_anim(void *data)
 {
    Evas_Object *obj = data;
@@ -993,7 +993,7 @@ _zoom_anim(void *data)
    double t;
    int go;
 
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    t = ecore_loop_time_get();
    if (t >= wd->t_end)
      t = 1.0;
@@ -1014,15 +1014,15 @@ _zoom_anim(void *data)
    return go;
 }
 
-static int
+static Eina_Bool
 _long_press(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->long_timer = NULL;
    wd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index cad106b..385c410 100644 (file)
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -182,15 +182,15 @@ _calc(Evas_Object *obj)
     _sizing_eval(obj);
 }
 
-static int
+static Eina_Bool
 _timer_cb(void *data)
 {
    Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->timer = NULL;
    evas_object_hide(obj);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index 183ec05..e9252ef 100644 (file)
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -501,15 +501,15 @@ _grid_raise(Grid *g)
      }
 }
 
-static int
+static Eina_Bool
 _scr_timeout(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->nosmooth--;
    if (wd->nosmooth == 0) _smooth_update(data);
    wd->scr_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -553,12 +553,12 @@ _main_preloaded(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void
      }
 }
 
-static int
+static Eina_Bool
 zoom_do(Evas_Object *obj, double t)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Coord xx, yy, ow, oh;
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->size.w = (wd->size.ow * (1.0 - t)) + (wd->size.nw * t);
    wd->size.h = (wd->size.oh * (1.0 - t)) + (wd->size.nh * t);
    elm_smart_scroller_child_viewport_size_get(wd->scr, &ow, &oh);
@@ -591,20 +591,20 @@ zoom_do(Evas_Object *obj, double t)
                   free(g);
                }
           }
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 
-static int
+static Eina_Bool
 _zoom_anim(void *data)
 {
    Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
    double t;
-   int go;
-   if (!wd) return 0;
+   Eina_Bool go;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    t = ecore_loop_time_get();
    if (t >= wd->t_end)
      t = 1.0;
@@ -633,15 +633,15 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
    if (!wd) return;
 }
 
-static int
+static Eina_Bool
 _long_press(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->long_timer = NULL;
    wd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(data, "longpressed", NULL);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 6fc553e..81e1785 100644 (file)
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -165,14 +165,14 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
      }
 }
 
-static int
+static Eina_Bool
 _delay_change(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->delay = NULL;
    evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index ec734b3..aa7d1a9 100644 (file)
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -56,7 +56,7 @@ static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
 static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static int _timer_cb(void *data);
+static Eina_Bool _timer_cb(void *data);
 
 static void
 _del_hook(Evas_Object *obj)
@@ -126,15 +126,15 @@ _end(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, c
 }
 
 
-static int
+static Eina_Bool
 _timer_cb(void *data)
 {
    Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->timer = NULL;
    elm_slideshow_next(obj);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void

diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 84addf6..95b78c7 100644 (file)
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -117,14 +117,14 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
      edje_object_signal_emit(wd->spinner, "elm,action,unfocus", "elm");
 }
 
-static int
+static Eina_Bool
 _delay_change(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return 0;
+   if (!wd) return ECORE_CALLBACK_CANCEL;
    wd->delay = NULL;
    evas_object_smart_callback_call(data, "delay,changed", NULL);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -357,7 +357,7 @@ _toggle_entry(void *data, Evas_Object *obj __UNUSED__, const char *emission __UN
      }
 }
 
-static int
+static Eina_Bool
 _spin_value(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);

diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 3764898..f0da4f2 100644 (file)
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -253,7 +253,7 @@ _thumb_apply(Widget_Data *wd)
    wd->is_generating = EINA_FALSE;
 }
 
-static int
+static Eina_Bool
 _thumb_apply_cb(void *data, int type __UNUSED__, void *ev __UNUSED__)
 {
    _thumb_apply(data);

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index f1449e8..3163932 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -384,13 +384,13 @@ _elm_win_rescale(void)
 }
 
 #ifdef HAVE_ELEMENTARY_X
-static int
+static Eina_Bool
 _elm_win_client_message(void *data, int type __UNUSED__, void *event)
 {
    Elm_Win *win = data;
    Ecore_X_Event_Client_Message *e = event;
 
-   if (e->format != 32) return 1;
+   if (e->format != 32) return ECORE_CALLBACK_PASS_ON;
    if (e->message_type == ECORE_X_ATOM_E_COMP_FLUSH)
      {
         if (e->data.l[0] == win->xwin)
@@ -420,7 +420,7 @@ _elm_win_client_message(void *data, int type __UNUSED__, void *event)
                }
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 #endif
 

diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c
index b565456..285bafa 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c
@@ -105,10 +105,10 @@ static void _smart_pan_changed_hook(void *data, Evas_Object *obj, void *event_in
 static void _smart_pan_pan_changed_hook(void *data, Evas_Object *obj, void *event_info);
 static void _smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static int  _smart_hold_animator(void *data);
-static int  _smart_momentum_animator(void *data);
+static Eina_Bool  _smart_hold_animator(void *data);
+static Eina_Bool  _smart_momentum_animator(void *data);
 static void _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static int  _smart_onhold_animator(void *data);
+static Eina_Bool  _smart_onhold_animator(void *data);
 static void _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _smart_edje_drag_v_start(void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -279,7 +279,7 @@ _smart_drag_stop(Evas_Object *obj)
    evas_object_smart_callback_call(obj, "drag,stop", NULL);
 }
 
-static int
+static Eina_Bool
 _smart_scrollto_x_animator(void *data)
 {
    Smart_Data *sd = data;
@@ -300,10 +300,10 @@ _smart_scrollto_x_animator(void *data)
         sd->scrollto.x.animator = NULL;
         if (!sd->scrollto.y.animator)
           _smart_anim_stop(sd->smart_obj);
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
    elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -344,7 +344,7 @@ _smart_scrollto_x(Smart_Data *sd, double t_in, Evas_Coord pos_x)
    sd->bouncemex = 0;
 }
 
-static int
+static Eina_Bool
 _smart_scrollto_y_animator(void *data)
 {
    Smart_Data *sd = data;
@@ -365,11 +365,11 @@ _smart_scrollto_y_animator(void *data)
         sd->scrollto.y.animator = NULL;
         if (!sd->scrollto.x.animator)
           _smart_anim_stop(sd->smart_obj);
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
    elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -490,7 +490,7 @@ _smart_page_adjust(Smart_Data *sd)
    elm_smart_scroller_child_region_show(sd->smart_obj, x, y, w, h);
 }
 
-static int
+static Eina_Bool
 _smart_bounce_x_animator(void *data)
 {
    Smart_Data *sd;
@@ -517,13 +517,13 @@ _smart_bounce_x_animator(void *data)
                sd->down.bounce_x_hold = 1;
              sd->down.bounce_x_animator = NULL;
              sd->bouncemex = 0;
-             return 0;
+             return ECORE_CALLBACK_CANCEL;
           }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _smart_bounce_y_animator(void *data)
 {
    Smart_Data *sd;
@@ -550,10 +550,10 @@ _smart_bounce_y_animator(void *data)
                sd->down.bounce_y_hold = 1;
              sd->down.bounce_y_animator = NULL;
              sd->bouncemey = 0;
-             return 0;
+             return ECORE_CALLBACK_CANCEL;
           }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 #define LEFT 0
@@ -587,7 +587,7 @@ can_scroll(Smart_Data *sd, int dir)
    return EINA_FALSE;
 }
 
-static int
+static Eina_Bool
 _smart_momentum_animator(void *data)
 {
    Smart_Data *sd;
@@ -647,10 +647,10 @@ _smart_momentum_animator(void *data)
              sd->down.bounce_y_hold = 0;
              sd->down.ax = 0;
              sd->down.ay = 0;
-            return 0;
+            return ECORE_CALLBACK_CANCEL;
          }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -1385,7 +1385,7 @@ _smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
      }
 }
 
-static int
+static Eina_Bool
 _smart_hold_animator(void *data)
 {
    Smart_Data *sd = data;
@@ -1409,7 +1409,7 @@ _smart_hold_animator(void *data)
           }
      }
    elm_smart_scroller_child_pos_set(sd->smart_obj, ox, oy);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static Eina_Bool
@@ -1589,7 +1589,7 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev
      }
 }
 
-static int
+static Eina_Bool
 _smart_onhold_animator(void *data)
 {
    Smart_Data *sd;
@@ -1634,7 +1634,7 @@ _smart_onhold_animator(void *data)
 //        printf("scroll %i %i\n", sd->down.hold_x, sd->down.hold_y);
      }
    sd->down.onhold_tlast = t;
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static Eina_Bool