summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-09-18 18:35:28 +0200
committerBastien Nocera <hadess@hadess.net>2015-03-10 14:46:49 +0100
commita4f0bf37825378af9042eb6d95aa0d3d2b9df8d4 (patch)
treed523352345239a7ed0160f079b307646b8e23391
parent32adf492a9a2ab5cef953cf2dfd9f00c25c785e7 (diff)
downloadgvfs-a4f0bf37825378af9042eb6d95aa0d3d2b9df8d4.tar.gz
gphoto2: Exit cleanly when device is removed
As the other backends do, and removes 2 FIXMEs. https://bugzilla.gnome.org/show_bug.cgi?id=708316
-rw-r--r--daemon/gvfsbackendgphoto2.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
index 90d8dd92..2690c71a 100644
--- a/daemon/gvfsbackendgphoto2.c
+++ b/daemon/gvfsbackendgphoto2.c
@@ -809,8 +809,7 @@ on_uevent (GUdevClient *client, gchar *action, GUdevDevice *device, gpointer use
/* nuke all caches so we're a bit more valgrind friendly */
caches_invalidate_all (gphoto2_backend);
- /* TODO: need a cleaner way to force unmount ourselves */
- exit (1);
+ g_vfs_backend_force_unmount (G_VFS_BACKEND (gphoto2_backend));
}
}
@@ -1028,8 +1027,7 @@ _hal_device_removed (LibHalContext *hal_ctx, const char *udi)
/* nuke all caches so we're a bit more valgrind friendly */
caches_invalidate_all (gphoto2_backend);
- /* TODO: need a cleaner way to force unmount ourselves */
- exit (1);
+ g_vfs_backend_force_unmount (G_VFS_BACKEND (gphoto2_backend));
}
}
#endif