diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-11-30 00:44:37 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-11-30 00:44:37 +0200 |
| commit | 24403d166c5a1048ad5a7e997f28a6127d1fb216 (patch) | |
| tree | fb99865df6bf5917b302200e9c80a877ae7deb5b /src/adapter.c | |
| parent | b20e48058e9dfc87e50334d20e36b089e1eaded0 (diff) | |
Fix Powered property change sending for different offmodes
Diffstat (limited to 'src/adapter.c')
| -rw-r--r-- | src/adapter.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/adapter.c b/src/adapter.c index bf98870e..db0335f3 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2586,8 +2586,10 @@ proceed: } g_free(cl); - emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE, - "Powered", DBUS_TYPE_BOOLEAN, &powered); + if (main_opts.offmode == HCID_OFFMODE_DEVDOWN) + emit_property_changed(connection, adapter->path, + ADAPTER_INTERFACE, "Powered", + DBUS_TYPE_BOOLEAN, &powered); emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE, "Pairable", @@ -3135,7 +3137,7 @@ void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode) { const gchar *path = adapter_get_path(adapter); gboolean powered, discoverable; - int dd, stored_mode = adapter->mode; + int dd; if (adapter->scan_mode == scan_mode) return; @@ -3175,7 +3177,7 @@ void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode) } if (powered == FALSE || - (stored_mode == MODE_OFF && + (main_opts.offmode == HCID_OFFMODE_NOSCAN && adapter->scan_mode == SCAN_DISABLED)) emit_property_changed(connection, path, ADAPTER_INTERFACE, "Powered", |