rpms/gnome-bluetooth/F-11 gbt-f11-backport.patch, 1.1, 1.2 gnome-bluetooth.spec, 1.83, 1.84

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3535

Modified Files:
	gbt-f11-backport.patch gnome-bluetooth.spec 
Log Message:
* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-3
- Update backport to fix status in the applet


gbt-f11-backport.patch:
 applet/main.c                    |   39 +++++++++++-----
 b/applet/main.c                  |    4 -
 b/applet/notify.c                |    2 
 b/applet/popup-menu.ui           |    9 +++
 b/lib/bluetooth-client.c         |    5 +-
 b/lib/bluetooth-enums.h          |    7 ++-
 b/lib/bluetooth-plugin-manager.c |    5 +-
 b/lib/test-client.c              |   17 +++++--
 b/lib/test-plugins.c             |   12 ++++-
 b/properties/adapter.c           |    3 -
 b/properties/main.c              |    7 ++-
 b/wizard/main.c                  |    2 
 b/wizard/wizard.ui               |    3 -
 lib/bluetooth-client.c           |   91 ++++++++++++++++++++++++++-------------
 lib/bluetooth-enums.h            |   10 +---
 15 files changed, 148 insertions(+), 68 deletions(-)

Index: gbt-f11-backport.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gbt-f11-backport.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gbt-f11-backport.patch	16 Sep 2009 11:02:17 -0000	1.1
+++ gbt-f11-backport.patch	21 Sep 2009 16:07:50 -0000	1.2
@@ -1,7 +1,7 @@
 From 20bc51c9b4bca1913f2dce4e897fe73e4bf4710e Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 24 Jul 2009 12:12:38 +0100
-Subject: [PATCH 01/21] [Bug 589593] New: Crashes when disconnecting audio service
+Subject: [PATCH 01/22] [Bug 589593] New: Crashes when disconnecting audio service
 
 ---
  lib/bluetooth-client.c |    4 ++++
@@ -29,7 +29,7 @@ index b087861..caae303 100644
 From ea8e00974c687eba2bf2b735245ea2a3b4d80af9 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 24 Jul 2009 13:37:05 +0100
-Subject: [PATCH 02/21] Track the state of org.bluez.Audio service as well
+Subject: [PATCH 02/22] Track the state of org.bluez.Audio service as well
 
 Because otherwise we think it's still connected when it actually
 isn't. Fixes the device showing up as connected when it wasn't
@@ -90,7 +90,7 @@ index caae303..63582f1 100644
 From 050d5855db820dbaa9cc5000bb325d7f6d045f76 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 16:11:54 +0100
-Subject: [PATCH 03/21] Add status enumeration
+Subject: [PATCH 03/22] Add status enumeration
 
 To mark services as being connected, disconnected, or
 connecting.
@@ -122,7 +122,7 @@ index 7163607..3ec607a 100644
 From c7fc79a81d5397bbe171f547a38a6d7d606b3105 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 16:12:46 +0100
-Subject: [PATCH 04/21] Mark services as connecting
+Subject: [PATCH 04/22] Mark services as connecting
 
 When the service supports it, mark them as "connecting" when
 a connection is taking place. Only works for audio devices
@@ -226,7 +226,7 @@ index 63582f1..d639ba6 100644
 From b60e246b68250058c6917d1f423349050fafcb70 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 16:13:26 +0100
-Subject: [PATCH 05/21] Update test client for status changes
+Subject: [PATCH 05/22] Update test client for status changes
 
 The test client now knows whether a service is connecting.
 ---
@@ -275,7 +275,7 @@ index 57edcc2..56d5ebc 100644
 From 4a30c0b7ab2695d2a6937d17097372e80d08de5c Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 16:27:27 +0100
-Subject: [PATCH 06/21] Fix small memleak when changing the tooltip
+Subject: [PATCH 06/22] Fix small memleak when changing the tooltip
 
 When changing the tooltip of the applet, don't forget to free
 the old tooltip...
@@ -302,7 +302,7 @@ index f4dd3b5..e1f3ebc 100644
 From 03bb5b2198c1e8ec0f52e1dc34e858378d5de668 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 17:16:30 +0100
-Subject: [PATCH 07/21] Add support for "playing" status
+Subject: [PATCH 07/22] Add support for "playing" status
 
 As used in the A2DP and Headset services.
 ---
@@ -330,7 +330,7 @@ index 3ec607a..7563c4c 100644
 From 8110b166205759fc0e585573fe226373538df8ec Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Sun, 26 Jul 2009 20:43:52 +0100
