diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
| commit | 17370895fde2d210bb50dfaa1c89fe6601de3467 (patch) | |
| tree | 2797d5e061b7948a53f270f9ccfcc31b1c0ad6f5 /network/connection.c | |
| parent | fa141e676e82cd20082779c086d1fef6427fdc20 (diff) | |
| parent | 393416b170d6e4b2b7406418d63c7be2aefda70f (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez
Diffstat (limited to 'network/connection.c')
| -rw-r--r-- | network/connection.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/network/connection.c b/network/connection.c index 16d3e383..c17950bc 100644 --- a/network/connection.c +++ b/network/connection.c @@ -44,7 +44,7 @@ #include "error.h" #include "common.h" -#define NETWORK_PEER_INTERFACE "org.bluez.network.Peer" +#define NETWORK_PEER_INTERFACE "org.bluez.Network" typedef enum { CONNECTED, @@ -123,12 +123,6 @@ static inline DBusMessage *not_connected(DBusMessage *msg) "Device not connected"); } -static inline DBusMessage *no_pending_connect(DBusMessage *msg) -{ - return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed", - "Device has no pending connect"); -} - static inline DBusMessage *connection_attempt_failed(DBusMessage *msg, int err) { return g_dbus_create_error(msg, ERROR_INTERFACE ".ConnectionAttemptFailed", |