From 46ebb5d7da3f856c8964eed47850e4e0697f957e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 26 Aug 2010 15:01:23 +0100
Subject: [PATCH] Update cable pairing plugin

---
 0001-Add-sixaxis-cable-pairing-plugin.patch | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/0001-Add-sixaxis-cable-pairing-plugin.patch b/0001-Add-sixaxis-cable-pairing-plugin.patch
index 72251ff..53fe2b5 100644
--- a/0001-Add-sixaxis-cable-pairing-plugin.patch
+++ b/0001-Add-sixaxis-cable-pairing-plugin.patch
@@ -1,4 +1,4 @@
-From 1927d7c37f761236eb9dfc90456444d6b01ad313 Mon Sep 17 00:00:00 2001
+From bdc307d37c30f103ceac4268553e6dcec497606b Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess@hadess.net>
 Date: Tue, 1 Sep 2009 17:32:48 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -17,11 +17,11 @@ address, and added to the database of the current default adapter.
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
-index 65d4312..0c284b9 100644
+index 47478c2..105d8c0 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -168,6 +168,11 @@ builtin_modules += service
- builtin_sources += plugins/service.c
+@@ -185,6 +185,11 @@ builtin_sources += attrib/main.c \
+ 		attrib/example.h attrib/example.c
  endif
  
 +if CABLE
@@ -32,7 +32,7 @@ index 65d4312..0c284b9 100644
  builtin_modules += hciops
  builtin_sources += plugins/hciops.c
  
-@@ -203,7 +208,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
+@@ -222,7 +227,7 @@ src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
  			src/dbus-common.c src/dbus-common.h \
  			src/dbus-hci.h src/dbus-hci.c
  src_bluetoothd_LDADD = lib/libbluetooth.la @GLIB_LIBS@ @DBUS_LIBS@ \
@@ -41,7 +41,7 @@ index 65d4312..0c284b9 100644
  src_bluetoothd_LDFLAGS = -Wl,--export-dynamic \
  					-Wl,--version-script=src/bluetooth.ver
  src_bluetoothd_DEPENDENCIES = src/bluetooth.ver lib/libbluetooth.la
-@@ -317,7 +322,7 @@ EXTRA_DIST += doc/manager-api.txt \
+@@ -337,7 +342,7 @@ EXTRA_DIST += doc/manager-api.txt \
  
  AM_YFLAGS = -d
  
@@ -51,7 +51,7 @@ index 65d4312..0c284b9 100644
  
  INCLUDES = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
 diff --git a/acinclude.m4 b/acinclude.m4
-index f5fdd66..0a25e7a 100644
+index 22c2e2c..e5d852e 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -146,6 +146,24 @@ AC_DEFUN([AC_PATH_USB], [
@@ -92,7 +92,7 @@ index f5fdd66..0a25e7a 100644
  	alsa_enable=${alsa_found}
  	gstreamer_enable=${gstreamer_found}
  	audio_enable=yes
-@@ -232,6 +253,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -237,6 +258,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  		usb_enable=${enableval}
  	])
  
@@ -107,7 +107,7 @@ index f5fdd66..0a25e7a 100644
  	AC_ARG_ENABLE(tracer, AC_HELP_STRING([--enable-tracer], [install Tracing daemon]), [
  		tracer_enable=${enableval}
  	])
-@@ -319,6 +348,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -324,6 +353,14 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  		AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
  	fi
  
@@ -122,14 +122,14 @@ index f5fdd66..0a25e7a 100644
  	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
  	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
  	AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" ||
-@@ -346,4 +383,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
+@@ -352,4 +389,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
  	AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
  	AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
  	AM_CONDITIONAL(MAEMO6PLUGIN, test "${maemo6_enable}" = "yes")
 +	AM_CONDITIONAL(CABLE, test "${cable_enable}" = "yes" && test "${cable_found}" = "yes")
  ])
 diff --git a/configure.ac b/configure.ac
-index b004f6e..f997c5a 100644
+index e8abfe9..c1a3725 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -40,7 +40,10 @@ AC_PATH_GLIB