-Subject: [PATCH 08/21] =?utf-8?q?Bug=20589681=20=E2=80=93=20Doesn't=20connect=20to=20input=20service=20on=20Sony=20Ericsson=20phones?=
+Subject: [PATCH 08/22] =?utf-8?q?Bug=20589681=20=E2=80=93=20Doesn't=20connect=20to=20input=20service=20on=20Sony=20Ericsson=20phones?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
@@ -381,7 +381,7 @@ index d639ba6..e929ad4 100644
 From f2ae6aa239df221ca096cdb604f0569218d6178a Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 15:50:22 +0100
-Subject: [PATCH 09/21] Fix thinko in disabling menu items
+Subject: [PATCH 09/22] Fix thinko in disabling menu items
 
 ---
  applet/main.c |    3 +--
@@ -408,7 +408,7 @@ index c826b9d..f9ea351 100644
 From fbd08ce783b8d25514e6436d05865267385c6834 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 16:02:08 +0100
-Subject: [PATCH 10/21] Print out errors when GtkBuilder files fail parsing
+Subject: [PATCH 10/22] Print out errors when GtkBuilder files fail parsing
 
 ---
  applet/main.c |   17 +++++++++++++++--
@@ -451,7 +451,7 @@ index f9ea351..c849e17 100644
 From df5c7c34bc948bfb1a81fe21fdd417365eba7ae0 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 18:10:41 +0100
-Subject: [PATCH 11/21] Update default-adapter-powered when no adapters are available
+Subject: [PATCH 11/22] Update default-adapter-powered when no adapters are available
 
 Otherwise we might think it's still enabled when it's not.
 ---
@@ -479,7 +479,7 @@ index e929ad4..52a7481 100644
 From e0f2fbece374182b30e6375eee04b76cb6ddf87b Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 18:26:05 +0100
-Subject: [PATCH 12/21] Update the Powered column on adapter changes
+Subject: [PATCH 12/22] Update the Powered column on adapter changes
 
 Otherwise we miss the adapter going down on soft block rfkill.
 ---
@@ -516,7 +516,7 @@ index 52a7481..c56cc8e 100644
 From b83c15e7c2ac8c24516fa97bc26a13eb40c40331 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 30 Jul 2009 18:30:00 +0100
-Subject: [PATCH 13/21] Hide unwanted menu items when Bluetooth is disabled
+Subject: [PATCH 13/22] Hide unwanted menu items when Bluetooth is disabled
 
 We don't care about much of the menu items when there's no
 adapters enabled.
@@ -590,7 +590,7 @@ index 0060ae4..a4677b0 100644
 From e1570bfc65aa2d26d7ca117a0b3e1a81f85d2d62 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 3 Aug 2009 15:55:48 +0100
-Subject: [PATCH 14/21] Fix underline in "Set up new device"
+Subject: [PATCH 14/22] Fix underline in "Set up new device"
 
 Spotted by Matthias Clasen
 ---
@@ -617,7 +617,7 @@ index 122df2b..8b6a7db 100644
 From abbe0a406ef3fb510d87580e96d2457d74f7b10b Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 11 Aug 2009 09:40:45 +0100
-Subject: [PATCH 15/21] =?utf-8?q?Bug=20590874=20=E2=80=93=20crash=20in=20Bluetooth:=20adding=20a=20bluetooth=20NAP=20phone?=
+Subject: [PATCH 15/22] =?utf-8?q?Bug=20590874=20=E2=80=93=20crash=20in=20Bluetooth:=20adding=20a=20bluetooth=20NAP=20phone?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
@@ -650,7 +650,7 @@ index c8db9ef..ab1751c 100644
 From fa90cb5852bcad75835d733613114355095005b2 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 11 Aug 2009 11:50:38 +0100
-Subject: [PATCH 16/21] Add D-Bus object path to the debug output
+Subject: [PATCH 16/22] Add D-Bus object path to the debug output
 
 ---
  properties/main.c |    6 +++++-
@@ -705,7 +705,7 @@ index da60ff5..535dfef 100644
 From eb1d160df6df18e40e096e0a340bc097603f2071 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Mon, 10 Aug 2009 11:20:37 +0100
-Subject: [PATCH 17/21] Handle delete-event in test-plugins
+Subject: [PATCH 17/22] Handle delete-event in test-plugins
 
 So we can have it exit cleanly for use with valgrind.
 ---
