evas/evas_events.c - removed duplicated lines

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@64198 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/canvas/evas_events.c b/src/lib/canvas/evas_events.c
index 08cbabf..7087475 100644 (file)
--- a/src/lib/canvas/evas_events.c
+++ b/src/lib/canvas/evas_events.c
@@ -39,11 +39,10 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in,
           {
              if (obj->smart.smart)
                {
-                  int norep;
+                  int norep = 0;
                   int inside;
 
-                  norep = 0;
-                  if (((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap)))
+                  if (((obj->cur.usemap) && (obj->cur.map) && (obj->cur.map->count == 4)))
                     {
                        inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
                        if (inside)
@@ -79,11 +78,10 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in,
                }
              else
                {
-                  int inside = 1;
+                  int inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
 
-                  if (((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap)))
+                  if (((obj->cur.usemap) && (obj->cur.map) && (obj->cur.map->count == 4)))
                     {
-                       inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
                        if ((inside) && (!evas_map_coords_get(obj->cur.map, x, y,
                                                              &(obj->cur.map->mx),
                                                              &(obj->cur.map->my), 0)))
@@ -91,10 +89,6 @@ _evas_event_object_list_in_get(Evas *e, Eina_List *in,
                             inside = 0;
                          }
                     }
-                  else
-                    {
-                       inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
-                    }
 
                   if (inside && ((!obj->precise_is_inside) ||
                                  (evas_object_is_inside(obj, x, y))))