1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
From 80c36ae3c84dce8716eb5b74ddb8c73da5824f13 Mon Sep 17 00:00:00 2001
From: Paolo Bacchilega <paobac@src.gnome.org>
Date: Fri, 11 Oct 2013 19:38:27 +0000
Subject: ignore errors when setting file attributes
[bug #709932]
---
diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
index 44aaad2..19c5a1d 100644
--- a/src/fr-archive-libarchive.c
+++ b/src/fr-archive-libarchive.c
@@ -751,7 +751,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
GFileInfo *info;
info = _g_file_info_create_from_entry (entry, extract_data);
- _g_file_set_attributes_from_info (file, info, cancellable, &load_data->error);
+ _g_file_set_attributes_from_info (file, info, cancellable, NULL);
g_hash_table_insert (created_folders, g_object_ref (file), g_object_ref (info));
g_object_unref (info);
@@ -774,7 +774,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
if (r != ARCHIVE_EOF)
load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));
else
- _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, &load_data->error);
+ _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, NULL);
break;
case AE_IFLNK:
@@ -805,7 +805,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
}
if (load_data->error == NULL)
- restore_modification_time (created_folders, cancellable, &load_data->error);
+ restore_modification_time (created_folders, cancellable, NULL);
if ((load_data->error == NULL) && (r != ARCHIVE_EOF))
load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));
--
cgit v0.9.2
|
GitWeb
