From fe5de84c0db9e7108000fe1b7a7136528b8f27d9 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 15 Dec 2008 17:17:22 +0200 Subject: Revert previous change to g_timeout_add_seconds These timeouts really need to be sub-second so g_timeout_add_seconds can't be used. --- audio/a2dp.c | 3 +-- serial/port.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/audio/a2dp.c b/audio/a2dp.c index 454a8426..af0cfe4d 100644 --- a/audio/a2dp.c +++ b/audio/a2dp.c @@ -799,8 +799,7 @@ static void close_cfm(struct avdtp *session, struct avdtp_local_sep *sep, } if (setup->reconfigure) - g_timeout_add_seconds(RECONFIGURE_TIMEOUT, - a2dp_reconfigure, setup); + g_timeout_add(RECONFIGURE_TIMEOUT, a2dp_reconfigure, setup); } static gboolean abort_ind(struct avdtp *session, struct avdtp_local_sep *sep, diff --git a/serial/port.c b/serial/port.c index 51250aa5..d66547ff 100644 --- a/serial/port.c +++ b/serial/port.c @@ -59,7 +59,7 @@ #define ERROR_DOES_NOT_EXIST "org.bluez.Error.DoesNotExist" #define MAX_OPEN_TRIES 5 -#define OPEN_WAIT 300 /* ms */ +#define OPEN_WAIT 300 /* ms. udev node creation retry wait */ struct serial_device { DBusConnection *conn; /* for name listener handling */ @@ -283,7 +283,7 @@ static int port_open(struct serial_port *port) fd = open(port->dev, O_RDONLY | O_NOCTTY); if (fd < 0) { - g_timeout_add_seconds(OPEN_WAIT, open_continue, port); + g_timeout_add(OPEN_WAIT, open_continue, port); return -EINPROGRESS; } -- cgit