bluez/files/bluez-4.98-fix-socket.patch

diff --git a/audio/a2dp.c b/audio/a2dp.c
index c4cdc62..2eebe6b 100644
--- a/audio/a2dp.c
+++ b/audio/a2dp.c
@@ -1441,9 +1441,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
 
 int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
 {
-       int sbc_srcs = 1, sbc_sinks = 1;
+       int sbc_srcs = 0, sbc_sinks = 0;
        int mpeg12_srcs = 0, mpeg12_sinks = 0;
-       gboolean source = TRUE, sink = FALSE, socket = TRUE;
+       gboolean source = TRUE, sink = FALSE, socket = FALSE;
        gboolean delay_reporting = FALSE;
        char *str;
        GError *err = NULL;
@@ -1463,6 +1463,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
                        source = TRUE;
                if (strstr(str, "Source"))
                        sink = TRUE;
+               if (strstr(str, "Socket"))
+                       socket = TRUE;
                g_free(str);
        }
 
@@ -1482,18 +1484,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
        }
 
        /* Don't register any local sep if Socket is disabled */
-       if (socket == FALSE) {
-               sbc_srcs = 0;
-               sbc_sinks = 0;
-               mpeg12_srcs = 0;
-               mpeg12_sinks = 0;
+       if (socket == FALSE)
                goto proceed;
-       }
 
        str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
        if (err) {
                DBG("audio.conf: %s", err->message);
                g_clear_error(&err);
+               sbc_srcs = 1;
        } else {
                sbc_srcs = atoi(str);
                g_free(str);
@@ -1512,6 +1510,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
        if (err) {
                DBG("audio.conf: %s", err->message);
                g_clear_error(&err);
+               sbc_sinks = 1;
        } else {
                sbc_sinks = atoi(str);
                g_free(str);
1	diff --git a/audio/a2dp.c b/audio/a2dp.c
2	index c4cdc62..2eebe6b 100644
3	--- a/audio/a2dp.c
4	+++ b/audio/a2dp.c
5	@@ -1441,9 +1441,9 @@ static struct a2dp_server find_server(GSList list, const bdaddr_t *src)
6
7	int a2dp_register(DBusConnection conn, const bdaddr_t src, GKeyFile *config)
8	{
9	- int sbc_srcs = 1, sbc_sinks = 1;
10	+ int sbc_srcs = 0, sbc_sinks = 0;
11	int mpeg12_srcs = 0, mpeg12_sinks = 0;
12	- gboolean source = TRUE, sink = FALSE, socket = TRUE;
13	+ gboolean source = TRUE, sink = FALSE, socket = FALSE;
14	gboolean delay_reporting = FALSE;
15	char *str;
16	GError *err = NULL;
17	@@ -1463,6 +1463,8 @@ int a2dp_register(DBusConnection conn, const bdaddr_t src, GKeyFile *config)
18	source = TRUE;
19	if (strstr(str, "Source"))
20	sink = TRUE;
21	+ if (strstr(str, "Socket"))
22	+ socket = TRUE;
23	g_free(str);
24	}
25
26	@@ -1482,18 +1484,14 @@ int a2dp_register(DBusConnection conn, const bdaddr_t src, GKeyFile *config)
27	}
28
29	/* Don't register any local sep if Socket is disabled */
30	- if (socket == FALSE) {
31	- sbc_srcs = 0;
32	- sbc_sinks = 0;
33	- mpeg12_srcs = 0;
34	- mpeg12_sinks = 0;
35	+ if (socket == FALSE)
36	goto proceed;
37	- }
38
39	str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
40	if (err) {
41	DBG("audio.conf: %s", err->message);
42	g_clear_error(&err);
43	+ sbc_srcs = 1;
44	} else {
45	sbc_srcs = atoi(str);
46	g_free(str);
47	@@ -1512,6 +1510,7 @@ int a2dp_register(DBusConnection conn, const bdaddr_t src, GKeyFile *config)
48	if (err) {
49	DBG("audio.conf: %s", err->message);
50	g_clear_error(&err);
51	+ sbc_sinks = 1;
52	} else {
53	sbc_sinks = atoi(str);
54	g_free(str);