Remove Warning

Change-Id: I5c315774d47cd856b14d530f991266afffbb6853
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 823af3b..bcbb098 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(ENGINE_PKGCONFIGS
        capi-network-wifi
        network)
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wcast-align -Wmissing-declarations")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wmissing-declarations")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 8afbff0..ed1d7ac 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,6 +1,6 @@
 Name:       wifi-efl-ug
 Summary:    Wi-Fi UI Gadget
-Version:    0.5.2_42
+Version:    0.5.2_43
 Release:    1
 Group:      App/Network
 License:    Flora License

diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c
index 3a6a63c..a110706 100644 (file)
--- a/sources/libraries/Common/common_eap_connect.c
+++ b/sources/libraries/Common/common_eap_connect.c
@@ -993,7 +993,7 @@ static void __common_eap_connect_cleanup(eap_connect_data_t *eap_data)
        wlan_manager_enable_scan_result_update();
 }
 
-static void __common_eap_connect_destroy(void *data,  Evas_Object *obj, void *event_info)
+static void __common_eap_connect_destroy(void *data, Evas_Object *obj, void *event_info)
 {
        __COMMON_FUNC_ENTER__;
 
@@ -1004,6 +1004,16 @@ static void __common_eap_connect_destroy(void *data,  Evas_Object *obj, void *ev
        __COMMON_FUNC_EXIT__;
 }
 
+static Eina_Bool __common_eap_connect_remove(void *data, Elm_Object_Item *it)
+{
+       __COMMON_FUNC_ENTER__;
+
+       __common_eap_connect_destroy(data, NULL, NULL);
+
+       return EINA_TRUE;
+       __COMMON_FUNC_EXIT__;
+}
+
 static void __eap_popup_keydown_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
        __COMMON_FUNC_ENTER__;
@@ -1221,7 +1231,7 @@ eap_connect_data_t *create_eap_view(Evas_Object *win_main,
        elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
 
        elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_NONE);
-       Evas_Object* btn = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
+       Elm_Object_Item* btn = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
 
        elm_object_item_part_content_set(btn, "object", connect_btn);
        elm_object_item_part_content_set(navi_it, "toolbar", toolbar);
@@ -1247,7 +1257,7 @@ eap_connect_data_t *create_eap_view(Evas_Object *win_main,
        elm_object_item_part_content_set(navi_it, "title_prev_btn", back_btn);
 
        ea_object_event_callback_add(eap_data->navi_frame, EA_CALLBACK_BACK, ea_naviframe_back_cb, NULL);
-       elm_naviframe_item_pop_cb_set(navi_it, __common_eap_connect_destroy, eap_data);
+       elm_naviframe_item_pop_cb_set(navi_it, __common_eap_connect_remove, eap_data);
 
 
        /* Register imf event cbs */

diff --git a/sources/libraries/Common/common_utils.c b/sources/libraries/Common/common_utils.c
index 823d996..66bffbe 100644 (file)
--- a/sources/libraries/Common/common_utils.c
+++ b/sources/libraries/Common/common_utils.c
@@ -339,7 +339,7 @@ Evas_Object *common_utils_show_info_popup(Evas_Object *parent, popup_btn_info_t
                elm_object_part_content_set(popup, "button1", btn_1);
                if (popup_data->btn1_cb) {
                        evas_object_smart_callback_add(btn_1, "clicked", popup_data->btn1_cb, popup_data->btn1_data);
-                       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, popup_data->btn1_cb, popup_data->btn1_data);
+                       ea_object_event_callback_add(popup, EA_CALLBACK_BACK, popup_data->btn1_cb, (void*)popup_data->btn1_data);
                } else {        // set the default callback
                        evas_object_smart_callback_add(btn_1, "clicked", __common_utils_del_popup, popup);
                        ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL);

diff --git a/sources/ui-gadget/viewers-layout/view_detail.c b/sources/ui-gadget/viewers-layout/view_detail.c
index c22f314..57883a0 100644 (file)
--- a/sources/ui-gadget/viewers-layout/view_detail.c
+++ b/sources/ui-gadget/viewers-layout/view_detail.c
@@ -353,7 +353,7 @@ void view_detail(wifi_device_info_t *device_info, Evas_Object *win_main)
                elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
 
                elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_NONE);
-               Evas_Object* btn = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
+               Elm_Object_Item* btn = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
 
                elm_object_item_part_content_set(btn, "object", forget_button);
                elm_object_item_part_content_set(navi_it, "toolbar", toolbar);

diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/sources/ui-gadget/viewers-layout/viewer_manager.c
index 8167762..1f28c82 100644 (file)
--- a/sources/ui-gadget/viewers-layout/viewer_manager.c
+++ b/sources/ui-gadget/viewers-layout/viewer_manager.c
@@ -223,7 +223,7 @@ static void _rbutton_click_cb(void *data, Evas_Object *obj, void *event_info)
        __COMMON_FUNC_EXIT__;
 }
 
-static Eina_Bool _back_sk_cb(void *data, Evas_Object *obj, void *event_info)
+static Eina_Bool _back_sk_cb(void *data, Elm_Object_Item *it)
 {
        __COMMON_FUNC_ENTER__;
 
@@ -726,10 +726,10 @@ Evas_Object* viewer_manager_create(Evas_Object* _parent)
                elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
                elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_NONE);
 
-               manager_object->prev_button = elm_toolbar_item_append(toolbar, NULL,
+               manager_object->prev_button = (Evas_Object *)elm_toolbar_item_append(toolbar, NULL,
                                                ug_app_state->lbutton_setup_wizard_prev,
                                                _lbutton_click_cb, NULL);
-               manager_object->next_button = elm_toolbar_item_append(toolbar, NULL,
+               manager_object->next_button = (Evas_Object *)elm_toolbar_item_append(toolbar, NULL,
                                                ug_app_state->rbutton_setup_wizard_next,
                                                _rbutton_click_cb, NULL);
 
@@ -765,7 +765,7 @@ Evas_Object* viewer_manager_create(Evas_Object* _parent)
                evas_object_smart_callback_add(manager_object->scan_button,
                                "clicked", __refresh_scan_callback, NULL);
 
-               Evas_Object* btn = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
+               Elm_Object_Item* btn = elm_toolbar_item_append(toolbar, NULL, NULL, NULL, NULL);
                elm_object_item_part_content_set(btn, "object", manager_object->scan_button);
                elm_object_item_part_content_set(navi_it, "toolbar", toolbar);