Add the sender name in signal subscribe function

To avoid the redundent call we can add the sender
name in dbus signal subscribe function.

Change-Id: Ide9f9063718ca567e9793fb0cacf4b957bb9fb2e
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index 64c22a5..3696c85 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -4278,7 +4278,7 @@ void _bt_register_name_owner_changed(void)
                return;
        }
        owner_sig_id = g_dbus_connection_signal_subscribe(connection_type,
-                               NULL, BT_EVENT_FREEDESKTOP,
+                               BT_DBUS_NAME, BT_EVENT_FREEDESKTOP,
                                BT_NAME_OWNER_CHANGED, NULL, NULL, 0,
                                __bt_name_owner_changed, NULL, NULL);
 }

diff --git a/bt-oal/bluez_hal/src/bt-hal-event-receiver.c b/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
index ad07d3b..037b04f 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
+++ b/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
@@ -1263,21 +1263,21 @@ static int __bt_hal_register_manager_subscribe_signal(GDBusConnection *conn,
        if (subscribe) {
                if (subs_interface_added_id == -1) {
                        subs_interface_added_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_MANAGER_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_MANAGER_INTERFACE,
                                        BT_HAL_INTERFACES_ADDED, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
                }
                if (subs_interface_removed_id == -1) {
                        subs_interface_removed_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_MANAGER_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_MANAGER_INTERFACE,
                                        BT_HAL_INTERFACES_REMOVED, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
                }
                if (subs_name_owner_id == -1) {
                        subs_name_owner_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_FREEDESKTOP_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_FREEDESKTOP_INTERFACE,
                                        BT_HAL_NAME_OWNER_CHANGED, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
@@ -1291,7 +1291,7 @@ static int __bt_hal_register_manager_subscribe_signal(GDBusConnection *conn,
                }
                if (subs_adapter_id == -1) {
                        subs_adapter_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_ADAPTER_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_ADAPTER_INTERFACE,
                                        NULL, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
@@ -1337,7 +1337,7 @@ static int __bt_hal_register_device_subscribe_signal(GDBusConnection *conn,
        if (subscribe) {
                if (subs_device_id == -1) {
                        subs_device_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_DEVICE_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_DEVICE_INTERFACE,
                                        NULL, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
@@ -1363,7 +1363,7 @@ static int __bt_hal_register_input_subscribe_signal(GDBusConnection *conn, int s
        if (subscribe) {
                if (subs_input_id == -1) {
                        subs_input_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_INPUT_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_INPUT_INTERFACE,
                                        NULL, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
@@ -1388,14 +1388,14 @@ static int __bt_hal_register_gatt_subscribe_signal(GDBusConnection *conn,
        if (subscribe) {
                if (subs_gatt_char_id == -1) {
                        subs_gatt_char_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_GATT_CHAR_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_GATT_CHAR_INTERFACE,
                                        NULL, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
                }
                if (subs_gatt_service_id == -1) {
                        subs_gatt_service_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_GATT_SERVICE_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_GATT_SERVICE_INTERFACE,
                                        NULL, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
@@ -1460,14 +1460,14 @@ static int __bt_hal_register_audio_subscribe_signal(GDBusConnection *conn,
        if (subscribe) {
                if (subs_headset_id == -1) {
                        subs_headset_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_HEADSET_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_HEADSET_INTERFACE,
                                        NULL, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);
                }
                if (subs_sink_id == -1) {
                        subs_sink_id = g_dbus_connection_signal_subscribe(conn,
-                                       NULL, BT_HAL_SINK_INTERFACE,
+                                       BT_HAL_BLUEZ_NAME, BT_HAL_SINK_INTERFACE,
                                        NULL, NULL, NULL, 0,
                                        __bt_hal_manager_event_filter,
                                        NULL, NULL);

diff --git a/bt-oal/bluez_hal/src/bt-hal-hdp-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-hdp-dbus-handler.c
index 7678685..002a109 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-hdp-dbus-handler.c
+++ b/bt-oal/bluez_hal/src/bt-hal-hdp-dbus-handler.c
@@ -529,7 +529,7 @@ static int __hdp_filter_subscribe_signal(GDBusConnection *conn,
        if (subscribe) {
                if (subs_add_filter_id == 0) {
                        subs_add_filter_id = g_dbus_connection_signal_subscribe(
-                                       conn, NULL, BT_HAL_HDP_DEVICE_INTERFACE,
+                                       conn, BT_HAL_BLUEZ_NAME, BT_HAL_HDP_DEVICE_INTERFACE,
                                        NULL, NULL, NULL, 0,
                                        __hdp_event_filter, NULL, NULL);
                } else {

diff --git a/bt-service-adaptation/services/ipsp/bt-service-ipsp-event-receiver.c b/bt-service-adaptation/services/ipsp/bt-service-ipsp-event-receiver.c
index 521cb58..5a54598 100644 (file)
--- a/bt-service-adaptation/services/ipsp/bt-service-ipsp-event-receiver.c
+++ b/bt-service-adaptation/services/ipsp/bt-service-ipsp-event-receiver.c
@@ -220,14 +220,14 @@ int _bt_register_ipsp_subscribe_signal(GDBusConnection *conn,
        if (subscribe) {
                if (subs_interface_added_id == -1) {
                        subs_interface_added_id = g_dbus_connection_signal_subscribe(conn,
-                               NULL, BT_MANAGER_INTERFACE,
+                               BT_BLUEZ_NAME, BT_MANAGER_INTERFACE,
                                BT_INTERFACES_ADDED, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
                }
                if (subs_interface_removed_id == -1) {
                        subs_interface_removed_id = g_dbus_connection_signal_subscribe(conn,
-                               NULL, BT_MANAGER_INTERFACE,
+                               BT_BLUEZ_NAME, BT_MANAGER_INTERFACE,
                                BT_INTERFACES_REMOVED, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
@@ -241,7 +241,7 @@ int _bt_register_ipsp_subscribe_signal(GDBusConnection *conn,
                }
                if (subs_ipsp_state_id == -1) {
                        subs_ipsp_state_id = g_dbus_connection_signal_subscribe(conn,
-                               NULL, BT_DEVICE_INTERFACE,
+                               BT_BLUEZ_NAME, BT_DEVICE_INTERFACE,
                                BT_IPSP_STATE_CHANGE, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);