From 20657a1ede2d4ac76174be2b893e4a3fdab5b8d1 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 14 Feb 2008 15:53:38 +0000 Subject: If lookup returns NULL it already set the error. Handle this in all 2008-02-14 Alexander Larsson * daemon/gvfsbackendcomputer.c: If lookup returns NULL it already set the error. Handle this in all callers. svn path=/trunk/; revision=1274 --- daemon/gvfsbackendcomputer.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'daemon/gvfsbackendcomputer.c') diff --git a/daemon/gvfsbackendcomputer.c b/daemon/gvfsbackendcomputer.c index b31a9bc6..3a952185 100644 --- a/daemon/gvfsbackendcomputer.c +++ b/daemon/gvfsbackendcomputer.c @@ -697,11 +697,14 @@ try_query_info (GVfsBackend *backend, g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, FALSE); g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH, FALSE); g_file_info_set_content_type (info, "inode/directory"); + + g_vfs_job_succeeded (G_VFS_JOB (job)); } else if (file != NULL) - file_info_from_file (file, info); - - g_vfs_job_succeeded (G_VFS_JOB (job)); + { + file_info_from_file (file, info); + g_vfs_job_succeeded (G_VFS_JOB (job)); + } return TRUE; } @@ -722,9 +725,11 @@ try_create_dir_monitor (GVfsBackend *backend, if (file != &root) { - g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR, - G_IO_ERROR_NOT_SUPPORTED, - _("Can't open mountable file")); + if (file != NULL) + g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR, + G_IO_ERROR_NOT_SUPPORTED, + _("Can't open mountable file")); + return TRUE; } -- cgit v1.2.1