summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-03-31 01:48:43 +0100
committerBastien Nocera <hadess@hadess.net>2013-04-02 13:51:27 +0200
commit070294d1bac480f45eb4b5573d4aa6b8380e7fdc (patch)
tree3586120f0fc89f3a8984085e81f10c9c2ebf4395
parent7d6b36dae188d249365eb2716c34b23ebebab5f6 (diff)
downloadgvfs-070294d1bac480f45eb4b5573d4aa6b8380e7fdc.tar.gz
obexftp: Fix crasher due to missing D-Bus threads support
Spotted by Serge Gavrilov <serge@pdmi.ras.ru> The GDbus port removed the need for us to initialise libdbus' threads support, and commit 7d4bd61385cd56db5507ee31b14724244b637da4 removed the last call to it. However, the obexftp backend still hasn't fully been ported to GDbus, and needs this threading support. Re-add it directly in the backend. https://bugzilla.gnome.org/show_bug.cgi?id=693574
-rw-r--r--daemon/gvfsbackendobexftp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c
index 242250cf..3ce52bb2 100644
--- a/daemon/gvfsbackendobexftp.c
+++ b/daemon/gvfsbackendobexftp.c
@@ -2142,6 +2142,8 @@ g_vfs_backend_obexftp_class_init (GVfsBackendObexftpClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GVfsBackendClass *backend_class = G_VFS_BACKEND_CLASS (klass);
+ dbus_threads_init_default ();
+
gobject_class->finalize = g_vfs_backend_obexftp_finalize;
backend_class->mount = do_mount;