[tepl] FileMetadata: have common final callback for 'save' and 'save as'
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tepl] FileMetadata: have common final callback for 'save' and 'save as'
- Date: Sat, 18 Apr 2020 17:17:25 +0000 (UTC)
commit 62ae05d5219b9a22ee726e6072bcdd2c878ef04f
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri Apr 10 18:59:13 2020 +0200
FileMetadata: have common final callback for 'save' and 'save as'
The code was identical.
tepl/tepl-file-metadata.c | 41 +++++------------------------------------
1 file changed, 5 insertions(+), 36 deletions(-)
---
diff --git a/tepl/tepl-file-metadata.c b/tepl/tepl-file-metadata.c
index 4c713fe..80b9221 100644
--- a/tepl/tepl-file-metadata.c
+++ b/tepl/tepl-file-metadata.c
@@ -487,9 +487,9 @@ tepl_file_metadata_load_finish (TeplFileMetadata *metadata,
}
static void
-save_as__set_attributes_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+set_attributes_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
GFile *location = G_FILE (source_object);
GTask *task = G_TASK (user_data);
@@ -599,7 +599,7 @@ save_as__query_all_previous_metadata_cb (GObject *source_object,
G_FILE_QUERY_INFO_NONE,
g_task_get_priority (task),
g_task_get_cancellable (task),
- save_as__set_attributes_cb,
+ set_attributes_cb, /* Common callback with normal save. */
task);
g_object_unref (file_info);
}
@@ -618,37 +618,6 @@ start_to_save_as (GTask *task)
task);
}
-static void
-save_modified_metadata_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- GFile *location = G_FILE (source_object);
- GTask *task = G_TASK (user_data);
- TeplFileMetadata *metadata = g_task_get_source_object (task);
- TeplFileMetadataPrivate *priv = tepl_file_metadata_get_instance_private (metadata);
- GError *error = NULL;
-
- g_file_set_attributes_finish (location, result, NULL, &error);
-
- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
- {
- print_gvfs_metadata_not_supported_warning ();
- }
-
- if (error != NULL)
- {
- g_task_return_error (task, error);
- g_object_unref (task);
- return;
- }
-
- g_clear_object (&priv->file_info_modified);
-
- g_task_return_boolean (task, TRUE);
- g_object_unref (task);
-}
-
static void
start_to_save_modified_metadata (GTask *task)
{
@@ -672,7 +641,7 @@ start_to_save_modified_metadata (GTask *task)
G_FILE_QUERY_INFO_NONE,
g_task_get_priority (task),
g_task_get_cancellable (task),
- save_modified_metadata_cb,
+ set_attributes_cb, /* Common callback with save_as. */
task);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]