summaryrefslogtreecommitdiffstats
path: root/hcid
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2006-08-20 22:31:34 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2006-08-20 22:31:34 +0000
commitd93952ad4b8e6ae7e212037ed1b37940560e814c (patch)
treeca5425fdfc7c889651f08615eae2529c9da91939 /hcid
parentec3ac41ca8876f36cc8869ab1c384980f793c40f (diff)
Fix processing of the timeout list in GMainContext
Diffstat (limited to 'hcid')
-rw-r--r--hcid/dbus-security.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c
index c9c6763f..5bc8adde 100644
--- a/hcid/dbus-security.c
+++ b/hcid/dbus-security.c
@@ -40,7 +40,7 @@
#include "hcid.h"
#define REQUEST_TIMEOUT (30 * 1000) /* 30 seconds */
-#define AGENT_TIMEOUT (1 * 10 * 1000) /* 3 minutes */
+#define AGENT_TIMEOUT (3 * 60 * 1000) /* 3 minutes */
static struct passkey_agent *default_agent = NULL;
@@ -255,10 +255,7 @@ static DBusHandlerResult register_agent(DBusConnection *conn,
if (!slist_find(adapter->passkey_agents, &ref, (cmp_func_t)agent_cmp))
name_listener_add(conn, ref.name, (name_cb_t)agent_exited, adapter);
- /* Because of bugs in glib-ectonomy.c this doesn't work yet */
-#if 0
agent->timeout = g_timeout_add(AGENT_TIMEOUT, (GSourceFunc)agent_timeout, agent);
-#endif
adapter->passkey_agents = slist_append(adapter->passkey_agents, agent);