lets warning-- shall we?

git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@59731 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c
index 89cd2bb..2ac5c71 100644 (file)
--- a/src/bin/test_eio.c
+++ b/src/bin/test_eio.c
@@ -16,18 +16,18 @@ static struct tms en_cpu;
 
 
 static void
-_sel_file(void *data, Evas_Object *obj, void *event_info)
+_sel_file(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
 }
 
 static Eina_Bool
-_ls_filter_cb(void *data, Eio_File *handler, const char *file)
+_ls_filter_cb(void *data __UNUSED__, Eio_File *handler __UNUSED__, const char *file __UNUSED__)
 {
   return EINA_TRUE;
 }
 
 static void
-_ls_main_cb(void *data, Eio_File *handler, const char *file)
+_ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file)
 {
    elm_genlist_item_sorted_insert(data,
                                   &it_eio,
@@ -40,18 +40,18 @@ _ls_main_cb(void *data, Eio_File *handler, const char *file)
 }
 
 void
-_ls_done_cb(void *data, Eio_File *handler)
+_ls_done_cb(void *data __UNUSED__, Eio_File *handler __UNUSED__)
 {
    en_time = times(&en_cpu);
    fprintf(stderr, "ls done\n");
    fprintf(stderr, "Real Time: %.jd, User Time: %.jd, System Time: %.jd\n",
-           en_time - st_time,
-           en_cpu.tms_utime - st_cpu.tms_utime,
-           en_cpu.tms_stime - st_cpu.tms_stime);
+           (intmax_t)(en_time - st_time),
+           (intmax_t)(en_cpu.tms_utime - st_cpu.tms_utime),
+           (intmax_t)(en_cpu.tms_stime - st_cpu.tms_stime));
 }
 
 void
-_ls_error_cb(void *data, Eio_File *handler, int error)
+_ls_error_cb(void *data __UNUSED__, Eio_File *handler __UNUSED__, int error)
 {
    fprintf(stderr, "error: [%s]\n", strerror(error));
 }
@@ -75,7 +75,7 @@ _file_chosen(void            *data,
 }
 
 static char *
-_gl_label_get(void *data, Evas_Object *obj, const char *part)
+_gl_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "Item # %s", (char*)data);
@@ -83,33 +83,34 @@ _gl_label_get(void *data, Evas_Object *obj, const char *part)
 }
 
 static Evas_Object *
-_gl_icon_get(void *data, Evas_Object *obj, const char *part)
+_gl_icon_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
+   return NULL;
 }
 
 static Eina_Bool
-_gl_state_get(void *data , Evas_Object *obj, const char *part)
+_gl_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
    return EINA_FALSE;
 }
 
 static void
-_gl_del(void *data, Evas_Object *obj)
+_gl_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__)
 {
 }
 
 static void
-_test_eio_clear(void *data, Evas_Object *obj, void *event)
+_test_eio_clear(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
 {
    elm_genlist_clear(data);
 }
 
 void
 test_eio(void *data       __UNUSED__,
-                         Evas_Object *obj __UNUSED__,
-                         void *event_info __UNUSED__)
+         Evas_Object *obj __UNUSED__,
+         void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *en, *lb, *gl;
+   Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *gl;
 
    it_eio.item_style     = "default";
    it_eio.func.label_get = _gl_label_get;

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 62aee87..083abd9 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -303,23 +303,12 @@ static void
 _parent_focus(Evas_Object *obj)
 {
    API_ENTRY return;
+   if (sd->focused) return;
 
    Evas_Object *o = elm_widget_parent_get(obj);
    sd->focus_order_on_calc = EINA_TRUE;
 
-   if (sd->focused) return;
-   if (o)
-     {
-        unsigned int i = 0;
-        Evas_Object *ret;
-
-        ret = _newest_focus_order_get(o, &i, EINA_TRUE);
-
-        /* we don't want to bump a common widget ancestor's
-           focus_order *twice* while parent focusing */
-        if (!ret || (!i) || (i != focus_order))
-          _parent_focus(o);
-     }
+   if (o) _parent_focus(o);
 
    if (!sd->focus_order_on_calc)
      return; /* we don't want to override it if by means of any of the