[elm_popup/TC]: Icon directory and image changed as per review comment.

[elm_popup/TC]: Review comments and commit message fixed.
[elm_navigationbar_ex]: Warning fixed
[elm_popup/TC]: Test case build fail issue fixed.

Change-Id: I34e2174539a3b90887a684c8f84fa611fcfe942b

diff --git a/TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c b/TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c
index ce5bc54..a2fbc27 100644 (file)
--- a/TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c
+++ b/TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c
@@ -55,13 +55,10 @@ static void startup(void)
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);     
        popup = elm_popup_add(main_win);
-       Evas_Object *icon = elm_icon_add(popup);
-       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
-       elm_icon_file_set(icon, buf, NULL);
-       evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-       elm_icon_scale_set(icon, 1, 1);
+       Evas_Object *content = elm_button_add(popup);
+       evas_object_show(content);
        
-       elm_popup_content_set(popup,icon);
+       elm_popup_content_set(popup,content);
        evas_object_show(popup);        
 }
 

diff --git a/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c b/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c
index fd544f7..81a9aaa 100644 (file)
--- a/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c
+++ b/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c
@@ -1,6 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
-
+#define ICON_DIR "usr/share/elementary/images"
 // Definitions
 // For checking the result of the positive test case.
 #define TET_CHECK_PASS(x1, y...) \
@@ -51,13 +51,14 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[PATH_MAX];
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);     
        popup = elm_popup_add(main_win);
        Evas_Object *icon = elm_icon_add(popup);
-       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
        elm_icon_file_set(icon, buf, NULL);
        evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
        elm_icon_scale_set(icon, 1, 1);

diff --git a/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_set_func.c b/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_set_func.c
index e4a2c24..da338b5 100644 (file)
--- a/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_set_func.c
+++ b/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_set_func.c
@@ -1,7 +1,7 @@
 #include <tet_api.h>
 #include <Elementary.h>
 
-#define ICON_DIR "usr/share/beat_winset_test/icon"
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -82,7 +82,7 @@ static void utc_UIFW_elm_popup_title_icon_set_func_01(void)
 {
        
        Evas_Object *icon = elm_icon_add(popup);
-       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
        elm_icon_file_set(icon, buf, NULL);
        evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
        elm_icon_scale_set(icon, 1, 1);
@@ -98,7 +98,7 @@ static void utc_UIFW_elm_popup_title_icon_set_func_02(void)
 {
        
        Evas_Object *icon = elm_icon_add(popup);
-       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
        elm_icon_file_set(icon, buf, NULL);
        evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
        elm_icon_scale_set(icon, 1, 1);

diff --git a/src/lib/elm_navigationbar_ex.c b/src/lib/elm_navigationbar_ex.c
index 64f6706..7394292 100644 (file)
--- a/src/lib/elm_navigationbar_ex.c
+++ b/src/lib/elm_navigationbar_ex.c
@@ -164,7 +164,7 @@ _eval_top(Evas_Object *obj)
    ittop = eina_list_last(wd->stack)->data;\r
    if (ittop != wd->top)\r
      {\r
-        Evas_Object *o, *o1, *o2;\r
+        Evas_Object *o1, *o2;\r
         const char *onshow, *onhide;\r
 \r
         if (wd->top)\r
@@ -944,7 +944,7 @@ elm_navigationbar_ex_item_style_get(Elm_Navigationbar_ex_Item* item)
 EAPI void\r
 elm_navigationbar_ex_item_promote(Elm_Navigationbar_ex_Item* item)\r
 {\r
-   if (!item) return NULL;\r
+   if (!item) return;\r
    _item_promote(item);\r
 }\r
 \r