X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-event-sender.c;h=4dc469194ac94d2b7d378b000bd3483b6fcd5bfc;hb=1fa07edcd0e77a445700975773db3300f556caf5;hp=91d431ea27d8e47cc272fc9c58826288df41d768;hpb=94976d690606f1d5f3460c38245a18f97b4c5095;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-service/bt-service-event-sender.c b/bt-service/bt-service-event-sender.c index 91d431e..4dc4691 100644 --- a/bt-service/bt-service-event-sender.c +++ b/bt-service/bt-service-event-sender.c @@ -27,7 +27,7 @@ static GDBusConnection *event_conn; static GDBusConnection *hf_local_term_event_conn; -#ifdef TIZEN_FEATURE_BT_HPS +#ifdef HPS_FEATURE int _bt_send_to_hps(void) { gboolean ret = FALSE; @@ -218,27 +218,27 @@ int _bt_send_event(int event_type, int event, GVariant *param) break; case BLUETOOTH_HID_CONNECTED: signal = BT_INPUT_CONNECTED; - BT_INFO_C("Connected [HID]"); + BT_INFO_C("### Connected [HID]"); break; case BLUETOOTH_HID_DISCONNECTED: signal = BT_INPUT_DISCONNECTED; - BT_INFO_C("Disconnected [HID]"); + BT_INFO_C("### Disconnected [HID]"); break; case BLUETOOTH_HID_DEVICE_CONNECTED: signal = BT_INPUT_HID_DEVICE_CONNECTED; - BT_INFO_C("Connected [HIDDevice]"); + BT_INFO_C("### Connected [HID Device]"); break; case BLUETOOTH_HID_DEVICE_DISCONNECTED: signal = BT_INPUT_HID_DEVICE_DISCONNECTED; - BT_INFO_C("Disconnected [HIDDevice]"); + BT_INFO_C("### Disconnected [HID Device]"); break; case BLUETOOTH_PBAP_CONNECTED: signal = BT_PBAP_CONNECTED; - BT_INFO_C("Connected [PBAP Client]"); + BT_INFO_C("### Connected [PBAP Client]"); break; case BLUETOOTH_PBAP_DISCONNECTED: signal = BT_PBAP_DISCONNECTED; - BT_INFO_C("Disconnected [PBAP Client]"); + BT_INFO_C("### Disconnected [PBAP Client]"); break; case BLUETOOTH_PBAP_PHONEBOOK_SIZE: signal = BT_PBAP_PHONEBOOK_SIZE; @@ -265,19 +265,19 @@ int _bt_send_event(int event_type, int event, GVariant *param) break; case BLUETOOTH_EVENT_AV_CONNECTED: signal = BT_STEREO_HEADSET_CONNECTED; - BT_INFO_C("Connected [A2DP]"); + BT_INFO_C("### Connected [A2DP]"); break; case BLUETOOTH_EVENT_AV_DISCONNECTED: signal = BT_STEREO_HEADSET_DISCONNECTED; - BT_INFO_C("Disconnected [A2DP]"); + BT_INFO_C("### Disconnected [A2DP]"); break; case BLUETOOTH_EVENT_AV_SOURCE_CONNECTED: signal = BT_A2DP_SOURCE_CONNECTED; - BT_INFO_C("Connected [A2DP Source]"); + BT_INFO_C("### Connected [A2DP Source]"); break; case BLUETOOTH_EVENT_AV_SOURCE_DISCONNECTED: signal = BT_A2DP_SOURCE_DISCONNECTED; - BT_INFO_C("Disconnected [A2DP Source]"); + BT_INFO_C("### Disconnected [A2DP Source]"); break; case BLUETOOTH_EVENT_AG_AUDIO_CONNECTED: signal = BT_SCO_CONNECTED; @@ -421,6 +421,9 @@ int _bt_send_event(int event_type, int event, GVariant *param) case BLUETOOTH_EVENT_LE_DATA_LENGTH_CHANGED: signal = BT_LE_DATA_LENGTH_CHANGED; break; + case BLUETOOTH_EVENT_REMOTE_IBEACON_DEVICE_FOUND: + signal = BT_IBEACON_DEVICE_FOUND; + break; case BLUETOOTH_EVENT_PXP_PROPERTY_CHANGED: signal = BT_PXP_PROPERTY_CHANGED; break; @@ -439,7 +442,7 @@ int _bt_send_event(int event_type, int event, GVariant *param) g_object_unref(msg1); -#ifdef TIZEN_FEATURE_BT_HPS +#ifdef HPS_FEATURE if (g_strcmp0(signal, BT_LE_ENABLED) == 0) _bt_send_to_hps(); #endif @@ -549,7 +552,6 @@ int _bt_init_service_event_sender(void) } conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err); - retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL); if (conn == NULL) { BT_ERR("conn == NULL"); if (err) { @@ -584,7 +586,6 @@ int _bt_init_hf_local_term_event_sender(void) } conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err); - retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL); if (conn == NULL) { BT_ERR("conn == NULL"); if (err) { @@ -631,4 +632,3 @@ int _bt_send_dump_signal(char *signal) return BLUETOOTH_ERROR_NONE; } -