X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmap.c;h=bfa63ae01d222c4754ae32fb2df77a704c11dc85;hb=60aea19aa064055d6b5aec96e7e4980e509a1340;hp=f40ab401be9e46e24c6176b6fa42b5441412f746;hpb=fc3c77853088c20529172d99664a89dd1c66d89f;p=apps%2Fnative%2Fsample%2Fadventure.git

diff --git a/src/map.c b/src/map.c
index f40ab40..bfa63ae 100644
--- a/src/map.c
+++ b/src/map.c
@@ -75,14 +75,14 @@ add_city_to_map(int idx, city_s *ci)
 	char *path = NULL;
 	char full_path[PATH_LEN] = {0, };
 
-   if (idx >= MAXIMUM_SELECTED_CITY) return EINA_FALSE;
-   if (0 > idx) return EINA_FALSE;
-   if (city[idx].obj) return EINA_FALSE;
+   retv_if(idx >= MAXIMUM_SELECTED_CITY, EINA_FALSE);
+   retv_if(0 > idx, EINA_FALSE);
 
    int i;
    for (i = 0; i < MAXIMUM_SELECTED_CITY; i++)
    {
-	   if (city[i].ci.id == ci->id) return EINA_FALSE;
+	   _D("HELLO, %d, %d", city[i].ci.id, ci->id);
+	   retv_if(city[i].ci.id == ci->id, EINA_FALSE);
    }
 
 	path = app_get_resource_path();
@@ -152,6 +152,7 @@ trans_del_cb(void *data, Elm_Transit *trans)
 Eina_Bool
 remove_city_from_map(int idx)
 {
+	_D("HELLO, idx:%d", idx);
    if (idx >= MAXIMUM_SELECTED_CITY) return EINA_FALSE;
    if (0 > idx) return EINA_FALSE;
    if (!city[idx].obj) return EINA_FALSE;
@@ -201,7 +202,7 @@ item_geom_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	part_info_s *pi;
 
 	evas_object_geometry_get(obj, &x, &y, &w, &h);
-	edje_object_part_geometry_get(elm_layout_edje_get(obj), "graph", &x2, &y2, &w2, &h2);
+	edje_object_part_geometry_get(elm_layout_edje_get(obj), "result_bar", &x2, &y2, &w2, &h2);
 
 	pi = evas_object_data_get(rect1, "part_info");
 	if (!pi) return;
@@ -294,7 +295,7 @@ set_time_range(Evas_Object *item, int idx, double p1, double p2, double p3, doub
 		break;
 	}
 	evas_object_geometry_get(item, &x, &y, &w, &h);
-	edje_object_part_geometry_get(elm_layout_edje_get(item), "graph", &x2, &y2, &w2, &h2);
+	edje_object_part_geometry_get(elm_layout_edje_get(item), "result_bar", &x2, &y2, &w2, &h2);
 
 	xx = x + x2 + (w2 * p1);
 	evas_object_show(rect);
@@ -337,7 +338,7 @@ set_time_range(Evas_Object *item, int idx, double p1, double p2, double p3, doub
 		break;
 	}
 	evas_object_geometry_get(item, &x, &y, &w, &h);
-	edje_object_part_geometry_get(elm_layout_edje_get(item), "graph", &x2, &y2, &w2, &h2);
+	edje_object_part_geometry_get(elm_layout_edje_get(item), "result_bar", &x2, &y2, &w2, &h2);
     xx = x + x2 + (w2 * p1);
 	evas_object_show(rect);