summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCidorvan Leite <cidorvan.leite@openbossa.org>2008-04-15 21:36:37 +0000
committerCidorvan Leite <cidorvan.leite@openbossa.org>2008-04-15 21:36:37 +0000
commit32af3c8695e06c519513c55411c13de4123db980 (patch)
treee028c5d445735f303a3a234bffab5c395287be88
parenta437235f74a3b924245bb61254d49f30e9d93363 (diff)
Fixed remove temporary device
-rw-r--r--hcid/adapter.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c
index 3f8be357..4be0f914 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -250,8 +250,6 @@ static struct bonding_request_info *bonding_request_new(DBusConnection *conn,
if (!device)
return NULL;
- device->temporary = TRUE;
-
if (agent_path && strcmp(agent_path, "/"))
device->agent = agent_create(adapter,
dbus_message_get_sender(msg), agent_path,
@@ -2452,7 +2450,8 @@ void remove_pending_device(struct adapter *adapter)
if (!device)
return;
- adapter_remove_device(adapter->bonding->conn, adapter, device);
+ if (device->temporary)
+ adapter_remove_device(adapter->bonding->conn, adapter, device);
}
static gboolean create_bonding_conn_complete(GIOChannel *io, GIOCondition cond,