general: Run uncrustify script

There are some style issue since the last run. Let's run it again
before enabling style-check CI job.

10 files changed, 64 insertions, 57 deletions

diff --git a/test/automated/displayless/test-file-operations-copy-files.c b/test/automated/displayless/test-file-operations-copy-files.c
index 8147adf8a..1a7d80201 100644
--- a/test/automated/displayless/test-file-operations-copy-files.c
+++ b/test/automated/displayless/test-file-operations-copy-files.c
@@ -1300,16 +1300,17 @@ setup_test_suite (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
 
     undo_manager = nautilus_file_undo_manager_new ();
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
 
     setup_test_suite ();
 
     return g_test_run ();
-}
\ No newline at end of file
+}
diff --git a/test/automated/displayless/test-file-operations-dir-has-files.c b/test/automated/displayless/test-file-operations-dir-has-files.c
index f5a7f1dcc..06c7df20e 100644
--- a/test/automated/displayless/test-file-operations-dir-has-files.c
+++ b/test/automated/displayless/test-file-operations-dir-has-files.c
@@ -74,11 +74,12 @@ setup_test_suite (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
 
     setup_test_suite ();
 
diff --git a/test/automated/displayless/test-file-operations-move-files.c b/test/automated/displayless/test-file-operations-move-files.c
index 6b476e7fa..5ad8ccb51 100644
--- a/test/automated/displayless/test-file-operations-move-files.c
+++ b/test/automated/displayless/test-file-operations-move-files.c
@@ -158,7 +158,7 @@ test_move_one_empty_directory_undo (void)
     g_autolist (GFile) files = NULL;
 
     create_one_empty_directory ("move");
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
 
@@ -1185,7 +1185,7 @@ test_move_first_hierarchy (void)
     g_assert_false (g_file_query_exists (file, NULL));
 
     file = g_file_get_child (first_dir, "move_second_child");
-    g_assert_false (g_file_query_exists (file, NULL));    
+    g_assert_false (g_file_query_exists (file, NULL));
 
     g_assert_false (g_file_query_exists (first_dir, NULL));
 
@@ -1236,7 +1236,7 @@ test_move_first_hierarchy_undo (void)
     g_assert_true (g_file_query_exists (file, NULL));
 
     file = g_file_get_child (first_dir, "move_second_child");
-    g_assert_true (g_file_query_exists (file, NULL));    
+    g_assert_true (g_file_query_exists (file, NULL));
 
     g_assert_true (g_file_query_exists (first_dir, NULL));
 
@@ -1287,7 +1287,7 @@ test_move_first_hierarchy_undo_redo (void)
     g_assert_false (g_file_query_exists (file, NULL));
 
     file = g_file_get_child (first_dir, "move_second_child");
-    g_assert_false (g_file_query_exists (file, NULL));    
+    g_assert_false (g_file_query_exists (file, NULL));
 
     g_assert_false (g_file_query_exists (first_dir, NULL));
 
@@ -1931,16 +1931,17 @@ setup_test_suite (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
 
     undo_manager = nautilus_file_undo_manager_new ();
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
 
     setup_test_suite ();
 
     return g_test_run ();
-}
\ No newline at end of file
+}
diff --git a/test/automated/displayless/test-file-operations-trash-or-delete.c b/test/automated/displayless/test-file-operations-trash-or-delete.c
index 21a451340..b1f410949 100644
--- a/test/automated/displayless/test-file-operations-trash-or-delete.c
+++ b/test/automated/displayless/test-file-operations-trash-or-delete.c
@@ -35,23 +35,23 @@ test_trash_more_files_func (gint files_to_trash)
     g_autolist (GFile) files = NULL;
 
     create_multiple_files ("trash_or_delete", files_to_trash);
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
- 
+
     for (int i = 0; i < files_to_trash; i++)
     {
         gchar *file_name;
- 
+
         file_name = g_strdup_printf ("trash_or_delete_file_%i", i);
         file = g_file_get_child (root, file_name);
         g_free (file_name);
         g_assert_true (file != NULL);
         files = g_list_prepend (files, g_object_ref (file));
     }
