From 37d31f23688bf6593de4f0f7c2e65481f3dd014b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Wed, 2 Sep 2009 14:41:08 +0000
Subject: [PATCH] - Update to 2.27.90

---
 .cvsignore                                    |  2 +-
 ...crash-in-Bluetooth-adding-a-bluetoot.patch | 32 -----------------
 ...not-working-in-the-properties-window.patch | 35 -------------------
 gnome-bluetooth.spec                          | 13 +++----
 sources                                       |  2 +-
 5 files changed, 7 insertions(+), 77 deletions(-)
 delete mode 100644 0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
 delete mode 100644 0001-Fix-keyboard-not-working-in-the-properties-window.patch

diff --git a/.cvsignore b/.cvsignore
index b4ff5c8..0652407 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-bluetooth-2.27.9.tar.bz2
+gnome-bluetooth-2.27.90.tar.bz2
diff --git a/0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch b/0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
deleted file mode 100644
index 93d37b2..0000000
--- a/0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3aa146fe46f994fcb0a8c431cfbd1d38a83a68f6 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 11 Aug 2009 09:40:45 +0100
-Subject: [PATCH] =?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
-
-Don't unload plugins, fixes crashes on exit when the plugins
-register GObject types.
----
- lib/bluetooth-plugin-manager.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/lib/bluetooth-plugin-manager.c b/lib/bluetooth-plugin-manager.c
-index c8db9ef..ab1751c 100644
---- a/lib/bluetooth-plugin-manager.c
-+++ b/lib/bluetooth-plugin-manager.c
-@@ -101,7 +101,9 @@ bluetooth_plugin_manager_cleanup (void)
- 	for (l = plugin_list; l != NULL; l = l->next) {
- 		GbtPlugin *p = l->data;
- 
--		g_module_close (p->module);
-+		/* Disabled as it causes crashes when plugins use
-+		 * the GObject type system */
-+		/* g_module_close (p->module); */
- 		g_free (p);
- 	}
- 	g_list_free (plugin_list);
--- 
-1.6.2.5
-
diff --git a/0001-Fix-keyboard-not-working-in-the-properties-window.patch b/0001-Fix-keyboard-not-working-in-the-properties-window.patch
deleted file mode 100644
index 5e0d8cd..0000000
--- a/0001-Fix-keyboard-not-working-in-the-properties-window.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b95f581c6b8b10ef6369f009e8dc88ab75db99ee Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 11 Aug 2009 16:03:03 +0100
-Subject: [PATCH] Fix keyboard not working in the properties window
-
-Wrong prototype for the key-press-event callback.
----
- properties/main.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/properties/main.c b/properties/main.c
-index 4cf435b..7a93026 100644
---- a/properties/main.c
-+++ b/properties/main.c
-@@ -51,7 +51,7 @@ static gboolean delete_callback(GtkWidget *window, GdkEvent *event,
- 	return FALSE;
- }
- 
--static void
-+static gboolean
- keypress_callback (GtkWidget *window,
- 		   GdkEventKey *key,
- 		   gpointer user_data)
-@@ -61,6 +61,8 @@ keypress_callback (GtkWidget *window,
- 
- 		gtk_main_quit();
- 	}
-+
-+	return FALSE;
- }
- 
- static void close_callback(GtkWidget *button, gpointer user_data)
--- 
-1.6.2.5
-
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 186cc42..c7e4c84 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -1,6 +1,6 @@
 Name:		gnome-bluetooth
-Version:	2.27.9
-Release:	5%{?dist}
+Version:	2.27.90
+Release:	1%{?dist}
 Summary:	Bluetooth graphical utilities
 
 Group:		Applications/Communications
@@ -10,10 +10,6 @@ Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-
 Source1:	61-gnome-bluetooth-rfkill.rules
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Patch0:		0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=516801
-Patch1:		0001-Fix-keyboard-not-working-in-the-properties-window.patch
-
 BuildRequires:	gtk2-devel
 BuildRequires:	GConf2-devel
 BuildRequires:	dbus-glib-devel
@@ -66,8 +62,6 @@ for writing applications that require a Bluetooth device selection widget.
 
 %prep
 %setup -q -n gnome-bluetooth-%{version}
-%patch0 -p1 -b .nm-crasher
-%patch1 -p1 -b .kbd
 
 %build
 %configure --disable-desktop-update --disable-icon-update
@@ -200,6 +194,9 @@ fi
 %{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Wed Sep 02 2009 Bastien Nocera <bnocera@redhat.com> 2.27.90-1
+- Update to 2.27.90
+
 * Tue Aug 11 2009 Bastien Nocera <bnocera@redhat.com> 2.27.9-5
 - Fix the friendly name not being editable (#516801)
 
diff --git a/sources b/sources
index 55ee90a..8333203 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4111b2578346b951d5c3fb2457c0f18  gnome-bluetooth-2.27.9.tar.bz2
+c58e676d6e95384ba27bde814a5a84bb  gnome-bluetooth-2.27.90.tar.bz2