[nautilus/wip/oholy/ci-style-check: 25/29] general: Run uncrustify script
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/oholy/ci-style-check: 25/29] general: Run uncrustify script
- Date: Wed, 1 Apr 2020 08:32:52 +0000 (UTC)
commit e42688c47242ac51224149c807941fa41d9d0efe
Author: Ondrej Holy <oholy redhat com>
Date: Thu Feb 13 14:10:55 2020 +0100
general: Run uncrustify script
There are some style issue since the last run. Let's run it again
before enabling style-check CI job.
eel/eel-canvas.c | 7 +--
eel/eel-string.c | 50 ++++++++---------
.../nautilus-image-properties-page-provider.c | 2 +-
libnautilus-extension/nautilus-file-info.c | 3 +-
src/nautilus-bookmark-list.c | 13 +++--
src/nautilus-canvas-container.c | 6 ++-
src/nautilus-canvas-item.c | 6 ++-
src/nautilus-clipboard.c | 1 -
src/nautilus-dbus-manager.c | 4 +-
src/nautilus-debug.c | 1 -
src/nautilus-directory-async.c | 3 +-
src/nautilus-file-name-widget-controller.c | 4 +-
src/nautilus-file-operations.c | 48 ++++++++---------
src/nautilus-file-undo-manager.c | 2 +-
src/nautilus-file-undo-operations.c | 10 ++--
src/nautilus-file-utilities.c | 6 +--
src/nautilus-file.c | 11 ++--
src/nautilus-files-view.c | 62 +++++++++++-----------
src/nautilus-list-view.c | 4 +-
src/nautilus-mime-actions.c | 5 +-
src/nautilus-operations-ui-manager.c | 1 -
src/nautilus-pathbar.c | 4 +-
src/nautilus-previewer.c | 6 +--
src/nautilus-program-choosing.c | 10 ++--
src/nautilus-properties-window.c | 58 ++++++++++----------
src/nautilus-search-engine-recent.c | 18 +++----
src/nautilus-search-engine-simple.c | 39 +++++++-------
src/nautilus-search-engine-tracker.c | 2 +-
src/nautilus-search-engine.c | 12 +++--
src/nautilus-shell-search-provider.c | 2 +-
src/nautilus-thumbnails.c | 14 ++---
src/nautilus-toolbar.c | 27 +++++-----
src/nautilus-trash-bar.c | 2 +-
src/nautilus-trash-monitor.c | 4 +-
src/nautilus-ui-utilities.c | 8 +--
src/nautilus-view-icon-controller.c | 11 ++--
src/nautilus-window-slot.c | 17 +++---
src/nautilus-window.c | 18 +++----
.../displayless/test-file-operations-copy-files.c | 7 +--
.../test-file-operations-dir-has-files.c | 5 +-
.../displayless/test-file-operations-move-files.c | 15 +++---
.../test-file-operations-trash-or-delete.c | 60 ++++++++++-----------
test/automated/displayless/test-file-utilities.c | 7 +--
.../test-nautilus-search-engine-model.c | 2 +-
.../test-nautilus-search-engine-simple.c | 2 +-
.../test-nautilus-search-engine-tracker.c | 2 +-
.../displayless/test-nautilus-search-engine.c | 2 +-
test/automated/displayless/test-utilities.c | 19 ++++---
48 files changed, 322 insertions(+), 300 deletions(-)
---
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index e6dc73327..e3ccfbd5d 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -2484,9 +2484,10 @@ scroll_to (EelCanvas *canvas,
if ((canvas->zoom_xofs != old_zoom_xofs) || (canvas->zoom_yofs != old_zoom_yofs))
{
- /* This can only occur, if either canvas size or widget size changes */
- /* So I think we can request full redraw here */
- /* More stuff - we have to mark root as needing fresh affine (Lauris) */
+ /* This can only occur, if either canvas size or widget size changes
+ * So I think we can request full redraw here
+ * More stuff - we have to mark root as needing fresh affine (Lauris)
+ */
if (!(canvas->root->flags & EEL_CANVAS_ITEM_NEED_DEEP_UPDATE))
{
canvas->root->flags |= EEL_CANVAS_ITEM_NEED_DEEP_UPDATE;
diff --git a/eel/eel-string.c b/eel/eel-string.c
index f6498fc9a..5d70089a8 100644
--- a/eel/eel-string.c
+++ b/eel/eel-string.c
@@ -110,14 +110,14 @@ eel_str_capitalize (const char *string)
}
/**
-* eel_str_middle_truncate:
-* @string: (not nullable): input string
-* truncate_length: length of the truncated string
-*
-* Returns: (transfer full): a newly-allocated copy of @string with its middle
-* truncated and replaced with ellipsis to fit into @truncate_length characters.
-* If length of @string is already small enough, returns a copy of @string.
-*/
+ * eel_str_middle_truncate:
+ * @string: (not nullable): input string
+ * truncate_length: length of the truncated string
+ *
+ * Returns: (transfer full): a newly-allocated copy of @string with its middle
+ * truncated and replaced with ellipsis to fit into @truncate_length characters.
+ * If length of @string is already small enough, returns a copy of @string.
+ */
gchar *
eel_str_middle_truncate (const gchar *string,
guint truncate_length)
@@ -161,14 +161,14 @@ eel_str_middle_truncate (const gchar *string,
}
/**
-* eel_str_strip_substring_and_after:
-* @string: input string
-* @substring: (not nullable): substring to use in search
-*
-* Returns: (transfer full): a copy of @string with the first occurence of
-* @substring removed, along with any trailing characters.
-* If @string is %NULL, returns %NULL.
-*/
+ * eel_str_strip_substring_and_after:
+ * @string: input string
+ * @substring: (not nullable): substring to use in search
+ *
+ * Returns: (transfer full): a copy of @string with the first occurence of
+ * @substring removed, along with any trailing characters.
+ * If @string is %NULL, returns %NULL.
+ */
char *
eel_str_strip_substring_and_after (const char *string,
const char *substring)
@@ -194,14 +194,14 @@ eel_str_strip_substring_and_after (const char *string,
}
/**
-* eel_str_replace_substring:
-* @string: input string
-* @substring: (not nullable): string to be replaced
-* @replacement: string used as replacement
-*
-* Returns: (transfer full): a copy of @string with all occurences of @substring
-* replaced with @replacement.
-*/
+ * eel_str_replace_substring:
+ * @string: input string
+ * @substring: (not nullable): string to be replaced
+ * @replacement: string used as replacement
+ *
+ * Returns: (transfer full): a copy of @string with all occurences of @substring
+ * replaced with @replacement.
+ */
char *
eel_str_replace_substring (const char *string,
const char *substring,
@@ -320,7 +320,7 @@ get_common_prefix_length (char *str_a,
* Returns: (transfer full): the common prefix for strings in @strs.
* If no such prefix exists or if the common prefix is smaller than
* @min_required_len, %NULL is returned.
-*/
+ */
char *
eel_str_get_common_prefix (GList *strs,
int min_required_len)
diff --git a/extensions/image-properties/nautilus-image-properties-page-provider.c
b/extensions/image-properties/nautilus-image-properties-page-provider.c
index 99e495bb7..b270ea945 100644
--- a/extensions/image-properties/nautilus-image-properties-page-provider.c
+++ b/extensions/image-properties/nautilus-image-properties-page-provider.c
@@ -66,7 +66,7 @@ is_mime_type_supported (const char *mime_type)
continue;
}
- if (g_strv_contains ((const char *const *) mime_types, mime_type))
+ if (g_strv_contains ((const char * const *) mime_types, mime_type))
{
return TRUE;
}
diff --git a/libnautilus-extension/nautilus-file-info.c b/libnautilus-extension/nautilus-file-info.c
index 484e6c1c0..020cac3e2 100644
--- a/libnautilus-extension/nautilus-file-info.c
+++ b/libnautilus-extension/nautilus-file-info.c
@@ -24,7 +24,8 @@
G_DEFINE_INTERFACE (NautilusFileInfo, nautilus_file_info, G_TYPE_OBJECT)
-NautilusFileInfo * (*nautilus_file_info_getter)(GFile * location, gboolean create);
+NautilusFileInfo * (*nautilus_file_info_getter)(GFile *location,
+ gboolean create);
GList *
nautilus_file_info_list_copy (GList *files)
diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c
index 0f8526ba6..a0698d691 100644
--- a/src/nautilus-bookmark-list.c
+++ b/src/nautilus-bookmark-list.c
@@ -55,7 +55,7 @@ enum
static guint signals[LAST_SIGNAL];
/* forward declarations */
-#define NAUTILUS_BOOKMARK_LIST_ERROR (nautilus_bookmark_list_error_quark())
+#define NAUTILUS_BOOKMARK_LIST_ERROR (nautilus_bookmark_list_error_quark ())
static GQuark nautilus_bookmark_list_error_quark (void);
static void nautilus_bookmark_list_load_file (NautilusBookmarkList *bookmarks);
@@ -70,7 +70,8 @@ nautilus_bookmark_list_error_quark (void)
}
static NautilusBookmark *
-new_bookmark_from_uri (const char *uri, const char *label)
+new_bookmark_from_uri (const char *uri,
+ const char *label)
{
NautilusBookmark *new_bookmark = NULL;
g_autoptr (GFile) location = NULL;
@@ -351,8 +352,9 @@ load_callback (GObject *source_object,
/* Ignore empty or invalid lines that cannot be parsed properly */
if (lines[i][0] != '\0' && lines[i][0] != ' ')
{
- /* gtk 2.7/2.8 might have labels appended to bookmarks which are separated by a space */
- /* we must seperate the bookmark uri and the potential label */
+ /* gtk 2.7/2.8 might have labels appended to bookmarks which are separated by a space
+ * we must seperate the bookmark uri and the potential label
+ */
char *space;
g_autofree char *label = NULL;
@@ -469,7 +471,8 @@ save_io_thread (GTask *task,
parent = g_file_get_parent (file);
path = g_file_get_path (parent);
- if (g_mkdir_with_parents (path, 0700) == -1) {
+ if (g_mkdir_with_parents (path, 0700) == -1)
+ {
int saved_errno = errno;
g_set_error (&error, NAUTILUS_BOOKMARK_LIST_ERROR, 0,
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index 932439ffe..71bcf1904 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -1220,7 +1220,7 @@ lay_down_icons_horizontal (NautilusCanvasContainer *container,
double unused_width = available_width - used_width;
double max_extra_fraction = (unused_width / num_icons) / min_grid_width;
- double extra_fraction = pow(max_extra_fraction + 1.0, 1.0 / 4.0) - 1.0;
+ double extra_fraction = pow (max_extra_fraction + 1.0, 1.0 / 4.0) - 1.0;
grid_width = min_grid_width * (1 + extra_fraction);
}
@@ -4968,7 +4968,7 @@ finish_adding_new_icons (NautilusCanvasContainer *container)
new_icons = container->details->new_icons;
container->details->new_icons = NULL;
container->details->is_populating_container = g_list_length (new_icons) ==
- g_hash_table_size (container->details->icon_set);
+ g_hash_table_size (container->details->icon_set);
/* Position most icons (not unpositioned manual-layout icons). */
new_icons = g_list_reverse (new_icons);
@@ -5928,7 +5928,9 @@ nautilus_canvas_container_accessible_icon_added_cb (NautilusCanvasContainer *con
/* We don't want to emit children_changed signals during any type of load. */
if (!container->details->in_layout_now || container->details->is_populating_container)
+ {
return;
+ }
icon = g_hash_table_lookup (container->details->icon_set, icon_data);
if (icon)
diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
index 5b5d3312f..a3c389501 100644
--- a/src/nautilus-canvas-item.c
+++ b/src/nautilus-canvas-item.c
@@ -296,7 +296,9 @@ nautilus_canvas_item_set_property (GObject *object,
details->text = g_string_assign (details->text, details->editable_text);
if (is_rename)
+ {
g_object_notify (G_OBJECT (accessible), "accessible-name");
+ }
}
nautilus_canvas_item_invalidate_label_size (item);
@@ -1206,11 +1208,11 @@ real_map_surface (NautilusCanvasItem *canvas_item)
widget = GTK_WIDGET (canvas);
style = gtk_widget_get_style_context (widget);
has_focus = gtk_widget_has_focus (widget);
- state = has_focus? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_ACTIVE;
+ state = has_focus ? GTK_STATE_FLAG_SELECTED : GTK_STATE_FLAG_ACTIVE;
width = gdk_pixbuf_get_width (temp_pixbuf);
height = gdk_pixbuf_get_height (temp_pixbuf);
has_alpha = gdk_pixbuf_get_has_alpha (temp_pixbuf);
- format = has_alpha? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24;
+ format = has_alpha ? CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24;
surface = cairo_image_surface_create (format, width, height);
cr = cairo_create (surface);
diff --git a/src/nautilus-clipboard.c b/src/nautilus-clipboard.c
index 97264bc63..fb7e96d4b 100644
--- a/src/nautilus-clipboard.c
+++ b/src/nautilus-clipboard.c
@@ -327,4 +327,3 @@ nautilus_clipboard_prepare_for_files (GtkClipboard *clipboard,
clipboard_info);
gtk_target_table_free (targets, n_targets);
}
-
diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
index 43f27e10a..2a6d9e9e6 100644
--- a/src/nautilus-dbus-manager.c
+++ b/src/nautilus-dbus-manager.c
@@ -72,7 +72,7 @@ handle_redo (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation)
{
NautilusFileUndoManager *undo_manager = NULL;
- gint *handler_id = g_new0(int, 1);
+ gint *handler_id = g_new0 (int, 1);
g_application_hold (g_application_get_default ());
@@ -91,7 +91,7 @@ handle_undo (NautilusDBusFileOperations *object,
GDBusMethodInvocation *invocation)
{
NautilusFileUndoManager *undo_manager = NULL;
- gint *handler_id = g_new0(int, 1);
+ gint *handler_id = g_new0 (int, 1);
g_application_hold (g_application_get_default ());
diff --git a/src/nautilus-debug.c b/src/nautilus-debug.c
index 84c247327..adb7535e0 100644
--- a/src/nautilus-debug.c
+++ b/src/nautilus-debug.c
@@ -64,7 +64,6 @@ nautilus_debug_set_flags_from_env (void)
for (nkeys = 0; keys[nkeys].value; nkeys++)
{
- ;
}
flags_string = g_getenv ("NAUTILUS_DEBUG");
diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c
index 9f3033157..d5b93b5ac 100644
--- a/src/nautilus-directory-async.c
+++ b/src/nautilus-directory-async.c
@@ -2421,7 +2421,8 @@ monitor_includes_file (const Monitor *monitor,
static gboolean
is_wanted_by_monitor (NautilusFile *file,
GList *monitors,
- RequestType request_type_wanted) {
+ RequestType request_type_wanted)
+{
GList *node;
for (node = monitors; node; node = node->next)
diff --git a/src/nautilus-file-name-widget-controller.c b/src/nautilus-file-name-widget-controller.c
index dfcdfbe7c..308ab51f2 100644
--- a/src/nautilus-file-name-widget-controller.c
+++ b/src/nautilus-file-name-widget-controller.c
@@ -73,8 +73,8 @@ nautilus_file_name_widget_controller_set_containing_directory (NautilusFileNameW
}
gboolean
-nautilus_file_name_widget_controller_is_name_too_long (NautilusFileNameWidgetController *self,
- gchar *name)
+nautilus_file_name_widget_controller_is_name_too_long (NautilusFileNameWidgetController *self,
+ gchar *name)
{
NautilusFileNameWidgetControllerPrivate *priv;
size_t name_length;
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index a9266c336..21fc255ba 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -257,11 +257,11 @@ static void empty_trash_task_done (GObject *source_object,
static char *query_fs_type (GFile *file,
GCancellable *cancellable);
-static CopyMoveJob *copy_job_setup (GList *files,
- GFile *target_dir,
- GtkWindow *parent_window,
+static CopyMoveJob *copy_job_setup (GList *files,
+ GFile *target_dir,
+ GtkWindow *parent_window,
NautilusCopyCallback done_callback,
- gpointer done_callback_data);
+ gpointer done_callback_data);
static void nautilus_file_operations_copy (GTask *task,
gpointer source_object,
@@ -2532,9 +2532,9 @@ setup_delete_job (GList *files,
}
static void
-trash_or_delete_internal_sync (GList *files,
- GtkWindow *parent_window,
- gboolean try_trash)
+trash_or_delete_internal_sync (GList *files,
+ GtkWindow *parent_window,
+ gboolean try_trash)
{
GTask *task;
DeleteJob *job;
@@ -2578,13 +2578,13 @@ trash_or_delete_internal_async (GList *files,
}
void
-nautilus_file_operations_trash_or_delete_sync (GList *files)
+nautilus_file_operations_trash_or_delete_sync (GList *files)
{
trash_or_delete_internal_sync (files, NULL, TRUE);
}
void
-nautilus_file_operations_delete_sync (GList *files)
+nautilus_file_operations_delete_sync (GList *files)
{
trash_or_delete_internal_sync (files, NULL, FALSE);
}
@@ -5737,11 +5737,11 @@ copy_task_done (GObject *source_object,
}
static CopyMoveJob *
-copy_job_setup (GList *files,
- GFile *target_dir,
- GtkWindow *parent_window,
- NautilusCopyCallback done_callback,
- gpointer done_callback_data)
+copy_job_setup (GList *files,
+ GFile *target_dir,
+ GtkWindow *parent_window,
+ NautilusCopyCallback done_callback,
+ gpointer done_callback_data)
{
CopyMoveJob *job;
@@ -5844,10 +5844,10 @@ nautilus_file_operations_copy_sync (GList *files,
CopyMoveJob *job;
job = copy_job_setup (files,
- target_dir,
- NULL,
- NULL,
- NULL);
+ target_dir,
+ NULL,
+ NULL,
+ NULL);
task = g_task_new (NULL, job->common.cancellable, NULL, job);
g_task_set_task_data (task, job, NULL);
@@ -5870,10 +5870,10 @@ nautilus_file_operations_copy_async (GList *files,
CopyMoveJob *job;
job = copy_job_setup (files,
- target_dir,
- parent_window,
- done_callback,
- done_callback_data);
+ target_dir,
+ parent_window,
+ done_callback,
+ done_callback_data);
task = g_task_new (NULL, job->common.cancellable, copy_task_done, job);
g_task_set_task_data (task, job, NULL);
@@ -6373,8 +6373,8 @@ move_job_setup (GList *files,
}
void
-nautilus_file_operations_move_sync (GList *files,
- GFile *target_dir)
+nautilus_file_operations_move_sync (GList *files,
+ GFile *target_dir)
{
GTask *task;
CopyMoveJob *job;
diff --git a/src/nautilus-file-undo-manager.c b/src/nautilus-file-undo-manager.c
index 4dc26c64a..ef6f2a1c8 100644
--- a/src/nautilus-file-undo-manager.c
+++ b/src/nautilus-file-undo-manager.c
@@ -56,7 +56,7 @@ struct _NautilusFileUndoManager
G_DEFINE_TYPE (NautilusFileUndoManager, nautilus_file_undo_manager, G_TYPE_OBJECT)
-static NautilusFileUndoManager * undo_singleton = NULL;
+static NautilusFileUndoManager *undo_singleton = NULL;
NautilusFileUndoManager *
nautilus_file_undo_manager_new (void)
diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c
index 1b5998344..236b9eb1a 100644
--- a/src/nautilus-file-undo-operations.c
+++ b/src/nautilus-file-undo-operations.c
@@ -755,9 +755,9 @@ nautilus_file_undo_info_ext_new (NautilusFileUndoOp op_type,
NautilusFileUndoInfoExt *self;
self = g_object_new (NAUTILUS_TYPE_FILE_UNDO_INFO_EXT,
- "op-type", op_type,
- "item-count", item_count,
- NULL);
+ "op-type", op_type,
+ "item-count", item_count,
+ NULL);
self->src_dir = g_object_ref (src_dir);
self->dest_dir = g_object_ref (target_dir);
@@ -2432,8 +2432,8 @@ nautilus_file_undo_info_extract_new (GList *sources,
NULL);
self->sources = g_list_copy_deep (sources,
- (GCopyFunc) g_object_ref,
- NULL);
+ (GCopyFunc) g_object_ref,
+ NULL);
self->destination_directory = g_object_ref (destination_directory);
return NAUTILUS_FILE_UNDO_INFO (self);
diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
index ab7192e1c..e6a4b2e58 100644
--- a/src/nautilus-file-utilities.c
+++ b/src/nautilus-file-utilities.c
@@ -1456,16 +1456,16 @@ location_settings_search_get_recursive (void)
return NAUTILUS_QUERY_RECURSIVE_ALWAYS;
}
break;
-
+
case NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY:
{
return NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY;
}
break;
-
+
case NAUTILUS_SPEED_TRADEOFF_NEVER:
{
- return NAUTILUS_QUERY_RECURSIVE_NEVER;
+ return NAUTILUS_QUERY_RECURSIVE_NEVER;
}
break;
}
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 45603af08..9681335a2 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -2547,7 +2547,6 @@ update_info_internal (NautilusFile *file,
has_permissions = g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE);
permissions = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE);
- ;
if (file->details->has_permissions != has_permissions ||
file->details->permissions != permissions)
{
@@ -4961,9 +4960,9 @@ prepend_icon_name (const char *name,
}
static void
-apply_emblems_to_icon (NautilusFile *file,
- GIcon **icon,
- NautilusFileIconFlags flags)
+apply_emblems_to_icon (NautilusFile *file,
+ GIcon **icon,
+ NautilusFileIconFlags flags)
{
GIcon *emblemed_icon = NULL;
g_autolist (GIcon) emblems = NULL;
@@ -7052,7 +7051,7 @@ nautilus_file_get_deep_count_as_string_internal (NautilusFile *file,
default:
{}
- break;
+ break;
}
}
@@ -7656,7 +7655,6 @@ nautilus_file_get_file_type (NautilusFile *file)
g_return_val_if_fail (NAUTILUS_IS_FILE (file), G_FILE_TYPE_UNKNOWN);
return nautilus_file_info_get_file_type (NAUTILUS_FILE_INFO (file));
- ;
}
/**
@@ -9070,7 +9068,6 @@ thumbnail_limit_changed_callback (gpointer user_data)
/*Converts the obtained limit in MB to bytes */
cached_thumbnail_limit *= MEGA_TO_BASE_RATE;
- ;
/* Tell the world that icons might have changed. We could invent a narrower-scope
* signal to mean only "thumbnails might have changed" if this ends up being slow
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index a23d4c03f..daf556f3b 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -708,7 +708,7 @@ nautilus_files_view_get_toolbar_menu_sections (NautilusView *view)
return priv->toolbar_menu_sections;
}
-static GMenuModel*
+static GMenuModel *
nautilus_files_view_get_templates_menu (NautilusView *self)
{
GMenuModel *menu;
@@ -718,7 +718,7 @@ nautilus_files_view_get_templates_menu (NautilusView *self)
return menu;
}
-static GMenuModel*
+static GMenuModel *
nautilus_files_view_get_extensions_background_menu (NautilusView *self)
{
GMenuModel *menu;
@@ -728,7 +728,7 @@ nautilus_files_view_get_extensions_background_menu (NautilusView *self)
return menu;
}
-static GMenuModel*
+static GMenuModel *
real_get_extensions_background_menu (NautilusView *view)
{
NautilusFilesViewPrivate *priv;
@@ -740,7 +740,7 @@ real_get_extensions_background_menu (NautilusView *view)
return priv->extensions_background_menu;
}
-static GMenuModel*
+static GMenuModel *
real_get_templates_menu (NautilusView *view)
{
NautilusFilesViewPrivate *priv;
@@ -1228,7 +1228,8 @@ get_view_directory (NautilusFilesView *view)
return path;
}
-typedef struct {
+typedef struct
+{
gchar *uri;
gboolean is_update;
} PreviewExportData;
@@ -1249,7 +1250,7 @@ on_window_handle_export (NautilusWindow *window,
guint xid,
gpointer user_data)
{
- g_autoptr(PreviewExportData) data = user_data;
+ g_autoptr (PreviewExportData) data = user_data;
nautilus_previewer_call_show_file (data->uri, handle, xid, !data->is_update);
}
@@ -2688,9 +2689,9 @@ paste_clipboard_data (NautilusFilesView *view,
}
static void
-paste_clipboard_text_received_callback (GtkClipboard *clipboard,
- const gchar *selection_data,
- gpointer data)
+paste_clipboard_text_received_callback (GtkClipboard *clipboard,
+ const gchar *selection_data,
+ gpointer data)
{
NautilusFilesView *view;
NautilusFilesViewPrivate *priv;
@@ -3126,25 +3127,25 @@ slot_active_changed (NautilusWindowSlot *slot,
if (priv->active)
{
- /* Avoid updating the toolbar withouth making sure the toolbar
- * zoom slider has the correct adjustment that changes when the
- * view mode changes
- */
- nautilus_files_view_update_context_menus (view);
- nautilus_files_view_update_toolbar_menus (view);
+ /* Avoid updating the toolbar withouth making sure the toolbar
+ * zoom slider has the correct adjustment that changes when the
+ * view mode changes
+ */
+ nautilus_files_view_update_context_menus (view);
+ nautilus_files_view_update_toolbar_menus (view);
- schedule_update_context_menus (view);
+ schedule_update_context_menus (view);
- gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)),
- "view",
- G_ACTION_GROUP (priv->view_action_group));
+ gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)),
+ "view",
+ G_ACTION_GROUP (priv->view_action_group));
}
else
{
- remove_update_context_menus_timeout_callback (view);
- gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)),
- "view",
- NULL);
+ remove_update_context_menus_timeout_callback (view);
+ gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)),
+ "view",
+ NULL);
}
}
@@ -7499,8 +7500,9 @@ real_update_actions_state (NautilusFilesView *view)
NAUTILUS_PREFERENCES_SHOW_DELETE_PERMANENTLY);
settings_show_create_link = g_settings_get_boolean (nautilus_preferences,
NAUTILUS_PREFERENCES_SHOW_CREATE_LINK);
- /* Right click actions */
- /* Selection menu actions */
+ /* Right click actions
+ * Selection menu actions
+ */
action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group),
"new-folder-with-selection");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
@@ -8607,9 +8609,9 @@ finish_loading (NautilusFilesView *view)
/* Connect handlers to learn about loading progress. */
priv->done_loading_handler_id = g_signal_connect (priv->model, "done-loading",
- G_CALLBACK (done_loading_callback), view);
+ G_CALLBACK (done_loading_callback), view);
priv->load_error_handler_id = g_signal_connect (priv->model, "load-error",
- G_CALLBACK (load_error_callback), view);
+ G_CALLBACK (load_error_callback), view);
/* Monitor the things needed to get the right icon. Also
* monitor a directory's item count because the "size"
@@ -8908,9 +8910,9 @@ nautilus_files_view_move_copy_items (NautilusFilesView *view,
target_file = nautilus_file_get_existing_by_uri (target_uri);
if (copy_action == GDK_ACTION_COPY &&
- nautilus_is_file_roller_installed () &&
- target_file != NULL &&
- nautilus_file_is_archive (target_file))
+ nautilus_is_file_roller_installed () &&
+ target_file != NULL &&
+ nautilus_file_is_archive (target_file))
{
char *command, *quoted_uri, *tmp;
const GList *l;
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index fc92917c3..bce65ec53 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -614,8 +614,8 @@ on_tree_view_multi_press_gesture_pressed (GtkGestureMultiPress *gesture,
gtk_tree_view_get_cell_area (tree_view, path, column, &cell_area);
- /* We assume that the cell area excludes the expander itself.
- * Explanatory link for future reference:
+ /* We assume that the cell area excludes the expander itself.
+ * Explanatory link for future reference:
* https://gitlab.gnome.org/GNOME/nautilus/merge_requests/97#note_58649 */
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 316066d4c..1d59a1e03 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -1731,8 +1731,9 @@ activation_mount_not_mounted (ActivateParameters *parameters)
return;
}
- /* once the mount is finished, refresh all attributes */
- /* - fixes new windows not appearing after successful mount */
+ /* once the mount is finished, refresh all attributes
+ * - fixes new windows not appearing after successful mount
+ */
for (l = parameters->locations; l != NULL; l = next)
{
loc = l->data;
diff --git a/src/nautilus-operations-ui-manager.c b/src/nautilus-operations-ui-manager.c
index 43dbaf053..a932a2d77 100644
--- a/src/nautilus-operations-ui-manager.c
+++ b/src/nautilus-operations-ui-manager.c
@@ -28,7 +28,6 @@ invoke_main_context_source_func_wrapper (gpointer user_data)
while (data->source_func (data->user_data))
{
- ;
}
data->completed = TRUE;
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 58242fbb8..d59bb0d34 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -56,7 +56,7 @@ typedef enum
#define BUTTON_DATA(x) ((ButtonData *) (x))
-static guint path_bar_signals [LAST_SIGNAL] = { 0 };
+static guint path_bar_signals[LAST_SIGNAL] = { 0 };
#define NAUTILUS_PATH_BAR_BUTTON_MAX_WIDTH 175
@@ -211,7 +211,7 @@ nautilus_path_bar_init (NautilusPathBar *self)
GtkBuilder *builder;
g_autoptr (GError) error = NULL;
- builder = gtk_builder_new();
+ builder = gtk_builder_new ();
/* Add context menu for pathbar buttons */
gtk_builder_add_from_resource (builder,
diff --git a/src/nautilus-previewer.c b/src/nautilus-previewer.c
index 40a02522e..66074ab93 100644
--- a/src/nautilus-previewer.c
+++ b/src/nautilus-previewer.c
@@ -44,7 +44,7 @@ ensure_previewer_v2_proxy (void)
{
if (previewer_v2_proxy == NULL)
{
- g_autoptr(GError) error = NULL;
+ g_autoptr (GError) error = NULL;
GDBusConnection *connection = g_application_get_dbus_connection (g_application_get_default ());
previewer_v2_proxy = g_dbus_proxy_new_sync (connection,
@@ -72,7 +72,7 @@ previewer2_method_ready_cb (GObject *source,
gpointer user_data)
{
GDBusProxy *proxy = G_DBUS_PROXY (source);
- g_autoptr(GError) error = NULL;
+ g_autoptr (GError) error = NULL;
g_dbus_proxy_call_finish (proxy, res, &error);
@@ -190,7 +190,7 @@ nautilus_previewer_disconnect_selection_event (GDBusConnection *connection,
gboolean
nautilus_previewer_is_visible (void)
{
- g_autoptr(GVariant) variant = NULL;
+ g_autoptr (GVariant) variant = NULL;
if (!ensure_previewer_v2_proxy ())
{
diff --git a/src/nautilus-program-choosing.c b/src/nautilus-program-choosing.c
index 047a78c2b..47362a3f7 100644
--- a/src/nautilus-program-choosing.c
+++ b/src/nautilus-program-choosing.c
@@ -432,7 +432,7 @@ nautilus_launch_desktop_file (GdkScreen *screen,
/* some files are non-local */
show_dialog (_("This drop target only supports local files."),
_("To open non-local files copy them to a local folder and then"
- " drop them again. The local files you dropped have already been opened."),
+ " drop them again. The local files you dropped have already been opened."),
parent_window,
GTK_MESSAGE_WARNING);
}
@@ -526,10 +526,10 @@ on_launch_default_for_uri (GObject *source,
}
static void
-on_window_handle_export (NautilusWindow *window,
- const char *handle_str,
- guint xid,
- gpointer user_data)
+on_window_handle_export (NautilusWindow *window,
+ const char *handle_str,
+ guint xid,
+ gpointer user_data)
{
GTask *task = user_data;
GAppLaunchContext *context = g_task_get_task_data (task);
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 52a2b3fce..90fd5dc6c 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -578,9 +578,9 @@ set_name_field (NautilusPropertiesWindow *window,
if (use_label)
{
window->name_field = GTK_WIDGET
- (attach_ellipsizing_value_label (window->basic_grid,
- GTK_WIDGET
(window->name_label),
- name));
+ (attach_ellipsizing_value_label (window->basic_grid,
+ GTK_WIDGET (window->name_label),
+ name));
}
else
{
@@ -868,7 +868,7 @@ name_field_activate (GtkWidget *name_field,
if (window->select_idle_id == 0)
{
window->select_idle_id = g_idle_add (select_all_at_idle,
- window);
+ window);
}
}
@@ -1458,7 +1458,7 @@ attach_value_field_internal (NautilusPropertiesWindow *window,
g_object_set_data (G_OBJECT (value_field), "show_original", GINT_TO_POINTER (show_original));
window->value_fields = g_list_prepend (window->value_fields,
- value_field);
+ value_field);
return GTK_WIDGET (value_field);
}
@@ -2671,7 +2671,7 @@ should_show_accessed_date (NautilusPropertiesWindow *window)
* consider whether it's useful for "trash:".
*/
if (file_list_all_directories (window->target_files)
- || is_multi_file_window (window))
+ || is_multi_file_window (window))
{
return FALSE;
}
@@ -3125,9 +3125,9 @@ open_in_disks (GtkButton *button,
g_autoptr (GAppInfo) app_info = NULL;
app_info = g_app_info_create_from_commandline ("gnome-disks",
- NULL,
- G_APP_INFO_CREATE_NONE,
- NULL);
+ NULL,
+ G_APP_INFO_CREATE_NONE,
+ NULL);
g_app_info_launch (app_info, NULL, NULL, &error);
@@ -3256,7 +3256,7 @@ create_basic_page (NautilusPropertiesWindow *window)
}
if (should_show_accessed_date (window)
- || should_show_modified_date (window))
+ || should_show_modified_date (window))
{
append_blank_row (grid);
}
@@ -3299,14 +3299,14 @@ create_basic_page (NautilusPropertiesWindow *window)
NULL);
}
- /*Translators: Here Disks mean the name of application GNOME Disks.*/
- button = gtk_button_new_with_label (_("Open in Disks"));
- g_signal_connect (button, "clicked", G_CALLBACK (open_in_disks), NULL);
- gtk_container_add_with_properties (GTK_CONTAINER (grid),
- button,
- "width", 3,
- NULL);
- gtk_widget_show_all (GTK_WIDGET (grid));
+ /*Translators: Here Disks mean the name of application GNOME Disks.*/
+ button = gtk_button_new_with_label (_("Open in Disks"));
+ g_signal_connect (button, "clicked", G_CALLBACK (open_in_disks), NULL);
+ gtk_container_add_with_properties (GTK_CONTAINER (grid),
+ button,
+ "width", 3,
+ NULL);
+ gtk_widget_show_all (GTK_WIDGET (grid));
}
}
@@ -4226,7 +4226,7 @@ add_permissions_combo_box (NautilusPropertiesWindow *window,
combo = create_permissions_combo_box (type, is_folder);
window->permission_combos = g_list_prepend (window->permission_combos,
- combo);
+ combo);
g_signal_connect (combo, "changed", G_CALLBACK (permission_combo_changed), window);
@@ -4654,12 +4654,12 @@ on_change_permissions_clicked (GtkWidget *button,
gtk_grid_attach (grid, label, 0, 1, 1, 1);
combo = create_permissions_combo_box (PERMISSION_USER, FALSE);
window->change_permission_combos = g_list_prepend (window->change_permission_combos,
- combo);
+ combo);
set_active_from_umask (combo, PERMISSION_USER, FALSE);
gtk_grid_attach (grid, combo, 1, 1, 1, 1);
combo = create_permissions_combo_box (PERMISSION_USER, TRUE);
window->change_permission_combos = g_list_prepend (window->change_permission_combos,
- combo);
+ combo);
set_active_from_umask (combo, PERMISSION_USER, TRUE);
gtk_grid_attach (grid, combo, 2, 1, 1, 1);
@@ -4668,12 +4668,12 @@ on_change_permissions_clicked (GtkWidget *button,
gtk_grid_attach (grid, label, 0, 2, 1, 1);
combo = create_permissions_combo_box (PERMISSION_GROUP, FALSE);
window->change_permission_combos = g_list_prepend (window->change_permission_combos,
- combo);
+ combo);
set_active_from_umask (combo, PERMISSION_GROUP, FALSE);
gtk_grid_attach (grid, combo, 1, 2, 1, 1);
combo = create_permissions_combo_box (PERMISSION_GROUP, TRUE);
window->change_permission_combos = g_list_prepend (window->change_permission_combos,
- combo);
+ combo);
set_active_from_umask (combo, PERMISSION_GROUP, TRUE);
gtk_grid_attach (grid, combo, 2, 2, 1, 1);
@@ -4682,12 +4682,12 @@ on_change_permissions_clicked (GtkWidget *button,
gtk_grid_attach (grid, label, 0, 3, 1, 1);
combo = create_permissions_combo_box (PERMISSION_OTHER, FALSE);
window->change_permission_combos = g_list_prepend (window->change_permission_combos,
- combo);
+ combo);
set_active_from_umask (combo, PERMISSION_OTHER, FALSE);
gtk_grid_attach (grid, combo, 1, 3, 1, 1);
combo = create_permissions_combo_box (PERMISSION_OTHER, TRUE);
window->change_permission_combos = g_list_prepend (window->change_permission_combos,
- combo);
+ combo);
set_active_from_umask (combo, PERMISSION_OTHER, TRUE);
gtk_grid_attach (grid, combo, 2, 3, 1, 1);
@@ -5336,8 +5336,8 @@ is_directory_ready_callback (NautilusFile *file,
remove_pending (startup_data, FALSE, TRUE);
gtk_window_present (GTK_WINDOW (new_window));
- g_signal_connect(GTK_WIDGET (new_window), "destroy",
- G_CALLBACK (widget_on_destroy), startup_data);
+ g_signal_connect (GTK_WIDGET (new_window), "destroy",
+ G_CALLBACK (widget_on_destroy), startup_data);
}
}
@@ -5387,8 +5387,8 @@ nautilus_properties_window_present (GList *original_f
gtk_window_present (GTK_WINDOW (existing_window));
startup_data = startup_data_new (NULL, NULL, NULL, NULL, NULL, NULL,
callback, callback_data, existing_window);
- g_signal_connect(GTK_WIDGET (existing_window), "destroy",
- G_CALLBACK (widget_on_destroy), startup_data);
+ g_signal_connect (GTK_WIDGET (existing_window), "destroy",
+ G_CALLBACK (widget_on_destroy), startup_data);
return;
}
diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
index 11a810608..dd535873e 100644
--- a/src/nautilus-search-engine-recent.c
+++ b/src/nautilus-search-engine-recent.c
@@ -32,8 +32,8 @@
#include <gio/gio.h>
#define FILE_ATTRIBS G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "," \
- G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP "," \
- G_FILE_ATTRIBUTE_ACCESS_CAN_READ ","
+ G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP "," \
+ G_FILE_ATTRIBUTE_ACCESS_CAN_READ ","
struct _NautilusSearchEngineRecent
{
@@ -56,9 +56,9 @@ G_DEFINE_TYPE_WITH_CODE (NautilusSearchEngineRecent,
enum
{
- PROP_0,
- PROP_RUNNING,
- LAST_PROP
+ PROP_0,
+ PROP_RUNNING,
+ LAST_PROP
};
@@ -136,9 +136,9 @@ search_add_hits_idle (NautilusSearchEngineRecent *self,
}
static gboolean
-is_file_valid_recursive (NautilusSearchEngineRecent *self,
- GFile *file,
- GError **error)
+is_file_valid_recursive (NautilusSearchEngineRecent *self,
+ GFile *file,
+ GError **error)
{
g_autofree gchar *path = NULL;
g_autoptr (GFileInfo) file_info = NULL;
@@ -295,7 +295,7 @@ recent_thread_func (gpointer user_data)
end_date = g_ptr_array_index (date_range, 1);
type = nautilus_query_get_search_type (self->query);
target_time = (type == NAUTILUS_QUERY_SEARCH_TYPE_LAST_ACCESS) ?
- visited : modified;
+ visited : modified;
if (!nautilus_file_date_in_between (target_time,
initial_date, end_date))
diff --git a/src/nautilus-search-engine-simple.c b/src/nautilus-search-engine-simple.c
index 1687d218a..4264cfe7c 100644
--- a/src/nautilus-search-engine-simple.c
+++ b/src/nautilus-search-engine-simple.c
@@ -61,8 +61,9 @@ typedef struct
gint processing_id;
GMutex idle_mutex;
- // The following data can be accessed from different threads
- // and needs to lock the mutex
+ /* The following data can be accessed from different threads
+ * and needs to lock the mutex
+ */
GQueue *idle_queue;
gboolean finished;
} SearchThreadData;
@@ -170,7 +171,8 @@ search_thread_done (SearchThreadData *data)
}
static void
-search_thread_process_hits_idle (SearchThreadData *data, GList *hits)
+search_thread_process_hits_idle (SearchThreadData *data,
+ GList *hits)
{
if (!g_cancellable_is_cancelled (data->cancellable))
{
@@ -190,26 +192,26 @@ search_thread_process_idle (gpointer user_data)
g_mutex_lock (&thread_data->idle_mutex);
hits = g_queue_pop_head (thread_data->idle_queue);
- // Even if the cancellable is cancelled, we need to make sure the search
- // thread has aknowledge it, and therefore not using the thread data after
- // freeing it. The search thread will mark as finished whenever the search
- // is finished or cancelled.
- // Nonetheless, we should stop yielding results if the search was cancelled
+ /* Even if the cancellable is cancelled, we need to make sure the search
+ * thread has aknowledge it, and therefore not using the thread data after
+ * freeing it. The search thread will mark as finished whenever the search
+ * is finished or cancelled.
+ * Nonetheless, we should stop yielding results if the search was cancelled
+ */
if (thread_data->finished)
{
if (hits == NULL || g_cancellable_is_cancelled (thread_data->cancellable))
{
- g_mutex_unlock (&thread_data->idle_mutex);
+ g_mutex_unlock (&thread_data->idle_mutex);
- if (hits)
- {
- g_list_free_full (hits, g_object_unref);
- }
- search_thread_done (thread_data);
+ if (hits)
+ {
+ g_list_free_full (hits, g_object_unref);
+ }
+ search_thread_done (thread_data);
- return G_SOURCE_REMOVE;
+ return G_SOURCE_REMOVE;
}
-
}
g_mutex_unlock (&thread_data->idle_mutex);
@@ -230,8 +232,9 @@ finish_search_thread (SearchThreadData *thread_data)
thread_data->finished = TRUE;
g_mutex_unlock (&thread_data->idle_mutex);
- // If no results were processed, direclty finish the search, in the main
- // thread.
+ /* If no results were processed, direclty finish the search, in the main
+ * thread.
+ */
if (thread_data->processing_id == 0)
{
g_idle_add (G_SOURCE_FUNC (search_thread_done), thread_data);
diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
index 32b6039a9..d575ba875 100644
--- a/src/nautilus-search-engine-tracker.c
+++ b/src/nautilus-search-engine-tracker.c
@@ -481,7 +481,7 @@ static void
nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
NautilusQuery *query)
{
- g_autoptr(GFile) location = NULL;
+ g_autoptr (GFile) location = NULL;
NautilusSearchEngineTracker *tracker;
tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider);
diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
index b5a67b730..c8505e594 100644
--- a/src/nautilus-search-engine.c
+++ b/src/nautilus-search-engine.c
@@ -106,7 +106,7 @@ search_engine_start_real_tracker (NautilusSearchEngine *engine)
NautilusSearchEnginePrivate *priv;
priv = nautilus_search_engine_get_instance_private (engine);
-
+
priv->providers_running++;
nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
}
@@ -117,7 +117,7 @@ search_engine_start_real_recent (NautilusSearchEngine *engine)
NautilusSearchEnginePrivate *priv;
priv = nautilus_search_engine_get_instance_private (engine);
-
+
priv->providers_running++;
nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->recent));
}
@@ -364,7 +364,7 @@ check_providers_status (NautilusSearchEngine *engine)
}
nautilus_search_provider_finished (NAUTILUS_SEARCH_PROVIDER (engine),
priv->restart ? NAUTILUS_SEARCH_PROVIDER_STATUS_RESTARTING :
- NAUTILUS_SEARCH_PROVIDER_STATUS_NORMAL);
+ NAUTILUS_SEARCH_PROVIDER_STATUS_NORMAL);
}
priv->running = FALSE;
@@ -553,13 +553,19 @@ is_recursive_search (NautilusSearchEngineType engine_type,
switch (recursive)
{
case NAUTILUS_QUERY_RECURSIVE_NEVER:
+ {
return FALSE;
+ }
case NAUTILUS_QUERY_RECURSIVE_ALWAYS:
+ {
return TRUE;
+ }
case NAUTILUS_QUERY_RECURSIVE_INDEXED_ONLY:
+ {
return engine_type == NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED;
+ }
case NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY:
{
diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
index e9cd5003b..c0da9298a 100644
--- a/src/nautilus-shell-search-provider.c
+++ b/src/nautilus-shell-search-provider.c
@@ -426,7 +426,7 @@ search_add_volumes_and_bookmarks (PendingSearch *search)
g_object_unref (volume_monitor);
}
-static NautilusQuery*
+static NautilusQuery *
shell_query_new (gchar **terms)
{
NautilusQuery *query;
diff --git a/src/nautilus-thumbnails.c b/src/nautilus-thumbnails.c
index 991bfb6f6..8b532f260 100644
--- a/src/nautilus-thumbnails.c
+++ b/src/nautilus-thumbnails.c
@@ -398,7 +398,7 @@ nautilus_create_thumbnail (NautilusFile *file)
{
/* Add the thumbnail to the list. */
DEBUG ("(Main Thread) Adding thumbnail: %s\n",
- info->image_uri);
+ info->image_uri);
g_queue_push_tail ((GQueue *) &thumbnails_to_make, info);
node = g_queue_peek_tail_link ((GQueue *) &thumbnails_to_make);
g_hash_table_insert (thumbnails_to_make_hash,
@@ -417,7 +417,7 @@ nautilus_create_thumbnail (NautilusFile *file)
else
{
DEBUG ("(Main Thread) Updating non-current mtime: %s\n",
- info->image_uri);
+ info->image_uri);
/* The file in the queue might need a new original mtime */
existing_info = existing->data;
@@ -452,7 +452,7 @@ thumbnail_thread_func (GTask *task,
/* We loop until there are no more thumbails to make, at which point
* we exit the thread. */
- for (;; )
+ for (;;)
{
DEBUG ("(Thumbnail Thread) Locking mutex\n");
@@ -515,7 +515,7 @@ thumbnail_thread_func (GTask *task,
current_time >= current_orig_mtime)
{
DEBUG ("(Thumbnail Thread) Skipping: %s\n",
- info->image_uri);
+ info->image_uri);
/* Reschedule thumbnailing via a change notification */
g_timeout_add_seconds (1, thumbnail_thread_notify_file_changed,
@@ -525,7 +525,7 @@ thumbnail_thread_func (GTask *task,
/* Create the thumbnail. */
DEBUG ("(Thumbnail Thread) Creating thumbnail: %s\n",
- info->image_uri);
+ info->image_uri);
pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (thumbnail_factory,
info->image_uri,
@@ -534,7 +534,7 @@ thumbnail_thread_func (GTask *task,
if (pixbuf)
{
DEBUG ("(Thumbnail Thread) Saving thumbnail: %s\n",
- info->image_uri);
+ info->image_uri);
gnome_desktop_thumbnail_factory_save_thumbnail (thumbnail_factory,
pixbuf,
@@ -545,7 +545,7 @@ thumbnail_thread_func (GTask *task,
else
{
DEBUG ("(Thumbnail Thread) Thumbnail failed: %s\n",
- info->image_uri);
+ info->image_uri);
gnome_desktop_thumbnail_factory_create_failed_thumbnail (thumbnail_factory,
info->image_uri,
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index c3e4daa8f..eb8605406 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -132,7 +132,7 @@ G_DEFINE_TYPE (NautilusToolbar, nautilus_toolbar, GTK_TYPE_HEADER_BAR);
static void nautilus_toolbar_set_window_slot_real (NautilusToolbar *self,
NautilusWindowSlot *slot);
-static void update_operations (NautilusToolbar *self);
+static void update_operations (NautilusToolbar *self);
static void
toolbar_update_appearance (NautilusToolbar *self)
@@ -196,7 +196,7 @@ fill_menu (NautilusToolbar *self,
GList *list;
list = back ? nautilus_window_slot_get_back_history (self->window_slot) :
- nautilus_window_slot_get_forward_history (self->window_slot);
+ nautilus_window_slot_get_forward_history (self->window_slot);
index = 0;
while (list != NULL)
@@ -1203,19 +1203,19 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
properties [PROP_WINDOW_SLOT] =
- g_param_spec_object ("window-slot",
- "Window slot currently active",
- "Window slot currently acive",
- NAUTILUS_TYPE_WINDOW_SLOT,
- (G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_object ("window-slot",
+ "Window slot currently active",
+ "Window slot currently acive",
+ NAUTILUS_TYPE_WINDOW_SLOT,
+ (G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
properties [PROP_SEARCHING] =
- g_param_spec_boolean ("searching",
- "Current view is searching",
- "Whether the current view is searching or not",
- FALSE,
- G_PARAM_READWRITE);
+ g_param_spec_boolean ("searching",
+ "Current view is searching",
+ "Whether the current view is searching or not",
+ FALSE,
+ G_PARAM_READWRITE);
g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
@@ -1446,7 +1446,6 @@ nautilus_toolbar_set_window_slot_real (NautilusToolbar *self,
G_CALLBACK (slot_on_templates_menu_changed), self);
g_signal_connect_swapped (self->window_slot, "notify::searching",
G_CALLBACK (toolbar_update_appearance), self);
-
}
children = gtk_container_get_children (GTK_CONTAINER (self->search_container));
diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
index 1256963a4..b68eb8c31 100644
--- a/src/nautilus-trash-bar.c
+++ b/src/nautilus-trash-bar.c
@@ -160,7 +160,7 @@ trash_bar_response_cb (GtkInfoBar *infobar,
{
NautilusTrashBar *bar;
GtkWidget *window;
-
+
bar = NAUTILUS_TRASH_BAR (infobar);
window = gtk_widget_get_toplevel (GTK_WIDGET (bar));
diff --git a/src/nautilus-trash-monitor.c b/src/nautilus-trash-monitor.c
index 356fa6041..2e2beaa65 100644
--- a/src/nautilus-trash-monitor.c
+++ b/src/nautilus-trash-monitor.c
@@ -174,8 +174,8 @@ schedule_update_info (NautilusTrashMonitor *trash_monitor)
trash_query_info_cb, g_object_ref (trash_monitor));
trash_monitor->timeout_id = g_timeout_add_seconds (UPDATE_RATE_SECONDS,
- schedule_update_info_cb,
- trash_monitor);
+ schedule_update_info_cb,
+ trash_monitor);
g_object_unref (location);
}
diff --git a/src/nautilus-ui-utilities.c b/src/nautilus-ui-utilities.c
index ab0db3e77..195f765f9 100644
--- a/src/nautilus-ui-utilities.c
+++ b/src/nautilus-ui-utilities.c
@@ -269,10 +269,10 @@ get_text_for_date_range (GPtrArray *date_range,
}
GtkDialog *
-show_dialog (const gchar *primary_text,
- const gchar *secondary_text,
- GtkWindow *parent,
- GtkMessageType type)
+show_dialog (const gchar *primary_text,
+ const gchar *secondary_text,
+ GtkWindow *parent,
+ GtkMessageType type)
{
GtkWidget *dialog;
diff --git a/src/nautilus-view-icon-controller.c b/src/nautilus-view-icon-controller.c
index 6dbdf1e3e..ab8b82426 100644
--- a/src/nautilus-view-icon-controller.c
+++ b/src/nautilus-view-icon-controller.c
@@ -220,8 +220,9 @@ real_begin_loading (NautilusFilesView *files_view)
{
NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view);
- /* TODO: This calls sort once, and update_context_menus calls update_actions which calls */
- /* the action again */
+ /* TODO: This calls sort once, and update_context_menus calls update_actions which calls
+ * the action again
+ */
update_sort_order_from_metadata_and_preferences (self);
/*TODO move this to the files view class begin_loading and hook up? */
@@ -909,7 +910,7 @@ real_select_first (NautilusFilesView *files_view)
static void
real_preview_selection_event (NautilusFilesView *files_view,
- GtkDirectionType direction)
+ GtkDirectionType direction)
{
NautilusViewIconController *self = NAUTILUS_VIEW_ICON_CONTROLLER (files_view);
GtkMovementStep step;
@@ -917,9 +918,9 @@ real_preview_selection_event (NautilusFilesView *files_view,
gboolean handled;
step = (direction == GTK_DIR_UP || direction == GTK_DIR_DOWN) ?
- GTK_MOVEMENT_DISPLAY_LINES : GTK_MOVEMENT_VISUAL_POSITIONS;
+ GTK_MOVEMENT_DISPLAY_LINES : GTK_MOVEMENT_VISUAL_POSITIONS;
count = (direction == GTK_DIR_RIGHT || direction == GTK_DIR_DOWN) ?
- 1 : -1;
+ 1 : -1;
g_signal_emit_by_name (self->view_ui, "move-cursor", step, count, &handled);
}
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index ffb69b684..0808496d2 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -171,10 +171,10 @@ static void trash_state_changed_cb (NautilusTrashMonitor *monitor,
static void update_search_information (NautilusWindowSlot *self);
static void real_set_extensions_background_menu (NautilusWindowSlot *self,
GMenuModel *menu);
-static GMenuModel* real_get_extensions_background_menu (NautilusWindowSlot *self);
+static GMenuModel *real_get_extensions_background_menu (NautilusWindowSlot *self);
static void real_set_templates_menu (NautilusWindowSlot *self,
GMenuModel *menu);
-static GMenuModel* real_get_templates_menu (NautilusWindowSlot *self);
+static GMenuModel *real_get_templates_menu (NautilusWindowSlot *self);
static void nautilus_window_slot_setup_extra_location_widgets (NautilusWindowSlot *self);
void
@@ -443,7 +443,7 @@ query_editor_activated_callback (NautilusQueryEditor *editor,
static void
query_editor_focus_view_callback (NautilusQueryEditor *editor,
- NautilusWindowSlot *self)
+ NautilusWindowSlot *self)
{
NautilusWindowSlotPrivate *priv;
@@ -843,7 +843,7 @@ nautilus_window_slot_set_property (GObject *object,
}
}
-static GMenuModel*
+static GMenuModel *
real_get_extensions_background_menu (NautilusWindowSlot *self)
{
NautilusWindowSlotPrivate *priv;
@@ -852,7 +852,7 @@ real_get_extensions_background_menu (NautilusWindowSlot *self)
return priv->extensions_background_menu;
}
-GMenuModel*
+GMenuModel *
nautilus_window_slot_get_extensions_background_menu (NautilusWindowSlot *self)
{
GMenuModel *menu = NULL;
@@ -862,7 +862,7 @@ nautilus_window_slot_get_extensions_background_menu (NautilusWindowSlot *self)
return menu;
}
-static GMenuModel*
+static GMenuModel *
real_get_templates_menu (NautilusWindowSlot *self)
{
NautilusWindowSlotPrivate *priv;
@@ -871,7 +871,7 @@ real_get_templates_menu (NautilusWindowSlot *self)
return priv->templates_menu;
}
-GMenuModel*
+GMenuModel *
nautilus_window_slot_get_templates_menu (NautilusWindowSlot *self)
{
GMenuModel *menu = NULL;
@@ -972,7 +972,7 @@ nautilus_window_slot_get_searching (NautilusWindowSlot *self)
return priv->searching;
}
-GList*
+GList *
nautilus_window_slot_get_selection (NautilusWindowSlot *self)
{
NautilusWindowSlotPrivate *priv;
@@ -1179,7 +1179,6 @@ update_search_information (NautilusWindowSlot *self)
gtk_revealer_set_reveal_child (priv->search_info_label_revealer,
label != NULL);
}
-
}
static void
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 056c75c7a..cf6b5205d 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1721,8 +1721,8 @@ nautilus_window_on_undo_changed (NautilusFileUndoManager *manager,
gtk_revealer_set_reveal_child (GTK_REVEALER (window->in_app_notification_undo),
TRUE);
window->in_app_notification_undo_timeout_id = g_timeout_add_seconds (NOTIFICATION_TIMEOUT,
- (GSourceFunc)
on_in_app_notification_undo_timeout,
- window);
+ (GSourceFunc)
on_in_app_notification_undo_timeout,
+ window);
}
}
else
@@ -1805,8 +1805,8 @@ nautilus_window_show_operation_notification (NautilusWindow *window,
gtk_revealer_set_reveal_child (GTK_REVEALER (window->notification_operation), TRUE);
window->notification_operation_timeout_id = g_timeout_add_seconds (NOTIFICATION_TIMEOUT,
- (GSourceFunc)
on_notification_operation_timeout,
- window);
+ (GSourceFunc)
on_notification_operation_timeout,
+ window);
}
}
@@ -2585,9 +2585,9 @@ wayland_window_handle_exported (GdkWindow *window,
#endif
gboolean
-nautilus_window_export_handle (NautilusWindow *window,
- NautilusWindowHandleExported callback,
- gpointer user_data)
+nautilus_window_export_handle (NautilusWindow *window,
+ NautilusWindowHandleExported callback,
+ gpointer user_data)
{
guint xid = get_window_xid (window);
@@ -2804,8 +2804,8 @@ nautilus_window_init (NautilusWindow *window)
window->tab_data_queue = g_queue_new ();
window->pad_controller = gtk_pad_controller_new (GTK_WINDOW (window),
- G_ACTION_GROUP (window),
- NULL);
+ G_ACTION_GROUP (window),
+ NULL);
gtk_pad_controller_set_action_entries (window->pad_controller,
pad_actions, G_N_ELEMENTS (pad_actions));
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
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
