[gthumb] [importer] do not ignore cancellation errors
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] [importer] do not ignore cancellation errors
- Date: Sun, 25 Jul 2010 16:46:29 +0000 (UTC)
commit 576077eb95358c25dce2b890e8884308cd145fe5
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Jul 25 18:46:02 2010 +0200
[importer] do not ignore cancellation errors
extensions/importer/gth-import-task.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/extensions/importer/gth-import-task.c b/extensions/importer/gth-import-task.c
index 3871988..b77ee03 100644
--- a/extensions/importer/gth-import-task.c
+++ b/extensions/importer/gth-import-task.c
@@ -183,6 +183,11 @@ write_metadata_ready_func (GError *error,
{
GthImportTask *self = user_data;
+ if ((error != NULL) && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ gth_task_completed (GTH_TASK (self), error);
+ return;
+ }
+
if (error != NULL)
g_clear_error (&error);
@@ -198,6 +203,11 @@ transformation_ready_cb (GError *error,
GthStringList *tag_list;
GList *file_list;
+ if ((error != NULL) && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ gth_task_completed (GTH_TASK (self), error);
+ return;
+ }
+
if ((self->priv->tags == NULL) || (self->priv->tags[0] == NULL)) {
catalog_imported_file (self);
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]