rpms/gvfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix threading and dbus issues

Browse Source
This commit is contained in:
Matthias Clasen 2008-04-19 01:41:15 +00:00
parent e50becb745
commit 9895b17078
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gvfs-dbus-exit.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up gvfs-0.2.3/client/gdaemonvfs.c.dbus-exit gvfs-0.2.3/client/gdaemonvfs.c
--- gvfs-0.2.3/client/gdaemonvfs.c.dbus-exit 2008-04-18 21:29:52.000000000 -0400
+++ gvfs-0.2.3/client/gdaemonvfs.c 2008-04-18 21:29:28.000000000 -0400
@@ -298,6 +298,8 @@ g_daemon_vfs_init (GDaemonVfs *vfs)
vfs->wrapped_vfs = g_vfs_get_local ();
+ dbus_connection_set_exit_on_disconnect (vfs->async_bus, FALSE);
+
_g_dbus_connection_integrate_with_main (vfs->async_bus);
modules = g_io_modules_load_all_in_directory (GVFS_MODULE_DIR);
diff -up gvfs-0.2.3/hal/hal-pool.c.dbus-exit gvfs-0.2.3/hal/hal-pool.c
--- gvfs-0.2.3/hal/hal-pool.c.dbus-exit 2008-04-18 21:27:36.000000000 -0400
+++ gvfs-0.2.3/hal/hal-pool.c 2008-04-18 21:28:05.000000000 -0400
@@ -308,6 +308,8 @@ hal_pool_new (char **cap_only)
goto out;
}
+ dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
+
hal_ctx = libhal_ctx_new ();
if (hal_ctx == NULL)
{

6
gvfs.spec
View File

@ -44,6 +44,9 @@ Patch7: gvfs-unmount-scheme.patch
# http://mail.gnome.org/archives/gvfs-list/2008-April/msg00017.html # http://mail.gnome.org/archives/gvfs-list/2008-April/msg00017.html
Patch8: gvfs-fuse-threading.patch Patch8: gvfs-fuse-threading.patch
#
Patch9: gvfs-dbus-exit.patch
%description %description
The gvfs package provides backend implementations for the gio The gvfs package provides backend implementations for the gio
framework in GLib. It includes ftp, sftp, cifs. framework in GLib. It includes ftp, sftp, cifs.
@ -79,6 +82,7 @@ to access the gvfs filesystems.
%patch6 -p1 -b .gphoto-automount %patch6 -p1 -b .gphoto-automount
%patch7 -p1 -b .unmount-scheme %patch7 -p1 -b .unmount-scheme
%patch8 -p0 -b .fuse-threading %patch8 -p0 -b .fuse-threading
%patch9 -p1 -b .dbus-exit
%build %build
@ -184,6 +188,7 @@ update-desktop-database &> /dev/null ||:
%dir %{_includedir}/gvfs-client/gvfs %dir %{_includedir}/gvfs-client/gvfs
%{_includedir}/gvfs-client/gvfs/gvfsurimapper.h %{_includedir}/gvfs-client/gvfs/gvfsurimapper.h
%{_includedir}/gvfs-client/gvfs/gvfsuriutils.h %{_includedir}/gvfs-client/gvfs/gvfsuriutils.h
%{_libdir}/libgvfscommon.so
%files fuse %files fuse
@ -194,6 +199,7 @@ update-desktop-database &> /dev/null ||:
%changelog %changelog
* Fri Apr 18 2008 Matthias Clasen <mclasen@redhat.com> - 0.2.3-8 * Fri Apr 18 2008 Matthias Clasen <mclasen@redhat.com> - 0.2.3-8
- Fix thread-safety issues in gvfs-fuse-daemon - Fix thread-safety issues in gvfs-fuse-daemon
- Prevent dbus from shutting us down unexpectedly
* Thu Apr 17 2008 David Zeuthen <davidz@redhat.com> - 0.2.3-7 * Thu Apr 17 2008 David Zeuthen <davidz@redhat.com> - 0.2.3-7
- Put X-Gnome-Vfs-System=gio into mount-archarive.desktop (See #442835) - Put X-Gnome-Vfs-System=gio into mount-archarive.desktop (See #442835)