- Don't crash when exiting the wizard

This commit is contained in:
Bastien Nocera 2009-08-11 08:47:39 +00:00
parent 9d677f1718
commit 1c609b4259
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,32 @@
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

View File

@ -1,6 +1,6 @@
Name: gnome-bluetooth
Version: 2.27.9
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Bluetooth graphical utilities
Group: Applications/Communications
@ -9,6 +9,8 @@ URL: http://live.gnome.org/GnomeBluetooth
Source0: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Patch0: 0001-Bug-590874-crash-in-Bluetooth-adding-a-bluetoot.patch
BuildRequires: gtk2-devel
BuildRequires: GConf2-devel
BuildRequires: dbus-glib-devel
@ -61,6 +63,7 @@ for writing applications that require a Bluetooth device selection widget.
%prep
%setup -q -n gnome-bluetooth-%{version}
%patch0 -p1 -b .nm-crasher
%build
%configure --disable-desktop-update --disable-icon-update
@ -190,6 +193,9 @@ fi
%{_datadir}/gtk-doc/html/gnome-bluetooth/
%changelog
* Tue Aug 11 2009 Bastien Nocera <bnocera@redhat.com> 2.27.9-3
- Don't crash when exiting the wizard
* Thu Aug 06 2009 Bastien Nocera <bnocera@redhat.com> 2.27.9-2
- Remove requirement on the main package from -libs, and move
the icons from the main package to the -libs sub-package (#515845)