[momentbar] fixing SVACE issues

Change-Id: Ibd6ccf91815d2a6f00d5c700aa9e647a7c319eab
Signed-off-by: Irfan Abdul <irfan.abdul@samsung.com>

diff --git a/src/windicator.c b/src/windicator.c
index 7bb64d30488d9bd40b3623b967cdb4bee70f3c94..305f8f85be0982bb7daff7ea3d09fb2fe0c6bd4d 100755 (executable)
--- a/src/windicator.c
+++ b/src/windicator.c
@@ -337,7 +337,7 @@ static void _watchface_status_changed_cb(keynode_t *node, void *data)
        _D("");
        struct appdata *ad = (struct appdata*) data;
        int watchface = 0;
-       retv_if(ad == NULL, WINDICATOR_ERROR_INVALID_PARAMETER);
+       ret_if(!ad);
        if (vconf_get_bool(VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY, &watchface) < 0)
                _SECURE_E("Failed to get vconfkey : %s", VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY);
        _D("watch face from vconf key: VCONFKEY_HOMESCREEN_WATCH_FACE_VISIBILITY is %d", watchface);

diff --git a/src/windicator_dnd_btn.c b/src/windicator_dnd_btn.c
index d6d3d9207130ab895020cdc8b9e6c58d1826fe38..0b7a7068d1d240c149810d3302be4c4bb3a17486 100755 (executable)
--- a/src/windicator_dnd_btn.c
+++ b/src/windicator_dnd_btn.c
@@ -200,7 +200,6 @@ static void _dnd_popup_launch(void* data)
 
 void _dnd_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-               int ret = 0;
        _I("(%d)", s_info.dnd_btn_status);
 
        struct appdata *ad = (struct appdata *)data;
@@ -208,12 +207,8 @@ void _dnd_btn_clicked_cb(void *data, Evas_Object *obj, const char *emission, con
 
        if (s_info.dnd_btn_status == DND_BTN_ENABLED) {
                vconf_set_bool(VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL, EINA_FALSE);
-                        if (ret < 0)
-                                        _E("Failed to set VCONFKEY_SETAPPL_BLOCKMODE_WEARABLE_BOOL : %d", ret);
-
            s_info.dnd_btn_status = DND_BTN_DISABLED;
-
-                       elm_object_signal_emit(ad->dnd_btn_layout, "dnd.disable", "dnd.bg.icon");
+               elm_object_signal_emit(ad->dnd_btn_layout, "dnd.disable", "dnd.bg.icon");
        } else {
                windicator_hide_moment_bar_directly(ad);
                _dnd_popup_launch(ad);

diff --git a/src/windicator_moment_bar.c b/src/windicator_moment_bar.c
index d36f711536217106272224566cad3987ee5a1280..31ec7daa545c08c7b830260f0486a62aebca97b3 100755 (executable)
--- a/src/windicator_moment_bar.c
+++ b/src/windicator_moment_bar.c
@@ -239,7 +239,7 @@ void windicator_util_back_key_ungrab(void *data)
        struct appdata *ad = (struct appdata *)data;
        ret_if(ad == NULL);
 
-       if ad->back_key_handler) {
+       if (ad->back_key_handler) {
                ecore_event_handler_del(ad->back_key_handler);
                ad->back_key_handler = NULL;
        }