summaryrefslogtreecommitdiffstats
path: root/hcid/adapter.c
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.dentz@indt.org.br>2008-07-04 19:45:36 -0300
committerLuiz Augusto von Dentz <luiz.dentz@indt.org.br>2008-07-28 10:33:19 -0300
commit670eacd442dd0d7fbaecd552cfb5ca32eaccea0e (patch)
tree398c4da00db81da286d4ecd1717d95145a466163 /hcid/adapter.c
parentc36942e998cd6187181df3033e53f1d624a5fd1a (diff)
Remove dbus-error.c dbus-error.h
Diffstat (limited to 'hcid/adapter.c')
-rw-r--r--hcid/adapter.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c
index 6658f31a..434a428b 100644
--- a/hcid/adapter.c
+++ b/hcid/adapter.c
@@ -58,7 +58,6 @@
#include "dbus-common.h"
#include "dbus-hci.h"
#include "dbus-database.h"
-#include "dbus-error.h"
#include "error.h"
#include "glib-helper.h"
#include "logging.h"
@@ -810,8 +809,9 @@ static gboolean create_bonding_conn_complete(GIOChannel *io, GIOCondition cond,
}
if (cond & G_IO_NVAL) {
- error_authentication_canceled(adapter->bonding->conn,
- adapter->bonding->msg);
+ DBusMessage *reply;
+ reply = new_authentication_return(adapter->bonding->msg, 0x09);
+ g_dbus_send_message(adapter->bonding->conn, reply);
goto cleanup;
}
@@ -860,8 +860,8 @@ static gboolean create_bonding_conn_complete(GIOChannel *io, GIOCondition cond,
dd = hci_open_dev(adapter->dev_id);
if (dd < 0) {
- error_no_such_adapter(adapter->bonding->conn,
- adapter->bonding->msg);
+ DBusMessage *reply = no_such_adapter(adapter->bonding->msg);
+ g_dbus_send_message(adapter->bonding->conn, reply);
goto failed;
}