diff options
Diffstat (limited to 'hcid')
-rw-r--r-- | hcid/adapter.c | 20 | ||||
-rw-r--r-- | hcid/dbus-hci.c | 66 | ||||
-rw-r--r-- | hcid/dbus-sdp.c | 2 | ||||
-rw-r--r-- | hcid/dbus-service.c | 12 | ||||
-rw-r--r-- | hcid/device.c | 6 |
5 files changed, 53 insertions, 53 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c index d0226db5..3948908a 100644 --- a/hcid/adapter.c +++ b/hcid/adapter.c @@ -733,7 +733,7 @@ static DBusMessage *set_mode(DBusConnection *conn, DBusMessage *msg, } else { /* discoverable or limited */ if ((scan_enable & SCAN_INQUIRY) && (new_mode != adapter->mode)) { - dbus_connection_emit_signal(conn, + g_dbus_emit_signal(conn, dbus_message_get_path(msg), ADAPTER_INTERFACE, "ModeChanged", @@ -926,7 +926,7 @@ static DBusMessage *set_discoverable_timeout(DBusConnection *conn, resolve_paths(msg, &old_path, &new_path); - dbus_connection_emit_signal(conn, old_path, + g_dbus_emit_signal(conn, old_path, ADAPTER_INTERFACE, "DiscoverableTimeoutChanged", DBUS_TYPE_UINT32, &timeout, @@ -1238,7 +1238,7 @@ static DBusMessage *adapter_set_minor_class(DBusConnection *conn, return failed_strerror(msg, err); } - dbus_connection_emit_signal(conn, dbus_message_get_path(msg), + g_dbus_emit_signal(conn, dbus_message_get_path(msg), ADAPTER_INTERFACE, "MinorClassChanged", DBUS_TYPE_STRING, &minor, DBUS_TYPE_INVALID); @@ -2044,7 +2044,7 @@ static DBusMessage *adapter_set_remote_alias(DBusConnection *conn, resolve_paths(msg, &old_path, &new_path); - dbus_connection_emit_signal(conn, old_path, + g_dbus_emit_signal(conn, old_path, ADAPTER_INTERFACE, "RemoteAliasChanged", DBUS_TYPE_STRING, &addr, DBUS_TYPE_STRING, &alias, @@ -2096,7 +2096,7 @@ static DBusMessage *adapter_clear_remote_alias(DBusConnection *conn, return failed_strerror(msg, -ecode); if (had_alias) - dbus_connection_emit_signal(conn, dbus_message_get_path(msg), + g_dbus_emit_signal(conn, dbus_message_get_path(msg), ADAPTER_INTERFACE, "RemoteAliasCleared", DBUS_TYPE_STRING, &addr_ptr, @@ -2274,7 +2274,7 @@ static DBusMessage *adapter_dc_remote_device(DBusConnection *conn, adapter->pending_dc->conn_handle = ((struct active_conn_info *) l->data)->handle; - dbus_connection_emit_signal(conn, dbus_message_get_path(msg), + g_dbus_emit_signal(conn, dbus_message_get_path(msg), ADAPTER_INTERFACE, "RemoteDeviceDisconnectRequested", DBUS_TYPE_STRING, &peer_addr, @@ -2397,7 +2397,7 @@ static DBusMessage *remove_bonding(DBusConnection *conn, DBusMessage *msg, if (paired) { snprintf(path, MAX_PATH_LENGTH, BASE_PATH "/hci%d", adapter->dev_id); - dbus_connection_emit_signal(conn, path, + g_dbus_emit_signal(conn, path, ADAPTER_INTERFACE, "BondingRemoved", DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID); @@ -2438,7 +2438,7 @@ void adapter_remove_device(DBusConnection *conn, struct adapter *adapter, if (!device->temporary) { snprintf(path, MAX_PATH_LENGTH, "/hci%d", adapter->dev_id); - dbus_connection_emit_signal(conn, path, + g_dbus_emit_signal(conn, path, ADAPTER_INTERFACE, "DeviceRemoved", DBUS_TYPE_OBJECT_PATH, &device->path, @@ -3482,7 +3482,7 @@ static DBusMessage *adapter_set_trusted(DBusConnection *conn, resolve_paths(msg, &old_path, &new_path); - dbus_connection_emit_signal(conn, old_path, + g_dbus_emit_signal(conn, old_path, ADAPTER_INTERFACE, "TrustAdded", DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID); @@ -3556,7 +3556,7 @@ static DBusMessage *adapter_remove_trust(DBusConnection *conn, resolve_paths(msg, &old_path, &new_path); - dbus_connection_emit_signal(conn, old_path, + g_dbus_emit_signal(conn, old_path, ADAPTER_INTERFACE, "TrustRemoved", DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID); diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index 18210951..ec22bbce 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -347,7 +347,7 @@ static void adapter_mode_changed(struct adapter *adapter, uint8_t scan_enable) return; } - dbus_connection_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "ModeChanged", DBUS_TYPE_STRING, &mode, DBUS_TYPE_INVALID); @@ -400,14 +400,14 @@ static void reply_pending_requests(const char *path, struct adapter *adapter) if (hcid_dbus_use_experimental()) { const char *ptr = path + ADAPTER_PATH_INDEX; - dbus_connection_emit_signal(connection, ptr, + g_dbus_emit_signal(connection, ptr, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); } - dbus_connection_emit_signal(connection, path, + g_dbus_emit_signal(connection, path, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); @@ -420,7 +420,7 @@ static void reply_pending_requests(const char *path, struct adapter *adapter) if (adapter->pdiscov_active) { /* Send periodic discovery stopped signal exit or stop * the device */ - dbus_connection_emit_signal(connection, path, + g_dbus_emit_signal(connection, path, ADAPTER_INTERFACE, "PeriodicDiscoveryStopped", DBUS_TYPE_INVALID); @@ -583,14 +583,14 @@ int hcid_dbus_register_device(uint16_t id) * Send the adapter added signal */ if (hcid_dbus_use_experimental()) { - dbus_connection_emit_signal(connection, "/", + g_dbus_emit_signal(connection, "/", MANAGER_INTERFACE, "AdapterAdded", DBUS_TYPE_OBJECT_PATH, &ptr, DBUS_TYPE_INVALID); } - dbus_connection_emit_signal(connection, BASE_PATH, MANAGER_INTERFACE, + g_dbus_emit_signal(connection, BASE_PATH, MANAGER_INTERFACE, "AdapterAdded", DBUS_TYPE_STRING, &pptr, DBUS_TYPE_INVALID); @@ -622,14 +622,14 @@ int hcid_dbus_unregister_device(uint16_t id) snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, id); if (hcid_dbus_use_experimental()) { - dbus_connection_emit_signal(connection, "/", + g_dbus_emit_signal(connection, "/", MANAGER_INTERFACE, "AdapterRemoved", DBUS_TYPE_OBJECT_PATH, &ptr, DBUS_TYPE_INVALID); } - dbus_connection_emit_signal(connection, BASE_PATH, MANAGER_INTERFACE, + g_dbus_emit_signal(connection, BASE_PATH, MANAGER_INTERFACE, "AdapterRemoved", DBUS_TYPE_STRING, &pptr, DBUS_TYPE_INVALID); @@ -643,20 +643,20 @@ int hcid_dbus_unregister_device(uint16_t id) snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, new_default); if (hcid_dbus_use_experimental()) { - dbus_connection_emit_signal(connection, "/", + g_dbus_emit_signal(connection, "/", MANAGER_INTERFACE, "DefaultAdapterChanged", DBUS_TYPE_OBJECT_PATH, &ptr, DBUS_TYPE_INVALID); } - dbus_connection_emit_signal(connection, BASE_PATH, + g_dbus_emit_signal(connection, BASE_PATH, MANAGER_INTERFACE, "DefaultAdapterChanged", DBUS_TYPE_STRING, &pptr, DBUS_TYPE_INVALID); } else { *path = '\0'; - dbus_connection_emit_signal(connection, BASE_PATH, + g_dbus_emit_signal(connection, BASE_PATH, MANAGER_INTERFACE, "DefaultAdapterChanged", DBUS_TYPE_STRING, &pptr, @@ -795,7 +795,7 @@ int hcid_dbus_start_device(uint16_t id) ret = 0; mode = mode2str(adapter->mode); - dbus_connection_emit_signal(connection, path, ADAPTER_INTERFACE, + g_dbus_emit_signal(connection, path, ADAPTER_INTERFACE, "ModeChanged", DBUS_TYPE_STRING, &mode, DBUS_TYPE_INVALID); @@ -809,13 +809,13 @@ int hcid_dbus_start_device(uint16_t id) if (get_default_adapter() < 0) { set_default_adapter(id); if (hcid_dbus_use_experimental()) - dbus_connection_emit_signal(connection, "/", + g_dbus_emit_signal(connection, "/", MANAGER_INTERFACE, "DefaultAdapterChanged", DBUS_TYPE_OBJECT_PATH, &ptr, DBUS_TYPE_INVALID); - dbus_connection_emit_signal(connection, BASE_PATH, + g_dbus_emit_signal(connection, BASE_PATH, MANAGER_INTERFACE, "DefaultAdapterChanged", DBUS_TYPE_STRING, &pptr, @@ -841,7 +841,7 @@ static void send_dc_signal(struct active_conn_info *dev, const char *path) ba2str(&dev->bdaddr, addr); - dbus_connection_emit_signal(connection, path, ADAPTER_INTERFACE, + g_dbus_emit_signal(connection, path, ADAPTER_INTERFACE, "RemoteDeviceDisconnected", DBUS_TYPE_STRING, &paddr, DBUS_TYPE_INVALID); @@ -1224,7 +1224,7 @@ void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, device->temporary = FALSE; - dbus_connection_emit_signal(connection, ptr, + g_dbus_emit_signal(connection, ptr, ADAPTER_INTERFACE, "DeviceCreated", DBUS_TYPE_OBJECT_PATH, @@ -1309,7 +1309,7 @@ void hcid_dbus_inquiry_start(bdaddr_t *local) DBUS_TYPE_INVALID); if (hcid_dbus_use_experimental()) - dbus_connection_emit_signal(connection, + g_dbus_emit_signal(connection, adapter->path + ADAPTER_PATH_INDEX, ADAPTER_INTERFACE, "DiscoveryStarted", @@ -1418,7 +1418,7 @@ static void send_out_of_range(const char *path, GSList *l) while (l) { const char *peer_addr = l->data; - dbus_connection_emit_signal(connection, path, + g_dbus_emit_signal(connection, path, ADAPTER_INTERFACE, "RemoteDeviceDisappeared", DBUS_TYPE_STRING, &peer_addr, @@ -1426,7 +1426,7 @@ static void send_out_of_range(const char *path, GSList *l) if (hcid_dbus_use_experimental()) { const char *ptr = path + ADAPTER_PATH_INDEX; - dbus_connection_emit_signal(connection, ptr, + g_dbus_emit_signal(connection, ptr, ADAPTER_INTERFACE, "DeviceDisappeared", DBUS_TYPE_STRING, @@ -1497,14 +1497,14 @@ void hcid_dbus_inquiry_complete(bdaddr_t *local) if (adapter->discov_active) { if (hcid_dbus_use_experimental()) { const char *ptr = adapter->path + ADAPTER_PATH_INDEX; - dbus_connection_emit_signal(connection, ptr, + g_dbus_emit_signal(connection, ptr, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); } - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); @@ -1565,7 +1565,7 @@ void hcid_dbus_periodic_inquiry_start(bdaddr_t *local, uint8_t status) DBUS_TYPE_BOOLEAN, &adapter->pdiscov_active); - dbus_connection_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "PeriodicDiscoveryStarted", DBUS_TYPE_INVALID); } @@ -1613,12 +1613,12 @@ void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status) * periodic inquiry */ if (adapter->discov_active) { if (hcid_dbus_use_experimental()) - dbus_connection_emit_signal(connection, ptr, + g_dbus_emit_signal(connection, ptr, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); @@ -1626,7 +1626,7 @@ void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status) } /* Send discovery completed signal if there isn't name to resolve */ - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "PeriodicDiscoveryStopped", DBUS_TYPE_INVALID); @@ -1734,7 +1734,7 @@ void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, } /* send the device found signal */ - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "RemoteDeviceFound", DBUS_TYPE_STRING, &paddr, @@ -1779,7 +1779,7 @@ void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, } if (name) { - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "RemoteNameUpdated", DBUS_TYPE_STRING, &paddr, @@ -1871,13 +1871,13 @@ void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status, ba2str(peer, peer_addr); if (status) - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "RemoteNameFailed", DBUS_TYPE_STRING, &paddr, DBUS_TYPE_INVALID); else { - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "RemoteNameUpdated", DBUS_TYPE_STRING, &paddr, @@ -1933,13 +1933,13 @@ void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status, if (adapter->discov_active) { if (hcid_dbus_use_experimental()) - dbus_connection_emit_signal(connection, + g_dbus_emit_signal(connection, adapter->path + ADAPTER_PATH_INDEX, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); @@ -1979,7 +1979,7 @@ void hcid_dbus_conn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, adapter->bonding->hci_status = status; } else { /* Send the remote device connected signal */ - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "RemoteDeviceConnected", DBUS_TYPE_STRING, &paddr, @@ -2088,7 +2088,7 @@ void hcid_dbus_disconn_complete(bdaddr_t *local, uint8_t status, } /* Send the remote device disconnected signal */ - dbus_connection_emit_signal(connection, adapter->path, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "RemoteDeviceDisconnected", DBUS_TYPE_STRING, &paddr, diff --git a/hcid/dbus-sdp.c b/hcid/dbus-sdp.c index 124825a4..4bf5b6f0 100644 --- a/hcid/dbus-sdp.c +++ b/hcid/dbus-sdp.c @@ -823,7 +823,7 @@ static void remote_svc_identifiers_completed_cb(uint8_t type, uint16_t err, dbus_message_unref(reply); if (len) - dbus_connection_emit_signal(ctxt->conn, + g_dbus_emit_signal(ctxt->conn, dbus_message_get_path(ctxt->rq), ADAPTER_INTERFACE, "RemoteIdentifiersUpdated", diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c index c05a7d6d..0f7b34a1 100644 --- a/hcid/dbus-service.c +++ b/hcid/dbus-service.c @@ -260,7 +260,7 @@ static DBusMessage *set_trusted(DBusConnection *conn, write_trust(BDADDR_ANY, address, service->ident, TRUE); - dbus_connection_emit_signal(conn, service->object_path, + g_dbus_emit_signal(conn, service->object_path, SERVICE_INTERFACE, "TrustAdded", DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID); @@ -344,7 +344,7 @@ static DBusMessage *remove_trust(DBusConnection *conn, write_trust(BDADDR_ANY, address, service->ident, FALSE); - dbus_connection_emit_signal(conn, service->object_path, + g_dbus_emit_signal(conn, service->object_path, SERVICE_INTERFACE, "TrustRemoved", DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID); @@ -397,11 +397,11 @@ static int unregister_service_for_connection(DBusConnection *connection, if (!conn) goto cleanup; - dbus_connection_emit_signal(conn, service->object_path, + g_dbus_emit_signal(conn, service->object_path, SERVICE_INTERFACE, "Stopped", DBUS_TYPE_INVALID); - dbus_connection_emit_signal(conn, BASE_PATH, MANAGER_INTERFACE, + g_dbus_emit_signal(conn, BASE_PATH, MANAGER_INTERFACE, "ServiceRemoved", DBUS_TYPE_STRING, &service->object_path, DBUS_TYPE_INVALID); @@ -637,12 +637,12 @@ int register_service(const char *ident, const char **uuids) if (uuids) register_uuids(ident, uuids); - dbus_connection_emit_signal(conn, BASE_PATH, MANAGER_INTERFACE, + g_dbus_emit_signal(conn, BASE_PATH, MANAGER_INTERFACE, "ServiceAdded", DBUS_TYPE_STRING, &service->object_path, DBUS_TYPE_INVALID); - dbus_connection_emit_signal(conn, service->object_path, + g_dbus_emit_signal(conn, service->object_path, SERVICE_INTERFACE, "Started", DBUS_TYPE_INVALID); diff --git a/hcid/device.c b/hcid/device.c index 9a814047..8cd0c131 100644 --- a/hcid/device.c +++ b/hcid/device.c @@ -924,7 +924,7 @@ static DBusMessage *set_alias(DBusConnection *conn, DBusMessage *msg, snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, adapter->dev_id); - dbus_connection_emit_signal(conn, path, + g_dbus_emit_signal(conn, path, ADAPTER_INTERFACE, "RemoteAliasChanged", DBUS_TYPE_STRING, &device->address, DBUS_TYPE_STRING, &str, @@ -953,7 +953,7 @@ static DBusMessage *set_trust(DBusConnection *conn, DBusMessage *msg, snprintf(path, sizeof(path), "%s/hci%d", BASE_PATH, adapter->dev_id); - dbus_connection_emit_signal(conn, path, + g_dbus_emit_signal(conn, path, ADAPTER_INTERFACE, value ? "TrustAdded" : "TrustRemoved", DBUS_TYPE_STRING, &device->address, @@ -1147,7 +1147,7 @@ static void browse_cb(sdp_list_t *recs, int err, gpointer user_data) } proceed: - dbus_connection_emit_signal(req->conn, dbus_message_get_path(req->msg), + g_dbus_emit_signal(req->conn, dbus_message_get_path(req->msg), ADAPTER_INTERFACE, "DeviceCreated", DBUS_TYPE_OBJECT_PATH, &device->path, DBUS_TYPE_INVALID); |