[gthumb] use a single flags parameter instead of boolean parameters
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] use a single flags parameter instead of boolean parameters
- Date: Sun, 15 Mar 2015 17:36:19 +0000 (UTC)
commit ff3cc0e40cc2011681b60c472540179ca839c72a
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Mar 1 17:09:34 2015 +0100
use a single flags parameter instead of boolean parameters
allow to ignore a task error with the GTH_TASK_FLAGS_IGNORE_ERROR
flag.
extensions/burn_disc/actions.c | 2 +-
extensions/catalogs/dlg-organize-files.c | 2 +-
extensions/change_date/dlg-change-date.c | 2 +-
extensions/comments/actions.c | 2 +-
extensions/contact_sheet/dlg-contact-sheet.c | 2 +-
extensions/contact_sheet/dlg-image-wall.c | 2 +-
extensions/convert_format/dlg-convert-format.c | 2 +-
extensions/desktop_background/actions.c | 2 +-
extensions/edit_metadata/actions.c | 2 +-
extensions/edit_metadata/dlg-edit-metadata.c | 4 ++--
extensions/facebook/dlg-export-to-facebook.c | 2 +-
extensions/facebook/dlg-import-from-facebook.c | 4 ++--
extensions/file_manager/actions.c | 6 +++---
extensions/file_manager/callbacks.c | 6 +++---
.../file_tools/gth-file-tool-adjust-colors.c | 2 +-
.../file_tools/gth-file-tool-adjust-contrast.c | 2 +-
extensions/file_tools/gth-file-tool-crop.c | 2 +-
extensions/file_tools/gth-file-tool-curves.c | 2 +-
extensions/file_tools/gth-file-tool-effects.c | 2 +-
extensions/file_tools/gth-file-tool-flip.c | 2 +-
extensions/file_tools/gth-file-tool-grayscale.c | 2 +-
extensions/file_tools/gth-file-tool-mirror.c | 2 +-
extensions/file_tools/gth-file-tool-resize.c | 2 +-
extensions/file_tools/gth-file-tool-rotate-left.c | 2 +-
extensions/file_tools/gth-file-tool-rotate-right.c | 2 +-
extensions/file_tools/gth-file-tool-rotate.c | 2 +-
extensions/file_tools/gth-file-tool-sharpen.c | 2 +-
extensions/flicker_utils/dlg-export-to-flickr.c | 2 +-
extensions/flicker_utils/dlg-import-from-flickr.c | 4 ++--
extensions/gstreamer_tools/actions.c | 2 +-
extensions/image_print/gth-image-print-job.c | 2 +-
extensions/image_rotation/actions.c | 8 ++++----
.../image_viewer/gth-image-viewer-page-tool.c | 2 +-
extensions/image_viewer/gth-image-viewer-page.c | 4 ++--
extensions/list_tools/actions.c | 2 +-
extensions/photo_importer/dlg-photo-importer.c | 2 +-
extensions/photobucket/dlg-export-to-photobucket.c | 2 +-
extensions/picasaweb/dlg-export-to-picasaweb.c | 2 +-
extensions/picasaweb/dlg-import-from-picasaweb.c | 4 ++--
extensions/rename_series/dlg-rename-series.c | 2 +-
extensions/resize_images/dlg-resize-images.c | 2 +-
extensions/search/actions.c | 4 ++--
extensions/search/callbacks.c | 2 +-
extensions/webalbums/dlg-web-exporter.c | 2 +-
gthumb/gth-browser.c | 10 +++++-----
gthumb/gth-browser.h | 2 +-
gthumb/gth-file-source-vfs.c | 6 +++---
gthumb/gth-progress-dialog.c | 12 +++++++-----
gthumb/gth-progress-dialog.h | 3 ++-
gthumb/gth-task.h | 8 ++++++++
50 files changed, 83 insertions(+), 72 deletions(-)
---
diff --git a/extensions/burn_disc/actions.c b/extensions/burn_disc/actions.c
index 16e0335..91dc742 100644
--- a/extensions/burn_disc/actions.c
+++ b/extensions/burn_disc/actions.c
@@ -43,7 +43,7 @@ gth_browser_activate_burn_disc (GSimpleAction *action,
files = gth_file_data_list_to_file_list (file_list);
task = gth_burn_task_new (browser, files);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (files);
diff --git a/extensions/catalogs/dlg-organize-files.c b/extensions/catalogs/dlg-organize-files.c
index 110e3cb..7f93a50 100644
--- a/extensions/catalogs/dlg-organize-files.c
+++ b/extensions/catalogs/dlg-organize-files.c
@@ -57,7 +57,7 @@ start_button_clicked_cb (GtkWidget *widget,
gth_organize_task_set_create_singletons (GTH_ORGANIZE_TASK (task), ! gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (GET_WIDGET ("ignore_singletons_checkbutton"))));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("use_singletons_catalog_checkbutton"))))
gth_organize_task_set_singletons_catalog (GTH_ORGANIZE_TASK (task), gtk_entry_get_text
(GTK_ENTRY (GET_WIDGET ("single_catalog_entry"))));
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
gtk_widget_destroy (data->dialog);
g_object_unref (task);
diff --git a/extensions/change_date/dlg-change-date.c b/extensions/change_date/dlg-change-date.c
index 60fb05a..20b3cb5 100644
--- a/extensions/change_date/dlg-change-date.c
+++ b/extensions/change_date/dlg-change-date.c
@@ -121,7 +121,7 @@ ok_button_clicked (GtkWidget *button,
change_type,
date_time,
time_adjustment);
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
gtk_widget_destroy (data->dialog);
g_object_unref (task);
diff --git a/extensions/comments/actions.c b/extensions/comments/actions.c
index a3e3c80..f665625 100644
--- a/extensions/comments/actions.c
+++ b/extensions/comments/actions.c
@@ -44,7 +44,7 @@ gth_browser_activate_import_embedded_metadata (GSimpleAction *action,
file_data_list = gth_file_store_get_visibles (gth_browser_get_file_store (browser));
}
task = gth_import_metadata_task_new (browser, file_data_list);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (file_data_list);
diff --git a/extensions/contact_sheet/dlg-contact-sheet.c b/extensions/contact_sheet/dlg-contact-sheet.c
index 494571e..af7da1f 100644
--- a/extensions/contact_sheet/dlg-contact-sheet.c
+++ b/extensions/contact_sheet/dlg-contact-sheet.c
@@ -248,7 +248,7 @@ ok_clicked_cb (GtkWidget *widget,
gth_contact_sheet_creator_set_thumb_size (GTH_CONTACT_SHEET_CREATOR (task), squared_thumbnail,
thumbnail_size, thumbnail_size);
gth_contact_sheet_creator_set_thumbnail_caption (GTH_CONTACT_SHEET_CREATOR (task), thumbnail_caption);
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
close_dialog (data);
g_object_unref (task);
diff --git a/extensions/contact_sheet/dlg-image-wall.c b/extensions/contact_sheet/dlg-image-wall.c
index fdb0591..b9959df 100644
--- a/extensions/contact_sheet/dlg-image-wall.c
+++ b/extensions/contact_sheet/dlg-image-wall.c
@@ -173,7 +173,7 @@ ok_clicked_cb (GtkWidget *widget,
gth_contact_sheet_creator_set_thumb_size (GTH_CONTACT_SHEET_CREATOR (task), TRUE, thumbnail_size,
thumbnail_size);
gth_contact_sheet_creator_set_thumbnail_caption (GTH_CONTACT_SHEET_CREATOR (task), "");
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
gtk_widget_destroy (data->dialog);
g_object_unref (task);
diff --git a/extensions/convert_format/dlg-convert-format.c b/extensions/convert_format/dlg-convert-format.c
index 6d966da..0504f39 100644
--- a/extensions/convert_format/dlg-convert-format.c
+++ b/extensions/convert_format/dlg-convert-format.c
@@ -103,7 +103,7 @@ ok_button_clicked_cb (GtkWidget *widget,
g_object_unref (destination);
}
- gth_browser_exec_task (data->browser, list_task, FALSE);
+ gth_browser_exec_task (data->browser, list_task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (list_task);
g_object_unref (convert_task);
diff --git a/extensions/desktop_background/actions.c b/extensions/desktop_background/actions.c
index ce1ca0b..a927590 100644
--- a/extensions/desktop_background/actions.c
+++ b/extensions/desktop_background/actions.c
@@ -397,7 +397,7 @@ gth_browser_activate_set_desktop_background (GSimpleAction *action,
"completed",
G_CALLBACK (save_wallpaper_task_completed_cb),
wdata);
- gth_browser_exec_task (GTH_BROWSER (browser), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (browser), task, GTH_TASK_FLAGS_IGNORE_ERROR);
saving_wallpaper = TRUE;
diff --git a/extensions/edit_metadata/actions.c b/extensions/edit_metadata/actions.c
index ff3e1e5..a0514be 100644
--- a/extensions/edit_metadata/actions.c
+++ b/extensions/edit_metadata/actions.c
@@ -91,7 +91,7 @@ gth_browser_activate_delete_metadata (GSimpleAction *action,
file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
file_list = gth_file_data_list_to_file_list (file_data_list);
task = gth_delete_metadata_task_new (browser, file_list);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (file_list);
diff --git a/extensions/edit_metadata/dlg-edit-metadata.c b/extensions/edit_metadata/dlg-edit-metadata.c
index 2ebde71..12a6d33 100644
--- a/extensions/edit_metadata/dlg-edit-metadata.c
+++ b/extensions/edit_metadata/dlg-edit-metadata.c
@@ -194,7 +194,7 @@ edit_metadata_dialog__response_cb (GtkDialog *dialog,
"completed",
G_CALLBACK (saver_completed_cb),
data);
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_IGNORE_ERROR);
g_object_unref (task);
@@ -275,7 +275,7 @@ update_file_list (gpointer user_data)
"completed",
G_CALLBACK (loader_completed_cb),
loader_data);
- gth_browser_exec_task (data->browser, data->loader, FALSE);
+ gth_browser_exec_task (data->browser, data->loader, GTH_TASK_FLAGS_IGNORE_ERROR);
_g_object_list_unref (file_data_list);
_gtk_tree_path_list_free (items);
diff --git a/extensions/facebook/dlg-export-to-facebook.c b/extensions/facebook/dlg-export-to-facebook.c
index 90a229a..1c4adfb 100644
--- a/extensions/facebook/dlg-export-to-facebook.c
+++ b/extensions/facebook/dlg-export-to-facebook.c
@@ -656,7 +656,7 @@ dlg_export_to_facebook (GthBrowser *browser,
data);
data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser));
- gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service));
+ gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service),
GTH_TASK_FLAGS_DEFAULT);
web_service_autoconnect (WEB_SERVICE (data->service));
}
diff --git a/extensions/facebook/dlg-import-from-facebook.c b/extensions/facebook/dlg-import-from-facebook.c
index 9b85209..8824176 100644
--- a/extensions/facebook/dlg-import-from-facebook.c
+++ b/extensions/facebook/dlg-import-from-facebook.c
@@ -161,7 +161,7 @@ import_dialog_response_cb (GtkDialog *dialog,
FALSE,
FALSE,
FALSE);
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
gtk_widget_destroy (data->dialog);
g_object_unref (task);
@@ -602,7 +602,7 @@ dlg_import_from_facebook (GthBrowser *browser)
data);
data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser));
- gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service));
+ gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service),
GTH_TASK_FLAGS_DEFAULT);
web_service_autoconnect (WEB_SERVICE (data->service));
}
diff --git a/extensions/file_manager/actions.c b/extensions/file_manager/actions.c
index f595457..4f1d2b7 100644
--- a/extensions/file_manager/actions.c
+++ b/extensions/file_manager/actions.c
@@ -438,7 +438,7 @@ clipboard_received_cb (GtkClipboard *clipboard,
paste_data->cut,
paste_data->files,
position);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
paste_data_free (paste_data);
@@ -482,7 +482,7 @@ gth_browser_activate_duplicate (GSimpleAction *action,
items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view
(browser)));
file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
task = gth_duplicate_task_new (file_list);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (file_list);
@@ -635,7 +635,7 @@ copy_files_to_folder (GthBrowser *browser,
"completed",
G_CALLBACK (copy_complete_cb),
data);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (file_source);
}
diff --git a/extensions/file_manager/callbacks.c b/extensions/file_manager/callbacks.c
index 4968b3d..a6d5edf 100644
--- a/extensions/file_manager/callbacks.c
+++ b/extensions/file_manager/callbacks.c
@@ -240,7 +240,7 @@ gth_file_list_drag_data_received (GtkWidget *file_view,
visible_files,
selected_files,
data->drop_pos);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (visible_files);
@@ -286,7 +286,7 @@ gth_file_list_drag_data_received (GtkWidget *file_view,
move,
selected_files,
data->drop_pos);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
g_object_unref (location_source);
@@ -733,7 +733,7 @@ fm__gth_browser_folder_tree_drag_data_received_cb (GthBrowser *browser,
(action == GDK_ACTION_MOVE),
file_list,
-1);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
g_object_unref (file_source);
diff --git a/extensions/file_tools/gth-file-tool-adjust-colors.c
b/extensions/file_tools/gth-file-tool-adjust-colors.c
index cb683ab..9060f86 100644
--- a/extensions/file_tools/gth-file-tool-adjust-colors.c
+++ b/extensions/file_tools/gth-file-tool-adjust-colors.c
@@ -348,7 +348,7 @@ apply_cb (gpointer user_data)
"completed",
G_CALLBACK (image_task_completed_cb),
self);
- gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, GTH_TASK_FLAGS_DEFAULT);
return FALSE;
}
diff --git a/extensions/file_tools/gth-file-tool-adjust-contrast.c
b/extensions/file_tools/gth-file-tool-adjust-contrast.c
index 41931f0..ffeb655 100644
--- a/extensions/file_tools/gth-file-tool-adjust-contrast.c
+++ b/extensions/file_tools/gth-file-tool-adjust-contrast.c
@@ -422,7 +422,7 @@ apply_cb (gpointer user_data)
"completed",
G_CALLBACK (image_task_completed_cb),
self);
- gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, GTH_TASK_FLAGS_DEFAULT);
return FALSE;
}
diff --git a/extensions/file_tools/gth-file-tool-crop.c b/extensions/file_tools/gth-file-tool-crop.c
index c0a98ef..5295f50 100644
--- a/extensions/file_tools/gth-file-tool-crop.c
+++ b/extensions/file_tools/gth-file-tool-crop.c
@@ -635,7 +635,7 @@ gth_file_tool_crop_apply_options (GthFileTool *base)
"completed",
G_CALLBACK (image_task_completed_cb),
self);
- gth_browser_exec_task (GTH_BROWSER (gth_file_tool_get_window (GTH_FILE_TOOL (self))), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (gth_file_tool_get_window (GTH_FILE_TOOL (self))), task,
GTH_TASK_FLAGS_DEFAULT);
}
diff --git a/extensions/file_tools/gth-file-tool-curves.c b/extensions/file_tools/gth-file-tool-curves.c
index d2f0b8a..51f5da5 100644
--- a/extensions/file_tools/gth-file-tool-curves.c
+++ b/extensions/file_tools/gth-file-tool-curves.c
@@ -326,7 +326,7 @@ apply_cb (gpointer user_data)
"completed",
G_CALLBACK (image_task_completed_cb),
self);
- gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, GTH_TASK_FLAGS_DEFAULT);
return FALSE;
}
diff --git a/extensions/file_tools/gth-file-tool-effects.c b/extensions/file_tools/gth-file-tool-effects.c
index dc02d01..e833e61 100644
--- a/extensions/file_tools/gth-file-tool-effects.c
+++ b/extensions/file_tools/gth-file-tool-effects.c
@@ -139,7 +139,7 @@ apply_cb (gpointer user_data)
"completed",
G_CALLBACK (image_task_completed_cb),
self);
- gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, GTH_TASK_FLAGS_DEFAULT);
return FALSE;
}
diff --git a/extensions/file_tools/gth-file-tool-flip.c b/extensions/file_tools/gth-file-tool-flip.c
index 95c3811..f5f40f4 100644
--- a/extensions/file_tools/gth-file-tool-flip.c
+++ b/extensions/file_tools/gth-file-tool-flip.c
@@ -70,7 +70,7 @@ gth_file_tool_flip_activate (GthFileTool *base)
"completed",
G_CALLBACK (gth_image_viewer_task_set_destination),
NULL);
- gth_browser_exec_task (GTH_BROWSER (window), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), task, GTH_TASK_FLAGS_DEFAULT);
}
diff --git a/extensions/file_tools/gth-file-tool-grayscale.c b/extensions/file_tools/gth-file-tool-grayscale.c
index 9a45bff..30cb79e 100644
--- a/extensions/file_tools/gth-file-tool-grayscale.c
+++ b/extensions/file_tools/gth-file-tool-grayscale.c
@@ -261,7 +261,7 @@ apply_cb (gpointer user_data)
"completed",
G_CALLBACK (image_task_completed_cb),
self);
- gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), self->priv->image_task, GTH_TASK_FLAGS_DEFAULT);
return FALSE;
}
diff --git a/extensions/file_tools/gth-file-tool-mirror.c b/extensions/file_tools/gth-file-tool-mirror.c
index 0ae6cca..cdc8017 100644
--- a/extensions/file_tools/gth-file-tool-mirror.c
+++ b/extensions/file_tools/gth-file-tool-mirror.c
@@ -70,7 +70,7 @@ gth_file_tool_mirror_activate (GthFileTool *base)
"completed",
G_CALLBACK (gth_image_viewer_task_set_destination),
NULL);
- gth_browser_exec_task (GTH_BROWSER (window), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), task, GTH_TASK_FLAGS_DEFAULT);
}
diff --git a/extensions/file_tools/gth-file-tool-resize.c b/extensions/file_tools/gth-file-tool-resize.c
index 7319f94..a626f07 100644
--- a/extensions/file_tools/gth-file-tool-resize.c
+++ b/extensions/file_tools/gth-file-tool-resize.c
@@ -194,7 +194,7 @@ update_image_size_cb (gpointer user_data)
self);
gth_browser_exec_task (GTH_BROWSER (gth_file_tool_get_window (GTH_FILE_TOOL (self))),
self->priv->resize_task,
- FALSE);
+ GTH_TASK_FLAGS_DEFAULT);
return FALSE;
}
diff --git a/extensions/file_tools/gth-file-tool-rotate-left.c
b/extensions/file_tools/gth-file-tool-rotate-left.c
index e2414b8..d44edca 100644
--- a/extensions/file_tools/gth-file-tool-rotate-left.c
+++ b/extensions/file_tools/gth-file-tool-rotate-left.c
@@ -70,7 +70,7 @@ gth_file_tool_rotate_left_activate (GthFileTool *base)
"completed",
G_CALLBACK (gth_image_viewer_task_set_destination),
NULL);
- gth_browser_exec_task (GTH_BROWSER (window), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), task, GTH_TASK_FLAGS_DEFAULT);
}
diff --git a/extensions/file_tools/gth-file-tool-rotate-right.c
b/extensions/file_tools/gth-file-tool-rotate-right.c
index f6eb5e8..83d59dd 100644
--- a/extensions/file_tools/gth-file-tool-rotate-right.c
+++ b/extensions/file_tools/gth-file-tool-rotate-right.c
@@ -70,7 +70,7 @@ gth_file_tool_rotate_right_activate (GthFileTool *base)
"completed",
G_CALLBACK (gth_image_viewer_task_set_destination),
NULL);
- gth_browser_exec_task (GTH_BROWSER (window), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), task, GTH_TASK_FLAGS_DEFAULT);
}
diff --git a/extensions/file_tools/gth-file-tool-rotate.c b/extensions/file_tools/gth-file-tool-rotate.c
index 96f22c9..aae519a 100644
--- a/extensions/file_tools/gth-file-tool-rotate.c
+++ b/extensions/file_tools/gth-file-tool-rotate.c
@@ -578,7 +578,7 @@ gth_file_tool_rotate_apply_options (GthFileTool *base)
"completed",
G_CALLBACK (gth_image_viewer_task_set_destination),
NULL);
- gth_browser_exec_task (GTH_BROWSER (window), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), task, GTH_TASK_FLAGS_DEFAULT);
gth_file_tool_hide_options (GTH_FILE_TOOL (self));
}
diff --git a/extensions/file_tools/gth-file-tool-sharpen.c b/extensions/file_tools/gth-file-tool-sharpen.c
index 18bdec5..1cb2d2a 100644
--- a/extensions/file_tools/gth-file-tool-sharpen.c
+++ b/extensions/file_tools/gth-file-tool-sharpen.c
@@ -340,7 +340,7 @@ gth_file_tool_sharpen_apply_options (GthFileTool *base)
"completed",
G_CALLBACK (gth_image_viewer_task_set_destination),
NULL);
- gth_browser_exec_task (GTH_BROWSER (gth_file_tool_get_window (GTH_FILE_TOOL (self))), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (gth_file_tool_get_window (GTH_FILE_TOOL (self))), task,
GTH_TASK_FLAGS_DEFAULT);
gth_file_tool_hide_options (GTH_FILE_TOOL (self));
}
diff --git a/extensions/flicker_utils/dlg-export-to-flickr.c b/extensions/flicker_utils/dlg-export-to-flickr.c
index 16c3aae..a14e748 100644
--- a/extensions/flicker_utils/dlg-export-to-flickr.c
+++ b/extensions/flicker_utils/dlg-export-to-flickr.c
@@ -658,7 +658,7 @@ dlg_export_to_flickr (FlickrServer *server,
data);
data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser));
- gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service));
+ gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service),
GTH_TASK_FLAGS_DEFAULT);
web_service_autoconnect (WEB_SERVICE (data->service));
}
diff --git a/extensions/flicker_utils/dlg-import-from-flickr.c
b/extensions/flicker_utils/dlg-import-from-flickr.c
index 7aa5420..93f93c3 100644
--- a/extensions/flicker_utils/dlg-import-from-flickr.c
+++ b/extensions/flicker_utils/dlg-import-from-flickr.c
@@ -162,7 +162,7 @@ import_dialog_response_cb (GtkDialog *dialog,
FALSE,
FALSE,
FALSE);
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
gtk_widget_destroy (data->dialog);
g_object_unref (task);
@@ -617,7 +617,7 @@ dlg_import_from_flickr (FlickrServer *server,
data);
data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser));
- gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service));
+ gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service),
GTH_TASK_FLAGS_DEFAULT);
web_service_autoconnect (WEB_SERVICE (data->service));
}
diff --git a/extensions/gstreamer_tools/actions.c b/extensions/gstreamer_tools/actions.c
index 30a3226..4499395 100644
--- a/extensions/gstreamer_tools/actions.c
+++ b/extensions/gstreamer_tools/actions.c
@@ -161,7 +161,7 @@ screenshot_ready_cb (GdkPixbuf *pixbuf,
"completed",
G_CALLBACK (save_screenshot_task_completed_cb),
save_data);
- gth_browser_exec_task (GTH_BROWSER (save_data->browser), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (save_data->browser), task, GTH_TASK_FLAGS_IGNORE_ERROR);
}
diff --git a/extensions/image_print/gth-image-print-job.c b/extensions/image_print/gth-image-print-job.c
index 3880858..1457384 100644
--- a/extensions/image_print/gth-image-print-job.c
+++ b/extensions/image_print/gth-image-print-job.c
@@ -1909,5 +1909,5 @@ gth_image_print_job_run (GthImagePrintJob *self,
"completed",
G_CALLBACK (load_image_info_task_completed_cb),
self);
- gth_browser_exec_task (browser, self->priv->task, FALSE);
+ gth_browser_exec_task (browser, self->priv->task, GTH_TASK_FLAGS_DEFAULT);
}
diff --git a/extensions/image_rotation/actions.c b/extensions/image_rotation/actions.c
index 7fcafac..b41ef4d 100644
--- a/extensions/image_rotation/actions.c
+++ b/extensions/image_rotation/actions.c
@@ -43,7 +43,7 @@ gth_browser_activate_rotate_right (GSimpleAction *action,
file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
file_list = gth_file_data_list_to_file_list (file_data_list);
task = gth_transform_task_new (browser, file_list, GTH_TRANSFORM_ROTATE_90);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (file_list);
@@ -67,7 +67,7 @@ gth_browser_activate_rotate_left (GSimpleAction *action,
file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
file_list = gth_file_data_list_to_file_list (file_data_list);
task = gth_transform_task_new (browser, file_list, GTH_TRANSFORM_ROTATE_270);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (file_list);
@@ -91,7 +91,7 @@ gth_browser_activate_apply_orientation (GSimpleAction *action,
file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
file_list = gth_file_data_list_to_file_list (file_data_list);
task = gth_transform_task_new (browser, file_list, GTH_TRANSFORM_NONE);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (file_list);
@@ -115,7 +115,7 @@ gth_browser_activate_reset_orientation (GSimpleAction *action,
file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items);
file_list = gth_file_data_list_to_file_list (file_data_list);
task = gth_reset_orientation_task_new (browser, file_list);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (file_list);
diff --git a/extensions/image_viewer/gth-image-viewer-page-tool.c
b/extensions/image_viewer/gth-image-viewer-page-tool.c
index b7c12ff..4d55b96 100644
--- a/extensions/image_viewer/gth-image-viewer-page-tool.c
+++ b/extensions/image_viewer/gth-image-viewer-page-tool.c
@@ -82,7 +82,7 @@ gth_image_viewer_page_tool_activate (GthFileTool *base)
self);
gth_browser_exec_task (GTH_BROWSER (gth_file_tool_get_window (GTH_FILE_TOOL (self))),
self->priv->image_task,
- FALSE);
+ GTH_TASK_FLAGS_DEFAULT);
}
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index 04f58cd..c5a483f 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -1373,7 +1373,7 @@ _gth_image_viewer_page_real_save (GthViewerPage *base,
"completed",
G_CALLBACK (save_image_task_completed_cb),
data);
- gth_browser_exec_task (GTH_BROWSER (self->priv->browser), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (self->priv->browser), task, GTH_TASK_FLAGS_DEFAULT);
_g_object_unref (task);
}
@@ -1855,7 +1855,7 @@ gth_image_viewer_page_copy_image (GthImageViewerPage *self)
"completed",
G_CALLBACK (copy_image_original_image_ready_cb),
self);
- gth_browser_exec_task (self->priv->browser, task, FALSE);
+ gth_browser_exec_task (self->priv->browser, task, GTH_TASK_FLAGS_DEFAULT);
}
diff --git a/extensions/list_tools/actions.c b/extensions/list_tools/actions.c
index f321d49..7129858 100644
--- a/extensions/list_tools/actions.c
+++ b/extensions/list_tools/actions.c
@@ -43,7 +43,7 @@ gth_browser_exec_script (GthBrowser *browser,
GthTask *task;
task = gth_script_task_new (GTK_WINDOW (browser), script, file_list);
- gth_browser_exec_task (browser, task, FALSE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
}
diff --git a/extensions/photo_importer/dlg-photo-importer.c b/extensions/photo_importer/dlg-photo-importer.c
index f7f5779..961bdde 100644
--- a/extensions/photo_importer/dlg-photo-importer.c
+++ b/extensions/photo_importer/dlg-photo-importer.c
@@ -135,7 +135,7 @@ destroy_dialog (gpointer user_data)
delete_imported,
FALSE,
g_settings_get_boolean (data->settings,
PREF_PHOTO_IMPORTER_ADJUST_ORIENTATION));
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
g_strfreev (tags);
g_object_unref (task);
diff --git a/extensions/photobucket/dlg-export-to-photobucket.c
b/extensions/photobucket/dlg-export-to-photobucket.c
index 478d34d..cbe03db 100644
--- a/extensions/photobucket/dlg-export-to-photobucket.c
+++ b/extensions/photobucket/dlg-export-to-photobucket.c
@@ -673,7 +673,7 @@ dlg_export_to_photobucket (GthBrowser *browser,
data);
data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser));
- gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service));
+ gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service),
GTH_TASK_FLAGS_DEFAULT);
web_service_autoconnect (WEB_SERVICE (data->service));
}
diff --git a/extensions/picasaweb/dlg-export-to-picasaweb.c b/extensions/picasaweb/dlg-export-to-picasaweb.c
index 990e2b7..4bb6c16 100644
--- a/extensions/picasaweb/dlg-export-to-picasaweb.c
+++ b/extensions/picasaweb/dlg-export-to-picasaweb.c
@@ -679,7 +679,7 @@ dlg_export_to_picasaweb (GthBrowser *browser,
data);
data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser));
- gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service));
+ gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service),
GTH_TASK_FLAGS_DEFAULT);
web_service_autoconnect (WEB_SERVICE (data->service));
}
diff --git a/extensions/picasaweb/dlg-import-from-picasaweb.c
b/extensions/picasaweb/dlg-import-from-picasaweb.c
index 51d7f9e..156cb1e 100644
--- a/extensions/picasaweb/dlg-import-from-picasaweb.c
+++ b/extensions/picasaweb/dlg-import-from-picasaweb.c
@@ -177,7 +177,7 @@ import_dialog_response_cb (GtkDialog *dialog,
FALSE,
FALSE,
FALSE);
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
gtk_widget_destroy (data->dialog);
g_object_unref (task);
@@ -649,7 +649,7 @@ dlg_import_from_picasaweb (GthBrowser *browser)
data);
data->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (data->browser));
- gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service));
+ gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (data->progress_dialog), GTH_TASK (data->service),
GTH_TASK_FLAGS_DEFAULT);
web_service_autoconnect (WEB_SERVICE (data->service));
}
diff --git a/extensions/rename_series/dlg-rename-series.c b/extensions/rename_series/dlg-rename-series.c
index 2325775..54f61d9 100644
--- a/extensions/rename_series/dlg-rename-series.c
+++ b/extensions/rename_series/dlg-rename-series.c
@@ -605,7 +605,7 @@ ok_button_clicked__step2 (GError *error,
new_files = g_list_reverse (new_files);
task = gth_rename_task_new (old_files, new_files);
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
destroy_dialog (data);
diff --git a/extensions/resize_images/dlg-resize-images.c b/extensions/resize_images/dlg-resize-images.c
index aa3deaa..245680e 100644
--- a/extensions/resize_images/dlg-resize-images.c
+++ b/extensions/resize_images/dlg-resize-images.c
@@ -188,7 +188,7 @@ ok_clicked_cb (GtkWidget *widget,
g_object_unref (destination);
}
- gth_browser_exec_task (data->browser, list_task, FALSE);
+ gth_browser_exec_task (data->browser, list_task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (list_task);
g_object_unref (resize_task);
diff --git a/extensions/search/actions.c b/extensions/search/actions.c
index b7967f5..0e5815a 100644
--- a/extensions/search/actions.c
+++ b/extensions/search/actions.c
@@ -54,7 +54,7 @@ search_editor_dialog__response_cb (GtkDialog *dialog,
search_catalog = gth_catalog_file_from_relative_path (_("Search Result"), ".search");
task = gth_search_task_new (browser, search, search_catalog);
- gth_browser_exec_task (browser, task, TRUE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_FOREGROUND);
g_object_unref (task);
g_object_unref (search_catalog);
@@ -129,7 +129,7 @@ search_update_buffer_ready_cb (void **buffer,
}
task = gth_search_task_new (search_data->browser, search, search_data->file);
- gth_browser_exec_task (search_data->browser, task, TRUE);
+ gth_browser_exec_task (search_data->browser, task, GTH_TASK_FLAGS_FOREGROUND);
g_object_unref (task);
g_object_unref (search);
diff --git a/extensions/search/callbacks.c b/extensions/search/callbacks.c
index bdbdfa2..64e869d 100644
--- a/extensions/search/callbacks.c
+++ b/extensions/search/callbacks.c
@@ -202,7 +202,7 @@ search__dlg_catalog_properties_saved (GthBrowser *browser,
return;
task = gth_search_task_new (browser, GTH_SEARCH (catalog), file_data->file);
- gth_browser_exec_task (browser, task, TRUE);
+ gth_browser_exec_task (browser, task, GTH_TASK_FLAGS_FOREGROUND);
g_object_unref (task);
}
diff --git a/extensions/webalbums/dlg-web-exporter.c b/extensions/webalbums/dlg-web-exporter.c
index 34123a3..1ac59a8 100644
--- a/extensions/webalbums/dlg-web-exporter.c
+++ b/extensions/webalbums/dlg-web-exporter.c
@@ -198,7 +198,7 @@ ok_clicked_cb (GtkWidget *widget,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("image_description_checkbutton"))),
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET
("image_attributes_checkbutton"))) ? image_attributes : "");
- gth_browser_exec_task (data->browser, task, FALSE);
+ gth_browser_exec_task (data->browser, task, GTH_TASK_FLAGS_DEFAULT);
gtk_widget_destroy (data->dialog);
g_object_unref (task);
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 58ba797..386bcef 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -5380,13 +5380,13 @@ foreground_task_progress_cb (GthTask *task,
void
-gth_browser_exec_task (GthBrowser *browser,
- GthTask *task,
- gboolean foreground)
+gth_browser_exec_task (GthBrowser *browser,
+ GthTask *task,
+ GthTaskFlags flags)
{
g_return_if_fail (task != NULL);
- if (! foreground) {
+ if ((flags & GTH_TASK_FLAGS_FOREGROUND) == 0) {
TaskData *task_data;
task_data = task_data_new (browser, task);
@@ -5396,7 +5396,7 @@ gth_browser_exec_task (GthBrowser *browser,
browser->priv->progress_dialog = gth_progress_dialog_new (GTK_WINDOW (browser));
g_object_add_weak_pointer (G_OBJECT (browser->priv->progress_dialog), (gpointer*)
&(browser->priv->progress_dialog));
}
- gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (browser->priv->progress_dialog), task);
+ gth_progress_dialog_add_task (GTH_PROGRESS_DIALOG (browser->priv->progress_dialog), task,
flags);
return;
}
diff --git a/gthumb/gth-browser.h b/gthumb/gth-browser.h
index d4b22a7..88ca066 100644
--- a/gthumb/gth-browser.h
+++ b/gthumb/gth-browser.h
@@ -198,7 +198,7 @@ void gth_browser_stop (GthBrowser *browser);
void gth_browser_reload (GthBrowser *browser);
void gth_browser_exec_task (GthBrowser *browser,
GthTask *task,
- gboolean foreground);
+ GthTaskFlags flags);
void gth_browser_set_close_with_task (GthBrowser *browser,
gboolean value);
gboolean gth_browser_get_close_with_task (GthBrowser *browser);
diff --git a/gthumb/gth-file-source-vfs.c b/gthumb/gth-file-source-vfs.c
index 56ecbf4..e4372f9 100644
--- a/gthumb/gth-file-source-vfs.c
+++ b/gthumb/gth-file-source-vfs.c
@@ -660,7 +660,7 @@ delete_file_permanently (GtkWindow *window,
files = gth_file_data_list_to_file_list (file_list);
task = gth_delete_task_new (files);
- gth_browser_exec_task (GTH_BROWSER (window), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
_g_object_list_unref (files);
@@ -708,7 +708,7 @@ trash_failed_delete_permanently_response_cb (GtkDialog *dialog,
if (response_id == GTK_RESPONSE_YES) {
GthTask *task = gth_delete_task_new (tdata->files);
- gth_browser_exec_task (GTH_BROWSER (tdata->window), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (tdata->window), task, GTH_TASK_FLAGS_DEFAULT);
g_object_unref (task);
}
@@ -774,7 +774,7 @@ gth_file_mananger_trash_files (GtkWindow *window,
trash_task_completed_cb,
tdata);
- gth_browser_exec_task (GTH_BROWSER (window), task, FALSE);
+ gth_browser_exec_task (GTH_BROWSER (window), task, GTH_TASK_FLAGS_IGNORE_ERROR);
}
diff --git a/gthumb/gth-progress-dialog.c b/gthumb/gth-progress-dialog.c
index 6e680db..1caa050 100644
--- a/gthumb/gth-progress-dialog.c
+++ b/gthumb/gth-progress-dialog.c
@@ -413,7 +413,8 @@ progress_dialog_task_completed_cb (GthTask *task,
void
gth_progress_dialog_add_task (GthProgressDialog *self,
- GthTask *task)
+ GthTask *task,
+ GthTaskFlags flags)
{
GtkWidget *child;
@@ -425,10 +426,11 @@ gth_progress_dialog_add_task (GthProgressDialog *self,
"progress",
G_CALLBACK (progress_dialog_task_progress_cb),
self);
- g_signal_connect (task,
- "completed",
- G_CALLBACK (progress_dialog_task_completed_cb),
- self);
+ if ((flags & GTH_TASK_FLAGS_IGNORE_ERROR) == 0)
+ g_signal_connect (task,
+ "completed",
+ G_CALLBACK (progress_dialog_task_completed_cb),
+ self);
gtk_window_set_title (GTK_WINDOW (self), "");
diff --git a/gthumb/gth-progress-dialog.h b/gthumb/gth-progress-dialog.h
index a4f2de3..50274a0 100644
--- a/gthumb/gth-progress-dialog.h
+++ b/gthumb/gth-progress-dialog.h
@@ -50,7 +50,8 @@ struct _GthProgressDialogClass {
GType gth_progress_dialog_get_type (void);
GtkWidget * gth_progress_dialog_new (GtkWindow *parent);
void gth_progress_dialog_add_task (GthProgressDialog *dialog,
- GthTask *task);
+ GthTask *task,
+ GthTaskFlags flags);
GtkWidget * gth_task_progress_new (GthTask *task);
diff --git a/gthumb/gth-task.h b/gthumb/gth-task.h
index d21bdb3..c430853 100644
--- a/gthumb/gth-task.h
+++ b/gthumb/gth-task.h
@@ -29,6 +29,14 @@ G_BEGIN_DECLS
#define GTH_TASK_ERROR gth_task_error_quark ()
typedef enum {
+ GTH_TASK_FLAGS_SHOW_ERROR = 0,
+ GTH_TASK_FLAGS_IGNORE_ERROR = (1 << 0),
+ GTH_TASK_FLAGS_FOREGROUND = (1 << 1)
+} GthTaskFlags;
+
+#define GTH_TASK_FLAGS_DEFAULT GTH_TASK_FLAGS_SHOW_ERROR
+
+typedef enum {
GTH_TASK_ERROR_FAILED,
GTH_TASK_ERROR_CANCELLED,
GTH_TASK_ERROR_SKIP_TO_NEXT_FILE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