@@ -748,7 +748,7 @@ index ce4009b..ac06084 100644
 From bd1d8b99462098c03a1ec0f6ebae04c09f772575 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Tue, 1 Sep 2009 17:45:01 +0100
-Subject: [PATCH 18/21] =?utf-8?q?Bug=C2=A0593777=20-=20duplicate=20object=20id=20in=20ui=20file?=
+Subject: [PATCH 18/22] =?utf-8?q?Bug=C2=A0593777=20-=20duplicate=20object=20id=20in=20ui=20file?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
@@ -778,7 +778,7 @@ index 459f8b2..6b03cfc 100644
 From 22484ca7b5d2f7c2f12fbf3423b3ad93f354e407 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Thu, 3 Sep 2009 18:17:43 +0100
-Subject: [PATCH 19/21] =?utf-8?q?Bug=C2=A0594055=20-=20applet=20fails=20to=20connect=20to=20any=20disconnected=20audio=20device?=
+Subject: [PATCH 19/22] =?utf-8?q?Bug=C2=A0594055=20-=20applet=20fails=20to=20connect=20to=20any=20disconnected=20audio=20device?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: 8bit
@@ -845,7 +845,7 @@ index 7563c4c..450c38c 100644
 From 016e07941e3fac523f339f144aad0880118ccf36 Mon Sep 17 00:00:00 2001
 From: Stanislav Brabec <sbrabec at suse.cz>
 Date: Thu, 10 Sep 2009 16:20:35 +0100
-Subject: [PATCH 20/21] Fix crash on pairing request of known rfcomm device
+Subject: [PATCH 20/22] Fix crash on pairing request of known rfcomm device
 
 Fixes crash after access attempt to the device configured
 in rfcomm.conf, but not yet paired.
@@ -883,7 +883,7 @@ index c56cc8e..d7fef54 100644
 From d326df2d5b7f78222f70fb805c13ff0a54917535 Mon Sep 17 00:00:00 2001
 From: Bastien Nocera <hadess at hadess.net>
 Date: Fri, 11 Sep 2009 14:58:25 +0100
-Subject: [PATCH 21/21] Fix pairing with devices that require PIN entry
+Subject: [PATCH 21/22] Fix pairing with devices that require PIN entry
 
 If a device that has a fixed PIN was selected before a device that
 doesn't have one (for example, select a printer or audio headset,
@@ -910,3 +910,34 @@ index 4fde0de..31e10f7 100644
 -- 
 1.6.2.5
 
+
+From 8cc0b371d73b1ee53e405ce42e9cc51a7840847c Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Mon, 21 Sep 2009 16:59:18 +0100
+Subject: [PATCH 22/22] Bug 595845 - The applet shows wrong connection information
+
+Fix status information in the applet not matching the service status.
+https://bugzilla.gnome.org/show_bug.cgi?id=595845
+---
+ applet/main.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/applet/main.c b/applet/main.c
+index e9b077d..07a8bd9 100644
+--- a/applet/main.c
++++ b/applet/main.c
+@@ -727,8 +727,9 @@ update_device_list (GtkTreeIter *parent)
+ 
+ 			list = g_hash_table_get_values (services);
+ 			for (l = list; l != NULL; l = l->next) {
+-				gboolean val = GPOINTER_TO_INT (l->data);
+-				if (val != FALSE) {
++				BluetoothStatus val = GPOINTER_TO_INT (l->data);
++				if (val == BLUETOOTH_STATUS_CONNECTED ||
++				    val == BLUETOOTH_STATUS_PLAYING) {
+ 					is_connected = TRUE;
+ 					break;
+ 				}
+-- 
+1.6.2.5
+


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/F-11/gnome-bluetooth.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- gnome-bluetooth.spec	16 Sep 2009 11:02:18 -0000	1.83
+++ gnome-bluetooth.spec	21 Sep 2009 16:07:50 -0000	1.84
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
 Version:	2.27.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -8,6 +8,8 @@ License:	GPLv2+
 URL:		http://live.gnome.org/GnomeBluetooth
 Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
 # http://git.gnome.org/cgit/gnome-bluetooth/log/?h=fedora-11
+# Generated with:
+# git format-patch --stdout  59efa1c06153cd5bdaff64f7efca791c11c77f2f
 Patch0:		gbt-f11-backport.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -188,6 +190,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Mon Sep 21 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-3
+- Update backport to fix status in the applet
+
 * Wed Sep 16 2009 Bastien Nocera <bnocera at redhat.com> 2.27.8-2
 - Backport loads of bug fixes from master (#523001)