diff options
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/gvfsbackendobexftp.c | 6 | ||||
-rw-r--r-- | daemon/gvfsbackendtrash.c | 24 | ||||
-rw-r--r-- | daemon/trashlib/trashitem.c | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/daemon/gvfsbackendobexftp.c b/daemon/gvfsbackendobexftp.c index f1be2e8a..561075ce 100644 --- a/daemon/gvfsbackendobexftp.c +++ b/daemon/gvfsbackendobexftp.c @@ -1596,9 +1596,9 @@ _push_single_file_helper (GVfsBackendObexftp *op_backend, if (g_vfs_job_is_cancelled (G_VFS_JOB (job))) { - g_set_error (error, G_IO_ERROR, - G_IO_ERROR_CANCELLED, - _("Operation was cancelled")); + g_set_error_literal (error, G_IO_ERROR, + G_IO_ERROR_CANCELLED, + _("Operation was cancelled")); return FALSE; } diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c index 3506a2cc..11915440 100644 --- a/daemon/gvfsbackendtrash.c +++ b/daemon/gvfsbackendtrash.c @@ -212,8 +212,8 @@ trash_backend_get_file (GVfsBackendTrash *backend, } if (file == NULL) - g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, - _("No such file or directory")); + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND, + _("No such file or directory")); return file; } @@ -228,8 +228,8 @@ trash_backend_open_for_read (GVfsBackend *vfs_backend, GError *error = NULL; if (filename[1] == '\0') - g_set_error (&error, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY, - _("Can't open directory")); + g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_IS_DIRECTORY, + _("Can't open directory")); else { @@ -366,8 +366,8 @@ trash_backend_delete (GVfsBackend *vfs_backend, g_print ("before job: %d\n", G_OBJECT(job)->ref_count); if (filename[1] == '\0') - g_set_error (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, - _("The trash folder may not be deleted")); + g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, + _("The trash folder may not be deleted")); else { gboolean is_toplevel; @@ -383,8 +383,8 @@ trash_backend_delete (GVfsBackend *vfs_backend, g_object_unref (real); if (!is_toplevel) - g_set_error (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, - _("Items in the trash may not be modified")); + g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, + _("Items in the trash may not be modified")); else { @@ -422,8 +422,8 @@ trash_backend_pull (GVfsBackend *vfs_backend, GError *error = NULL; if (source[1] == '\0') - g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - _("The trash folder may not be deleted")); + g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + _("The trash folder may not be deleted")); else { gboolean is_toplevel; @@ -436,8 +436,8 @@ trash_backend_pull (GVfsBackend *vfs_backend, if (real) { if (remove_source && !is_toplevel) - g_set_error (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, - _("Items in the trash may not be modified")); + g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, + _("Items in the trash may not be modified")); else { diff --git a/daemon/trashlib/trashitem.c b/daemon/trashlib/trashitem.c index 2640e18d..cdb33a7b 100644 --- a/daemon/trashlib/trashitem.c +++ b/daemon/trashlib/trashitem.c @@ -492,8 +492,8 @@ trash_item_delete (TrashItem *item, g_object_unref (expunged); if (!success) - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - "Failed to delete the item from the trash"); + g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Failed to delete the item from the trash"); return success; } |