Merge "Fix the warning errors" into tizen_3.0

diff --git a/bt-service/bt-service-adapter.c b/bt-service/bt-service-adapter.c
index 656595f..4c0ac3d 100644 (file)
--- a/bt-service/bt-service-adapter.c
+++ b/bt-service/bt-service-adapter.c
@@ -511,7 +511,7 @@ static int __bt_set_enabled(void)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-#ifdef TIZEN_PROFILE_MOBILE || defined(TIZEN_PROFILE_IVI)
+#if defined(TIZEN_PROFILE_MOBILE) || defined(TIZEN_PROFILE_IVI)
        /* BT setting UI will control Mobile's visible mode. So in the FRWK...set the visible mode as off: */
        if (_bt_set_discoverable_mode(
                BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE, 0) != BLUETOOTH_ERROR_NONE)

diff --git a/bt-service/bt-service-common.c b/bt-service/bt-service-common.c
index 9270222..75a2bff 100644 (file)
--- a/bt-service/bt-service-common.c
+++ b/bt-service/bt-service-common.c
@@ -89,9 +89,6 @@ GDBusConnection *_bt_gdbus_init_session_gconn(void)
 {
        GError *error = NULL;
 
-       if (!g_thread_supported())
-               g_thread_init(NULL);
-
        dbus_threads_init_default();
 
        if (session_conn != NULL)

diff --git a/bt-service/bt-service-device.c b/bt-service/bt-service-device.c
index 206af08..26120bc 100644 (file)
--- a/bt-service/bt-service-device.c
+++ b/bt-service/bt-service-device.c
@@ -37,6 +37,7 @@
 #include "bt-service-network.h"
 #include "bt-service-adapter.h"
 #include "bt-service-gap-agent.h"
+#include "bt-service-pbap.h"
 
 #define BT_SYSPOPUP_IPC_RESPONSE_OBJECT "/org/projectx/bt_syspopup_res"
 #define BT_SYSPOPUP_INTERFACE "User.Bluetooth.syspopup"