Warnings removed.

Change-Id: I6d0aad6fd44d0c389e2170c1873eb9c60c6cd714
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>

diff --git a/src/modules/setting/bluetooth.c b/src/modules/setting/bluetooth.c
index 16f81e8ebd825173efd4871dd0e3d112e495c641..d73101de0b5be73990deb79a4436947d4dcc1b33 100644 (file)
--- a/src/modules/setting/bluetooth.c
+++ b/src/modules/setting/bluetooth.c
@@ -144,7 +144,7 @@ static void indicator_bluetooth_change_cb(keynode_t *node, void *data)
 
        ret = vconf_get_int(VCONFKEY_BT_DEVICE, &dev);
        if (ret == OK) {
-               DBG("Show BT ICON (BT DEVICE: %d)", dev);
+               _D("Show BT ICON (BT DEVICE: %d)", dev);
 
                if (dev == VCONFKEY_BT_DEVICE_NONE) {
                        show_bluetooth_icon(data, NO_DEVICE);
@@ -153,14 +153,14 @@ static void indicator_bluetooth_change_cb(keynode_t *node, void *data)
                if ((dev & VCONFKEY_BT_DEVICE_HEADSET_CONNECTED) ||
                    (dev & VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED)) {
                        result = HEADSET_CONNECTED;
-                       DBG("BT_HEADSET_CONNECTED(%x)", result);
+                       _D("BT_HEADSET_CONNECTED(%x)", result);
                }
                if ((dev & VCONFKEY_BT_DEVICE_SAP_CONNECTED)
                || (dev & VCONFKEY_BT_DEVICE_PBAP_CONNECTED)
                || (dev & VCONFKEY_BT_DEVICE_HID_CONNECTED)
                || (dev & VCONFKEY_BT_DEVICE_PAN_CONNECTED)) {
                        result = (result | DEVICE_CONNECTED);
-                       DBG("BT_DEVICE_CONNECTED(%x)", result);
+                       _D("BT_DEVICE_CONNECTED(%x)", result);
                }
                show_bluetooth_icon(data, result);
        } else

diff --git a/src/modules/setting/do_not_disturb.c b/src/modules/setting/do_not_disturb.c
index 8fe4b547959c5c601606ab4e44940898257b4951..22d693daf0c34367a3a73fca188452b8f8627106 100644 (file)
--- a/src/modules/setting/do_not_disturb.c
+++ b/src/modules/setting/do_not_disturb.c
@@ -31,7 +31,6 @@ icon_s dnd = {
        .priority = ICON_PRIORITY,
        .always_top = EINA_FALSE,
        .exist_in_view = EINA_FALSE,
-       .img_obj = {0,},
        .img_obj.data = DND_ICON_PATH,
        .obj_exist = EINA_FALSE,
        .area = INDICATOR_ICON_AREA_SYSTEM,

diff --git a/src/modules/setting/nfc.c b/src/modules/setting/nfc.c
index c8e2bc6599c6ec86a62a0c74530a4549ec5455a1..94acc8c1ccb4d0efe0ca26771d8c801463f6f69d 100644 (file)
--- a/src/modules/setting/nfc.c
+++ b/src/modules/setting/nfc.c
@@ -39,7 +39,6 @@ icon_s nfc = {
        .priority = ICON_PRIORITY,
        .always_top = EINA_FALSE,
        .exist_in_view = EINA_FALSE,
-       .img_obj = {0,},
        .img_obj.data = "Bluetooth, NFC, GPS/b03_nfc_on.png",
        .obj_exist = EINA_FALSE,
        .area = INDICATOR_ICON_AREA_NOTI,
@@ -53,12 +52,10 @@ enum {
        NFC_NUM,
 };
 
-
 static int updated_while_lcd_off = 0;
 static int prevIndex = -1;
 
 
-
 static void set_app_state(void* data)
 {
        nfc.ad = data;

diff --git a/src/ticker.c b/src/ticker.c
index 21cedf6c1b8e250a61bef96d08f8fef737abbb92..181b3739431b015b16d021273cdd8253893b9c12 100644 (file)
--- a/src/ticker.c
+++ b/src/ticker.c
@@ -672,14 +672,19 @@ static void _ticker_noti_destroy(ticker_info_s **ticker_info)
                notification_free((*ticker_info)->noti);
                (*ticker_info)->noti = NULL;
        }
-       if ((*ticker_info)->textblock)
+       if ((*ticker_info)->textblock) {
                evas_object_del((*ticker_info)->textblock);
-       if ((*ticker_info)->icon)
+               (*ticker_info)->textblock = NULL;
+       }
+       if ((*ticker_info)->icon) {
                evas_object_del((*ticker_info)->icon);
+               (*ticker_info)->icon = NULL;
+       }
 
        free((*ticker_info)->pkgname);
-       free(*ticker_info);
+       (*ticker_info)->pkgname = NULL;
 
+       free(*ticker_info);
        *ticker_info = NULL;
 
        if (!ticker.pending && !ticker.current)