rpms/bluez-gnome/devel bluez-wizard-fix-null-display.patch, NONE, 1.1 bluez-gnome.spec, 1.66, 1.67

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24654

Modified Files:
	bluez-gnome.spec 
Added Files:
	bluez-wizard-fix-null-display.patch 
Log Message:
* Thu Oct 16 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-5
- Fix potential crasher in the wizard


bluez-wizard-fix-null-display.patch:

--- NEW FILE bluez-wizard-fix-null-display.patch ---
From: Marcel Holtmann <marcel at holtmann.org>
Date: Mon, 6 Oct 2008 08:01:50 +0000 (+0200)
Subject: Display the alias instead of the remote device name
X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez-gnome.git;a=commitdiff_plain;h=7256de93be73f50913f6689a0690e3c0a28dfe3b

Display the alias instead of the remote device name
---

diff --git a/wizard/main.c b/wizard/main.c
index 01a1e9d..cf731e7 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -353,7 +353,7 @@ static void select_callback(GtkTreeSelection *selection, gpointer user_data)
 		gtk_tree_model_get(model, &iter,
 				BLUETOOTH_COLUMN_PAIRED, &paired,
 				BLUETOOTH_COLUMN_ADDRESS, &address,
-				BLUETOOTH_COLUMN_NAME, &name,
+				BLUETOOTH_COLUMN_ALIAS, &name,
 				BLUETOOTH_COLUMN_TYPE, &type, -1);
 
 		if (paired == TRUE)


Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- bluez-gnome.spec	14 Oct 2008 19:04:14 -0000	1.66
+++ bluez-gnome.spec	16 Oct 2008 19:29:06 -0000	1.67
@@ -1,6 +1,6 @@
 Name:		bluez-gnome
 Version:	1.8
-Release:	3%{?dist}
+Release:	5%{?dist}
 Summary:	Bluetooth pairing and control applet
 
 Group:		Applications/System
@@ -15,6 +15,10 @@
 Patch2:		0001-Fixes-for-adapter-specific-buttons.patch
 Patch3:		0002-Move-the-adapter-button-list-to-the-side.patch
 Patch4:		0003-Fix-trust-button.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=466988
+Patch5:		bluez-apple-wireless-kbd.patch
+# http://git.kernel.org/?p=bluetooth/bluez-gnome.git;a=commitdiff;h=7256de93be73f50913f6689a0690e3c0a28dfe3b
+Patch6:		bluez-wizard-fix-null-display.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +62,8 @@
 %patch2 -p1 -b .button
 %patch3 -p1 -b .move
 %patch4 -p1 -b .trust
+%patch5 -p1 -b .apple-kbd
+%patch6 -p1 -b .wizard-crash
 
 %build
 %configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -149,6 +155,12 @@
 %{_mandir}/man1/bluetooth-analyzer.1.gz
 
 %changelog
+* Thu Oct 16 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-5
+- Fix potential crasher in the wizard
+
+* Tue Oct 14 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-4
+- Try to fix Apple Wireless keyboard pairing (#466988)
+
 * Tue Oct 14 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-3
 - Add patches to clean up the button list (#465398)