summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-21 15:43:10 +0100
committerinfirit <[email protected]>2014-11-22 20:25:30 +0100
commitf4e64e2f675057d23a94277fa103479549f862bc (patch)
tree692b953739bc27e849bd39c0df817fdf2e30a5ce
parent4ac9f7cfef1d92f755797e6f5258f2b1dfc20acf (diff)
downloadengrampa-f4e64e2f675057d23a94277fa103479549f862bc.tar.bz2
engrampa-f4e64e2f675057d23a94277fa103479549f862bc.tar.xz
added a cancellable object to some GIO functions
Based on FR commit: a323c11554785a9861fff4ae919e91c076babd82 From: Paolo Bacchilega <[email protected]>
-rw-r--r--src/fr-archive.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fr-archive.c b/src/fr-archive.c
index 598d769..abe5dc3 100644
--- a/src/fr-archive.c
+++ b/src/fr-archive.c
@@ -1147,7 +1147,7 @@ load_local_archive (FrArchive *archive,
FrCommand *tmp_command;
const char *mime_type;
- if (! g_file_query_exists (archive->file, NULL)) {
+ if (! g_file_query_exists (archive->file, archive->priv->cancellable)) {
fr_archive_action_completed (archive,
FR_ACTION_LOADING_ARCHIVE,
FR_PROC_ERROR_GENERIC,
@@ -1254,11 +1254,13 @@ copy_remote_file (FrArchive *archive,
{
XferData *xfer_data;
- if (! g_file_query_exists (archive->file, NULL)) {
+ if (! g_file_query_exists (archive->file, archive->priv->cancellable)) {
GError *error;
+
error = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_FOUND, _("Archive not found"));
fr_archive_copy_done (archive, FR_ACTION_LOADING_ARCHIVE, error);
g_error_free (error);
+
return;
}