diff options
author | Carlos Soriano <csoriano@gnome.org> | 2018-01-18 11:11:53 +0100 |
---|---|---|
committer | Carlos Soriano <csoriano@gnome.org> | 2018-01-20 00:24:04 +0100 |
commit | be93c2492749595e3f870973fffa23adb54d39b7 (patch) | |
tree | 905ba81135c45985193cc9fa2ac55d8c9a2a81ad | |
parent | d4ebf2513dbaf33690f0ad61e7a7304a2c75e240 (diff) | |
download | nautilus-be93c2492749595e3f870973fffa23adb54d39b7.tar.gz |
tasks: Replace execute by run_sync
So we are closer to GTask style and it shows that is a sync function.
-rw-r--r-- | src-ng/nautilus-task-manager.c | 2 | ||||
-rw-r--r-- | src-ng/nautilus-task.c | 6 | ||||
-rw-r--r-- | src-ng/nautilus-task.h | 4 | ||||
-rw-r--r-- | src-ng/tasks/nautilus-attribute-task.c | 4 | ||||
-rw-r--r-- | src-ng/tasks/nautilus-enumerate-children-task.c | 4 | ||||
-rw-r--r-- | src-ng/tasks/nautilus-rename-task.c | 4 | ||||
-rw-r--r-- | src-ng/tasks/nautilus-thumbnail-task.c | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src-ng/nautilus-task-manager.c b/src-ng/nautilus-task-manager.c index 7c20a9753..a83d6b482 100644 --- a/src-ng/nautilus-task-manager.c +++ b/src-ng/nautilus-task-manager.c @@ -88,7 +88,7 @@ execute_task (gpointer data, task = NAUTILUS_TASK (data); - nautilus_task_execute (task); + nautilus_task_run_sync (task); } static void diff --git a/src-ng/nautilus-task.c b/src-ng/nautilus-task.c index de6bdea36..a1847852f 100644 --- a/src-ng/nautilus-task.c +++ b/src-ng/nautilus-task.c @@ -130,7 +130,7 @@ nautilus_task_get_cancellable (NautilusTask *task) } void -nautilus_task_execute (NautilusTask *task) +nautilus_task_run_sync (NautilusTask *task) { NautilusTaskClass *klass; @@ -138,9 +138,9 @@ nautilus_task_execute (NautilusTask *task) klass = NAUTILUS_TASK_GET_CLASS (task); - g_return_if_fail (klass->execute != NULL); + g_return_if_fail (klass->run_sync != NULL); - klass->execute (task); + klass->run_sync (task); } void diff --git a/src-ng/nautilus-task.h b/src-ng/nautilus-task.h index 86440b351..dabc10c61 100644 --- a/src-ng/nautilus-task.h +++ b/src-ng/nautilus-task.h @@ -35,11 +35,11 @@ struct _NautilusTaskClass { GObjectClass parent_class; - void (*execute) (NautilusTask *task); + void (*run_sync) (NautilusTask *task); }; GCancellable *nautilus_task_get_cancellable (NautilusTask *task); -void nautilus_task_execute (NautilusTask *task); +void nautilus_task_run_sync (NautilusTask *task); #endif diff --git a/src-ng/tasks/nautilus-attribute-task.c b/src-ng/tasks/nautilus-attribute-task.c index 9d21517c9..1328ccc13 100644 --- a/src-ng/tasks/nautilus-attribute-task.c +++ b/src-ng/tasks/nautilus-attribute-task.c @@ -55,7 +55,7 @@ finalize (GObject *object) } static void -execute (NautilusTask *task) +run_sync (NautilusTask *task) { NautilusAttributeTask *self; g_autoptr (GCancellable) cancellable = NULL; @@ -85,7 +85,7 @@ nautilus_attribute_task_class_init (NautilusAttributeTaskClass *klass) object_class->finalize = finalize; - task_class->execute = execute; + task_class->run_sync = run_sync; signals[FINISHED] = g_signal_new ("finished", G_TYPE_FROM_CLASS (klass), diff --git a/src-ng/tasks/nautilus-enumerate-children-task.c b/src-ng/tasks/nautilus-enumerate-children-task.c index 77d9a2829..68408a46c 100644 --- a/src-ng/tasks/nautilus-enumerate-children-task.c +++ b/src-ng/tasks/nautilus-enumerate-children-task.c @@ -42,7 +42,7 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; static void -execute (NautilusTask *task) +run_sync (NautilusTask *task) { NautilusEnumerateChildrenTask *self; g_autoptr (GCancellable) cancellable = NULL; @@ -102,7 +102,7 @@ nautilus_enumerate_children_task_class_init (NautilusEnumerateChildrenTaskClass task_class = NAUTILUS_TASK_CLASS (klass); - task_class->execute = execute; + task_class->run_sync = run_sync; signals[FINISHED] = g_signal_new ("finished", G_TYPE_FROM_CLASS (klass), diff --git a/src-ng/tasks/nautilus-rename-task.c b/src-ng/tasks/nautilus-rename-task.c index 350d1089e..b9f6894a4 100644 --- a/src-ng/tasks/nautilus-rename-task.c +++ b/src-ng/tasks/nautilus-rename-task.c @@ -53,7 +53,7 @@ finalize (GObject *object) } static void -execute (NautilusTask *task) +run_sync (NautilusTask *task) { NautilusRenameTask *self; GHashTableIter iter; @@ -111,7 +111,7 @@ nautilus_rename_task_class_init (NautilusRenameTaskClass *klass) object_class->finalize = finalize; - task_class->execute = execute; + task_class->run_sync = run_sync; signals[FINISHED] = g_signal_new ("finished", G_TYPE_FROM_CLASS (klass), diff --git a/src-ng/tasks/nautilus-thumbnail-task.c b/src-ng/tasks/nautilus-thumbnail-task.c index a5aaa613b..db028fc8f 100644 --- a/src-ng/tasks/nautilus-thumbnail-task.c +++ b/src-ng/tasks/nautilus-thumbnail-task.c @@ -211,7 +211,7 @@ thumbnail_gdk_pixbuf (GFile *location) } static void -execute (NautilusTask *task) +run_sync (NautilusTask *task) { NautilusThumbnailTask *self; g_autoptr (GdkPixbuf) pixbuf = NULL; @@ -253,7 +253,7 @@ nautilus_thumbnail_task_class_init (NautilusThumbnailTaskClass *klass) object_class->finalize = finalize; - task_class->execute = execute; + task_class->run_sync = run_sync; signals[FINISHED] = g_signal_new ("finished", G_TYPE_FROM_CLASS (klass), |