Fixed Svace Issues (WGID 8530, 56469) 97/89297/1 accepted/tizen/common/20160923.160712 accepted/tizen/ivi/20160925.234335 accepted/tizen/mobile/20160925.234356 accepted/tizen/tv/20160925.234340 submit/tizen/20160923.054316
authorchleun.moon <chleun.moon@samsung.com>
Fri, 23 Sep 2016 04:55:39 +0000 (13:55 +0900)
committerchleun.moon <chleun.moon@samsung.com>
Fri, 23 Sep 2016 04:56:02 +0000 (13:56 +0900)
Change-Id: Ibb2ccebbcfe252d6ff0f951d6eab4b4a772ce55b
Signed-off-by: cheoleun <chleun.moon@samsung.com>
packaging/ug-setting-wifidirect-efl.spec
ug-wifidirect/src/wfd_ug_genlist.c

index 9d202ff4fa3954fec4947b825271d48197c9d901..c78ce0851970887c2583e5883cc7625094b5fc26 100644 (file)
@@ -1,6 +1,6 @@
 Name:       ug-setting-wifidirect-efl
 Summary:    Wi-Fi Direct setting UI gadget
-Version:    1.11.76
+Version:    1.11.77
 Release:    1
 Group:      Applications/Network
 License:    Flora-1.1
index 31405ccafe029d2db03338f66a4f4f4000137377..a1a4f26434e17cd9d99e7601fa37055438be823a 100755 (executable)
@@ -639,6 +639,7 @@ static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const cha
        char *det = NULL;
        char *buf = NULL;
        char *ssid;
+       char *convertedColor = NULL;
 
        if (data == NULL) {
                DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
@@ -658,9 +659,11 @@ static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const cha
                }
        } else if (!strcmp("elm.text.sub", part)) {
                det = elm_entry_utf8_to_markup(D_("IDS_COM_BODY_CONNECTED_M_STATUS"));
+               convertedColor = ConvertRGBAtoHex(2, 61, 132, 255);
                buf = g_strdup_printf("<color=#%s>%s</color>",
-                       ConvertRGBAtoHex(2, 61, 132, 255), det);
+                       convertedColor, det);
                WFD_IF_FREE_MEM(det);
+               g_free(convertedColor);
                __FUNC_EXIT__;
                return buf;
        }
@@ -754,7 +757,7 @@ static char *_gl_multi_connect_dev_title_label_get(void *data, Evas_Object *obj,
        }
        DBG(LOG_INFO, "%s", part);
 
-       if (!strcmp("elm.text", part)) {
+       if (!strcmp("elm.text", part) && ugd) {
                if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) {
                        return g_strdup(D_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB"));
                } else if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED) {