Attachment #361662 for bug #489074

View | Details | Raw Unified | Return to bug 489074
Collapse All | Expand All




					GFileInfo *info;

					info = _g_file_info_create_from_entry (entry, extract_data);
					_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);

				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, NULL);
				break;

			case AE_IFLNK:

	}

	if (load_data->error == NULL)
		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));

Return to bug 489074

Lines 751-757 extract_archive_thread (GSimpleAsyncResult *result, Link Here

(-)a/src/fr-archive-libarchive.c (-3 / +3 lines)
751	GFileInfo *info;	751	GFileInfo *info;
752		752
753	info = _g_file_info_create_from_entry (entry, extract_data);	753	info = _g_file_info_create_from_entry (entry, extract_data);
754	_g_file_set_attributes_from_info (file, info, cancellable, &load_data->error);	754	_g_file_set_attributes_from_info (file, info, cancellable, NULL);
755	g_hash_table_insert (created_folders, g_object_ref (file), g_object_ref (info));	755	g_hash_table_insert (created_folders, g_object_ref (file), g_object_ref (info));
756		756
757	g_object_unref (info);	757	g_object_unref (info);
Lines 774-780 extract_archive_thread (GSimpleAsyncResult *result, Link Here
774	if (r != ARCHIVE_EOF)	774	if (r != ARCHIVE_EOF)
775	load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));	775	load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));
776	else	776	else
777	_g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, &load_data->error);	777	_g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, NULL);
778	break;	778	break;
779		779
780	case AE_IFLNK:	780	case AE_IFLNK:
Lines 805-811 extract_archive_thread (GSimpleAsyncResult *result, Link Here
805	}	805	}
806		806
807	if (load_data->error == NULL)	807	if (load_data->error == NULL)
808	restore_modification_time (created_folders, cancellable, &load_data->error);	808	restore_modification_time (created_folders, cancellable, NULL);
809		809
810	if ((load_data->error == NULL) && (r != ARCHIVE_EOF))	810	if ((load_data->error == NULL) && (r != ARCHIVE_EOF))
811	load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));	811	load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));