Fix the advertisement fail issue

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-pbap.c

diff --git a/bt-api/bt-pbap.c b/bt-api/bt-pbap.c
old mode 100644 (file)
new mode 100755 (executable)
index 031440c..1d018f8
--- a/bt-api/bt-pbap.c
+++ b/bt-api/bt-pbap.c
@@ -1,11 +1,5 @@
 /*
- * Bluetooth-frwk
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact:  Hocheol Seo <hocheol.seo@samsung.com>
- *              Girishashok Joshi <girish.joshi@samsung.com>
- *              Chanyeol Park <chanyeol.park@samsung.com>
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +15,9 @@
  *
  */
 #include <vconf.h>
+#if !defined(LIBNOTIFY_SUPPORT) && !defined(LIBNOTIFICATION_SUPPORT)
 #include <syspopup_caller.h>
+#endif
 
 #include "bluetooth-api.h"
 #include "bt-internal-types.h"
@@ -33,8 +29,7 @@
 static char is_pbap_initialized = FALSE;
 
 #define BT_CHECK_PBAP_INITIALIZED(func) \
-       if (is_pbap_initialized == FALSE) \
-       { \
+       if (is_pbap_initialized == FALSE) { \
                BT_ERR("BT PBAP Client is not initiatized"); \
                func BLUETOOTH_ERROR_NOT_INITIALIZED; \
        } \
@@ -45,7 +40,6 @@ BT_EXPORT_API int bluetooth_pbap_init(void)
        bt_user_info_t *user_info;
        int ret;
 
-       BT_CHECK_ENABLED(return);
        if (is_pbap_initialized)
                return BLUETOOTH_ERROR_ALREADY_INITIALIZED;
 
@@ -63,7 +57,7 @@ BT_EXPORT_API int bluetooth_pbap_init(void)
 BT_EXPORT_API int bluetooth_pbap_deinit(void)
 {
        int ret;
-       BT_CHECK_ENABLED(return);
+
        BT_CHECK_PBAP_INITIALIZED(return);
 
        ret = _bt_unregister_event(BT_PBAP_CLIENT_EVENT);