fix bug : P120921-6157
authorHyejin Kim <hyejin0906.kim@samsung.com>
Tue, 25 Sep 2012 06:33:58 +0000 (15:33 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Fri, 5 Oct 2012 02:13:37 +0000 (11:13 +0900)
setting-about/src/setting-about-main.c

index 8cbfe43..3818715 100755 (executable)
@@ -303,32 +303,27 @@ void setting_about_main_get_bluetooth_address_string(char *str, int size)
 {
        setting_retm_if(str == NULL, "str parameter is NULL");
 
-       //bluetooth_device_address_t local_address;
-       //memset(&local_address, 0x0, sizeof(local_address));
        int ret = 0;
 
-       /* for fixing BS of dbus signal */
-       //bluetooth_register_callback(NULL, NULL);
-       //ret = bluetooth_get_local_address(&local_address);
-       char local_address[1024];
-       memset(local_address, 0x0, 1024);
+       ret = bt_initialize();
+       setting_retm_if(ret != 0, "bluetooth initialization failed");
+
+       char *local_address = NULL;
        ret = bt_adapter_get_address(&local_address);
 
-       /* for fixing BS of dbus signal */
-       bluetooth_unregister_callback();
+       bt_deinitialize();
 
        if (ret < 0) {
                snprintf(str, size, "%s", _("IDS_ST_HEADER_UNAVAILABLE"));
                SETTING_TRACE_DEBUG("bt address : %s", str);
        } else {
-               /*
-               snprintf(str, size, "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X",
-                        local_address.addr[0], local_address.addr[1], local_address.addr[2],
-                        local_address.addr[3], local_address.addr[4], local_address.addr[5]);
-               */
                SETTING_TRACE_DEBUG("bt address : %s", local_address);
                snprintf(str, size, "%s", local_address);
        }
+
+       if (local_address) {
+               free(local_address);
+       }
 }
 
 int __stat_get_cpuinfo(float *usr_pct, float *sys_pct)