- 
+
     nautilus_file_operations_trash_or_delete_sync (files);
- 
+
     for (int i = 0; i < files_to_trash; i++)
     {
         gchar *file_name;
@@ -106,23 +106,23 @@ test_delete_more_files_func (gint files_to_delete)
     g_autolist (GFile) files = NULL;
 
     create_multiple_files ("trash_or_delete", files_to_delete);
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
- 
+
     for (int i = 0; i < files_to_delete; i++)
     {
         gchar *file_name;
- 
+
         file_name = g_strdup_printf ("trash_or_delete_file_%i", i);
         file = g_file_get_child (root, file_name);
         g_free (file_name);
         g_assert_true (file != NULL);
         files = g_list_prepend (files, g_object_ref (file));
     }
- 
+
     nautilus_file_operations_delete_sync (files);
- 
+
     for (int i = 0; i < files_to_delete; i++)
     {
         gchar *file_name;
@@ -179,10 +179,10 @@ test_trash_more_empty_directories_func (gint directories_to_trash)
     g_autolist (GFile) files = NULL;
 
     create_multiple_directories ("trash_or_delete", directories_to_trash);
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
- 
+
     for (int i = 0; i < directories_to_trash; i++)
     {
         gchar *file_name;
@@ -193,7 +193,7 @@ test_trash_more_empty_directories_func (gint directories_to_trash)
         g_assert_true (file != NULL);
         files = g_list_prepend (files, g_object_ref (file));
     }
- 
+
     nautilus_file_operations_trash_or_delete_sync (files);
 
     for (int i = 0; i < directories_to_trash; i++)
@@ -252,10 +252,10 @@ test_delete_more_empty_directories_func (gint directories_to_delete)
     g_autolist (GFile) files = NULL;
 
     create_multiple_directories ("trash_or_delete", directories_to_delete);
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
- 
+
     for (int i = 0; i < directories_to_delete; i++)
     {
         gchar *file_name;
@@ -266,7 +266,7 @@ test_delete_more_empty_directories_func (gint directories_to_delete)
         g_assert_true (file != NULL);
         files = g_list_prepend (files, g_object_ref (file));
     }
- 
+
     nautilus_file_operations_delete_sync (files);
 
 
@@ -322,7 +322,7 @@ test_trash_full_directory (void)
 
     empty_directory_by_prefix (root, "trash_or_delete");
 }
- 
+
 /* The hierarchy looks like this:
  * /tmp/first_dir/first_child
  * /tmp/first_dir/second_child
@@ -337,14 +337,14 @@ test_trash_first_hierarchy (void)
     g_autolist (GFile) files = NULL;
 
     create_first_hierarchy ("trash_or_delete");
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
 
     first_dir = g_file_get_child (root, "trash_or_delete_first_dir");
     files = g_list_prepend (files, g_object_ref (first_dir));
     g_assert_true (first_dir != NULL);
- 
+
     file = g_file_get_child (first_dir, "trash_or_delete_first_child");
     g_assert_true (file != NULL);
     file = g_file_get_child (first_dir, "trash_or_delete_second_child");
@@ -361,7 +361,7 @@ test_trash_first_hierarchy (void)
     g_assert_false (g_file_query_exists (first_dir, NULL));
 
     empty_directory_by_prefix (root, "trash_or_delete");
- }
+}
 
 /* We're creating 50 directories each containing one file
  * and trashing all of the directories.
@@ -389,7 +389,7 @@ test_trash_third_hierarchy (void)
         g_free (file_name);
         files = g_list_prepend (files, g_object_ref (directory));
     }
- 
+
     nautilus_file_operations_trash_or_delete_sync (files);
 
     for (int i = 0; i < 50; i++)
@@ -443,7 +443,7 @@ test_delete_full_directory (void)
 
     empty_directory_by_prefix (root, "trash_or_delete");
 }
- 
+
 /* The hierarchy looks like this:
  * /tmp/first_dir/first_child
  * /tmp/first_dir/second_child
@@ -458,14 +458,14 @@ test_delete_first_hierarchy (void)
     g_autolist (GFile) files = NULL;
 
     create_first_hierarchy ("trash_or_delete");
- 
+
     root = g_file_new_for_path (g_get_tmp_dir ());
     g_assert_true (root != NULL);
 
     first_dir = g_file_get_child (root, "trash_or_delete_first_dir");
     files = g_list_prepend (files, g_object_ref (first_dir));
     g_assert_true (first_dir != NULL);
- 
+
     file = g_file_get_child (first_dir, "trash_or_delete_first_child");
     g_assert_true (file != NULL);
     file = g_file_get_child (first_dir, "trash_or_delete_second_child");
@@ -482,7 +482,7 @@ test_delete_first_hierarchy (void)
     g_assert_false (g_file_query_exists (first_dir, NULL));
 
     empty_directory_by_prefix (root, "trash_or_delete");
- }
+}
 
 /* We're creating 50 directories each containing one file
  * and deleting all of the directories.
@@ -510,7 +510,7 @@ test_delete_third_hierarchy (void)
         g_free (file_name);
         files = g_list_prepend (files, g_object_ref (directory));
     }
- 
+
     nautilus_file_operations_delete_sync (files);
 
     for (int i = 0; i < 50; i++)
@@ -563,20 +563,20 @@ setup_test_suite (void)
                      test_delete_first_hierarchy);
     g_test_add_func ("/test-delete-more-full-directories/1.6",
                      test_delete_third_hierarchy);
-
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_autoptr (NautilusFileUndoManager) undo_manager = NULL;
 
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
     undo_manager = nautilus_file_undo_manager_new ();
 
     setup_test_suite ();
 
     return g_test_run ();
-}
\ No newline at end of file
+}
diff --git a/test/automated/displayless/test-file-utilities.c b/test/automated/displayless/test-file-utilities.c
index ca61870ee..17a7c921e 100644
--- a/test/automated/displayless/test-file-utilities.c
+++ b/test/automated/displayless/test-file-utilities.c
@@ -227,13 +227,14 @@ setup_test_suite (void)
 }
 
 int
-main (int argc, char *argv[])
+main (int   argc,
+      char *argv[])
 {
     g_test_init (&argc, &argv, NULL);
     g_test_set_nonfatal_assertions ();
-    nautilus_ensure_extension_points();
+    nautilus_ensure_extension_points ();
 
     setup_test_suite ();
 
     return g_test_run ();
-}
\ No newline at end of file
+}
diff --git a/test/automated/displayless/test-nautilus-search-engine-model.c b/test/automated/displayless/test-nautilus-search-engine-model.c
index 05086f8b7..af1a9b4bb 100644
--- a/test/automated/displayless/test-nautilus-search-engine-model.c
+++ b/test/automated/displayless/test-nautilus-search-engine-model.c
@@ -39,7 +39,7 @@ main (int   argc,
     loop = g_main_loop_new (NULL, FALSE);
 
     nautilus_ensure_extension_points ();
-    /* Needed for nautilus-query.c. 
+    /* Needed for nautilus-query.c.
      * FIXME: tests are not installed, so the system does not
      * have the gschema. Installed tests is a long term GNOME goal.
      */
diff --git a/test/automated/displayless/test-nautilus-search-engine-simple.c b/test/automated/displayless/test-nautilus-search-engine-simple.c
index 82eb865b3..728c7ce32 100644
--- a/test/automated/displayless/test-nautilus-search-engine-simple.c
+++ b/test/automated/displayless/test-nautilus-search-engine-simple.c
@@ -38,7 +38,7 @@ main (int   argc,
     loop = g_main_loop_new (NULL, FALSE);
 
     nautilus_ensure_extension_points ();
-    /* Needed for nautilus-query.c. 
+    /* Needed for nautilus-query.c.
      * FIXME: tests are not installed, so the system does not
      * have the gschema. Installed tests is a long term GNOME goal.
      */
diff --git a/test/automated/displayless/test-nautilus-search-engine-tracker.c b/test/automated/displayless/test-nautilus-search-engine-tracker.c
index c1f495327..0de2d404b 100644
--- a/test/automated/displayless/test-nautilus-search-engine-tracker.c
+++ b/test/automated/displayless/test-nautilus-search-engine-tracker.c
@@ -51,7 +51,7 @@ main (int   argc,
     loop = g_main_loop_new (NULL, FALSE);
 
     nautilus_ensure_extension_points ();
-    /* Needed for nautilus-query.c. 
+    /* Needed for nautilus-query.c.
      * FIXME: tests are not installed, so the system does not
      * have the gschema. Installed tests is a long term GNOME goal.
      */
diff --git a/test/automated/displayless/test-nautilus-search-engine.c b/test/automated/displayless/test-nautilus-search-engine.c
index d80f1fa20..28c02efb0 100644
--- a/test/automated/displayless/test-nautilus-search-engine.c
+++ b/test/automated/displayless/test-nautilus-search-engine.c
@@ -39,7 +39,7 @@ main (int   argc,
     loop = g_main_loop_new (NULL, FALSE);
 
     nautilus_ensure_extension_points ();
-    /* Needed for nautilus-query.c. 
+    /* Needed for nautilus-query.c.
      * FIXME: tests are not installed, so the system does not
      * have the gschema. Installed tests is a long term GNOME goal.
      */
diff --git a/test/automated/displayless/test-utilities.c b/test/automated/displayless/test-utilities.c
index 7b38c6849..f86783317 100644
--- a/test/automated/displayless/test-utilities.c
+++ b/test/automated/displayless/test-utilities.c
@@ -90,7 +90,7 @@ delete_search_file_hierarchy (gchar *search_engine)
     g_autoptr (GFile) file = NULL;
     gchar *file_name;
 
-    location = g_file_new_for_path (g_get_tmp_dir ()); 
+    location = g_file_new_for_path (g_get_tmp_dir ());
 
     file_name = g_strdup_printf ("engine_%s", search_engine);
     file = g_file_get_child (location, file_name);
@@ -165,7 +165,7 @@ test_operation_undo (void)
     nautilus_file_undo_manager_undo (NULL);
 
     g_main_loop_run (loop);
-    
+
     g_main_context_pop_thread_default (context);
 
     g_signal_handler_disconnect (nautilus_file_undo_manager_get (),
@@ -178,7 +178,7 @@ test_operation_undo_redo (void)
 {
     g_autoptr (GMainLoop) loop = NULL;
     g_autoptr (GMainContext) context = NULL;
-    gulong handler_id;    
+    gulong handler_id;
 
     test_operation_undo ();
 
@@ -194,7 +194,7 @@ test_operation_undo_redo (void)
     nautilus_file_undo_manager_redo (NULL);
 
     g_main_loop_run (loop);
-    
+
     g_main_context_pop_thread_default (context);
 
     g_signal_handler_disconnect (nautilus_file_undo_manager_get (),
@@ -277,7 +277,8 @@ create_one_empty_directory (gchar *prefix)
 }
 
 void
-create_multiple_files (gchar *prefix, gint number_of_files)
+create_multiple_files (gchar *prefix,
+                       gint   number_of_files)
 {
     g_autoptr (GFile) root = NULL;
     g_autoptr (GFile) file = NULL;
@@ -309,7 +310,8 @@ create_multiple_files (gchar *prefix, gint number_of_files)
 }
 
 void
-create_multiple_directories (gchar *prefix, gint number_of_directories)
+create_multiple_directories (gchar *prefix,
+                             gint   number_of_directories)
 {
     g_autoptr (GFile) root = NULL;
     g_autoptr (GFile) file = NULL;
@@ -526,7 +528,8 @@ create_fourth_hierarchy (gchar *prefix)
 }
 
 void
-create_multiple_full_directories (gchar *prefix, gint number_of_directories)
+create_multiple_full_directories (gchar *prefix,
+                                  gint   number_of_directories)
 {
     g_autoptr (GFile) root = NULL;
 
@@ -552,4 +555,4 @@ create_multiple_full_directories (gchar *prefix, gint number_of_directories)
 
         g_file_make_directory (file, NULL, NULL);
     }
-}
\ No newline at end of file
+}