Index: audio/audio.conf
===================================================================
RCS file: /cvsroot/bluez/utils/audio/audio.conf,v
retrieving revision 1.5
diff -u -5 -p -r1.5 audio.conf
--- audio/audio.conf	23 Jan 2008 13:27:30 -0000	1.5
+++ audio/audio.conf	27 Feb 2008 15:22:16 -0000
@@ -16,11 +16,11 @@
 # service interacts with remote headset devices)
 [Headset]
 
 # Set to true to only support HSP
 # Defaults to false
-DisableHFP=true
+EnableHFP=false
 
 # HFP Gateway features
 # Defaults to false
 3WayCalling=false
 EchoCancelNoiseCancel=false
Index: audio/manager.c
===================================================================
RCS file: /cvsroot/bluez/utils/audio/manager.c,v
retrieving revision 1.90
diff -u -5 -p -r1.90 manager.c
--- audio/manager.c	19 Feb 2008 08:20:22 -0000	1.90
+++ audio/manager.c	27 Feb 2008 15:22:18 -0000
@@ -1538,11 +1538,11 @@ static GIOChannel *server_socket(uint8_t
 
 static int headset_server_init(DBusConnection *conn, GKeyFile *config)
 {
 	uint8_t chan = DEFAULT_HS_AG_CHANNEL;
 	sdp_buf_t buf;
-	gboolean no_hfp = FALSE;
+	gboolean hfp = TRUE;
 	GError *err = NULL;
 	uint32_t features;
 
 	if (!(enabled.headset || enabled.gateway))
 		return 0;
@@ -1567,20 +1567,20 @@ static int headset_server_init(DBusConne
 
 	g_io_add_watch(hs_server, G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
 				(GIOFunc) ag_io_cb, NULL);
 
 	if (config) {
-		no_hfp = g_key_file_get_boolean(config, "Headset", "DisableHFP",
+		hfp = g_key_file_get_boolean(config, "Headset", "EnableHFP",
 						&err);
 		if (err) {
 			debug("audio.conf: %s", err->message);
 			g_error_free(err);
 			err = NULL;
 		}
 	}
 
-	if (no_hfp)
+	if (!hfp)
 		return 0;
 
 	chan = DEFAULT_HF_AG_CHANNEL;
 
 	hf_server = server_socket(&chan);