[bluez/f19] Correct Sixaxis name in preferences

[Bastien Nocera]

commit 5b342861ee80ac72da959a010f03627fd3046d10
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Jul 24 12:28:02 2013 +0200

    Correct Sixaxis name in preferences

 0001-Add-sixaxis-cable-pairing-plugin.patch |   15 ++++++++-------
 bluez.spec                                  |    5 ++++-
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/0001-Add-sixaxis-cable-pairing-plugin.patch b/0001-Add-sixaxis-cable-pairing-plugin.patch
index 88c8b53..caf6fcd 100644
--- a/0001-Add-sixaxis-cable-pairing-plugin.patch
+++ b/0001-Add-sixaxis-cable-pairing-plugin.patch
@@ -1,4 +1,4 @@
-From 03827726cebf7d8b5bc5a4e7859ea92a7e62044f Mon Sep 17 00:00:00 2001
+From 1aad4a786557efeef5df1f92ab945d13980b8409 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 30 Dec 2011 12:34:29 +0100
 Subject: [PATCH] Add sixaxis cable-pairing plugin
@@ -12,12 +12,12 @@ address, and added to the database of the current default adapter.
  Makefile.am     |   9 +-
  acinclude.m4    |  16 +++
  configure.ac    |   1 +
- plugins/cable.c | 382 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ plugins/cable.c | 383 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  src/adapter.c   |  19 +++
  src/adapter.h   |   3 +
  src/device.c    |  37 ++++--
  src/device.h    |   2 +
- 8 files changed, 456 insertions(+), 13 deletions(-)
+ 8 files changed, 457 insertions(+), 13 deletions(-)
  create mode 100644 plugins/cable.c
 
 diff --git a/Makefile.am b/Makefile.am
@@ -121,10 +121,10 @@ index f2db920..8e7ad79 100644
  AC_PATH_CHECK
 diff --git a/plugins/cable.c b/plugins/cable.c
 new file mode 100644
-index 0000000..89333c4
+index 0000000..bd9264c
 --- /dev/null
 +++ b/plugins/cable.c
-@@ -0,0 +1,382 @@
+@@ -0,0 +1,383 @@
 +/*
 + *
 + *  BlueZ - Bluetooth protocol stack for Linux
@@ -204,7 +204,7 @@ index 0000000..89333c4
 +	adapter_get_address(adapter, &src);
 +	ba2str(&src, srcaddr);
 +
-+	write_device_name(&dst, &src, (char *) name);
++	write_device_name(&src, &dst, (char *) name);
 +
 +	/* Store the device's SDP record */
 +	rec = record_from_string(pnp_record);
@@ -212,9 +212,10 @@ index 0000000..89333c4
 +	sdp_record_free(rec);
 +	/* Set the device id */
 +	store_device_id(srcaddr, address, 0xffff, vendor_id, product_id, 0);
++	device_set_pnpid(device, 0xffff, vendor_id, product_id, 0);
 +	/* Don't write a profile, it will be updated when the device connects */
 +
-+	device_set_trust (conn, device, TRUE);
++	device_set_trust(conn, device, TRUE);
 +
 +	return device;
 +}
diff --git a/bluez.spec b/bluez.spec
index 76f4353..ee7bbf2 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.101
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.bluez.org/
@@ -337,6 +337,9 @@ fi
 %exclude /usr/lib/udev/rules.d/97-bluetooth-hid2hci.rules
 
 %changelog
+* Wed Jul 24 2013 Bastien Nocera <bnocera at redhat.com> 4.101-10
+- Correct Sixaxis name in preferences
+
 * Tue Jul 23 2013 Bastien Nocera <bnocera at redhat.com> 4.101-9
 - Fix trust setting in Sixaxis devices