rpms/bluez-pin/devel bluez-pin-0.30-null-pin.patch, NONE, 1.1 bluez-pin.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/bluez-pin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22170

Modified Files:
	bluez-pin.spec 
Added Files:
	bluez-pin-0.30-null-pin.patch 
Log Message:
More dbus breakage


bluez-pin-0.30-null-pin.patch:
 pin-dbus.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE bluez-pin-0.30-null-pin.patch ---
--- bluez-pin-0.27/pin-dbus.c~	2006-03-14 17:04:40.000000000 +0000
+++ bluez-pin-0.27/pin-dbus.c	2006-03-14 17:32:32.000000000 +0000
@@ -39,9 +39,10 @@ extern void bluez_pin_request (struct pi
 static void
 bluez_pin_send_dbus_reply (DBusConnection *connection, DBusMessage *message, const char *pin)
 {
-  dbus_message_append_args(message,
-			DBUS_TYPE_STRING, &pin,
-			DBUS_TYPE_INVALID);
+  if (pin)
+    dbus_message_append_args(message,
+			     DBUS_TYPE_STRING, &pin,
+			     DBUS_TYPE_INVALID);
 
   dbus_connection_send (connection, message, NULL);
 


Index: bluez-pin.spec
===================================================================
RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bluez-pin.spec	14 Mar 2006 16:27:09 -0000	1.13
+++ bluez-pin.spec	14 Mar 2006 17:34:47 -0000	1.14
@@ -10,6 +10,7 @@
 Patch1: bluez-pin-0.24-cflags.patch
 Patch2: bluez-pin-0.27-to-0.30.patch
 Patch3: bluez-pin-0.30-dbus-die-die-die.patch
+Patch4: bluez-pin-0.30-null-pin.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: dbus-devel >= 0.60, gtk2-devel, libglade2-devel, GConf2-devel
 BuildRequires: bluez-libs-devel, gettext
@@ -27,6 +28,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 make PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir}
@@ -50,6 +52,9 @@
 %{_sysconfdir}/xdg/autostart/bluez-pin.desktop
 
 %changelog
+* Tue Mar 14 2006 david Woodhouse <dwmw2 at redhat.com> - 0.30-2
+- Don't abort when user cancels a PIN request
+
 * Tue Mar 14 2006 david Woodhouse <dwmw2 at redhat.com> - 0.30-1
 - Update to bluez-pin 0.27, patched to 0.30 to avoid autocrap breakage
 - Fix dbus harder