From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 5 Jan 2013 17:50:40 +0000 (-0800)
Subject: core: Remove default option for automatic connect timeout
X-Git-Tag: android-x86-4.4-r3~9024
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4ec50801c3789523354505910e7541c6b9b9b3c8;p=android-x86%2Fexternal-bluetooth-bluez.git

core: Remove default option for automatic connect timeout
---

diff --git a/src/main.c b/src/main.c
index a07d22198..8b6ad25bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -59,7 +59,6 @@
 
 #define BLUEZ_NAME "org.bluez"
 
-#define DEFAULT_AUTO_CONNECT_TIMEOUT  60 /* 60 seconds */
 #define DEFAULT_PAIRABLE_TIMEOUT       0 /* disabled */
 #define DEFAULT_DISCOVERABLE_TIMEOUT 180 /* 3 minutes */
 
@@ -272,7 +271,6 @@ static void init_defaults(void)
 	memset(&main_opts, 0, sizeof(main_opts));
 	main_opts.name = g_strdup_printf("BlueZ %s", VERSION);
 	main_opts.class = 0x000000;
-	main_opts.autoto = DEFAULT_AUTO_CONNECT_TIMEOUT;
 	main_opts.pairto = DEFAULT_PAIRABLE_TIMEOUT;
 	main_opts.discovto = DEFAULT_DISCOVERABLE_TIMEOUT;
 	main_opts.reverse_sdp = TRUE;