Fix error in view.c

Change-Id: I2cf87aa5876f675d7b603ab2f4e6cde6969e78fa

diff --git a/view.c b/view.c
index 26014bf..29f9ac2 100644 (file)
--- a/view.c
+++ b/view.c
@@ -6,7 +6,7 @@ void view_create(appdata_s *ad)
 {
        if (ad == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "appdata is NULL.");
-               return NULL;
+               return;
        }
 
        /* Create window */
@@ -89,10 +89,9 @@ Evas_Object *view_create_conformant_without_indicator(Evas_Object *win)
  * @param[Evas_Object_Event_Cb]: File path of EDJ
  * @param[user_data]: The user data to be passed to the callback functions
  */
-Evas_Object *view_create_layout(Evas_Object *parent, const char *file_name, const char *group_name, Evas_Object_Event_Cb cb_function, void *user_data)
+Evas_Object *view_create_layout(Evas_Object *parent, const char *edj_path, const char *group_name, Eext_Event_Cb cb_function, void *user_data)
 {
        Evas_Object *layout = NULL;
-       char edj_path[PATH_MAX] = { 0, };
 
        if (parent == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "parent is NULL.");
@@ -100,7 +99,6 @@ Evas_Object *view_create_layout(Evas_Object *parent, const char *file_name, cons
        }
 
        /* Create layout by EDC(edje file) */
-       _get_resource(file_name, edj_path, (int)PATH_MAX);
        layout = elm_layout_add(parent);
        elm_layout_file_set(layout, edj_path, group_name);
 
@@ -132,7 +130,7 @@ Evas_Object *view_create_layout_for_conformant(Evas_Object *parent, Evas_Object
        }
 
        /* Create layout for conformant */
-       layout = view_create_layout(parent, file_name, group_name, user_data);
+       layout = view_create_layout(parent, file_name, group_name, NULL, user_data);
        if (layout == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "layout is NULL.");
                return NULL;
@@ -238,7 +236,7 @@ void view_set_image(Evas_Object *parent, const char *part, const char *image_pat
 
        if (parent == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "parent is NULL.");
-               return NULL;
+               return;
        }
 
        image = elm_object_part_content_get(parent, part);
@@ -276,7 +274,7 @@ void view_set_text(Evas_Object *parent, const char *part, const char *text)
 {
        if (parent == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "parent is NULL.");
-               return NULL;
+               return;
        }
 
        /* Set text of target part object */
@@ -298,7 +296,7 @@ void view_set_color(Evas_Object *parent, const char *part, int r, int g, int b,
 
        if (parent == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "parent is NULL.");
-               return NULL;
+               return;
        }
 
        obj = elm_object_part_content_get(parent, part);
@@ -356,12 +354,12 @@ Elm_Object_Item* view_push_item_to_naviframe(Evas_Object *nf, Evas_Object *item,
 
        if (nf == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "naviframe is NULL.");
-               return;
+               return NULL;
        }
 
        if (item == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "item is NULL.");
-               return;
+               return NULL;
        }
 
        nf_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, item, "empty");
@@ -710,13 +708,13 @@ void view_set_customized_event_callback(Evas_Object *item, char *signal, char *s
  */
 void view_set_rotary_event_callback(Evas_Object *obj, Eext_Rotary_Event_Cb rotary_cb, void *user_data)
 {
-       if (parent == NULL) {
+       if (obj == NULL) {
                dlog_print(DLOG_ERROR, LOG_TAG, "parent is NULL.");
                return;
        }
 
-       eext_rotary_object_event_activated_set(parent, EINA_TRUE);
-       eext_rotary_object_event_callback_add(parent, rotary_cb, user_data);
+       eext_rotary_object_event_activated_set(obj, EINA_TRUE);
+       eext_rotary_object_event_callback_add(obj, rotary_cb, user_data);
 }
 
 /*