From 52d960542b4d5fdf2bd06735d0dbf7934cf2ec12 Mon Sep 17 00:00:00 2001 From: Carlos Soriano Date: Mon, 29 Aug 2016 18:24:05 +0200 Subject: general: run uncrustify And make the style of Nautilus the same for all files. Hopefully we can fix all the style issues we can find in the next days, so expect a little of movement on this. https://bugzilla.gnome.org/show_bug.cgi?id=770564 --- src/nautilus-vfs-directory.c | 183 +++++++++++++++++++++---------------------- 1 file changed, 91 insertions(+), 92 deletions(-) (limited to 'src/nautilus-vfs-directory.c') diff --git a/src/nautilus-vfs-directory.c b/src/nautilus-vfs-directory.c index 778102b98..2f8f67cfb 100644 --- a/src/nautilus-vfs-directory.c +++ b/src/nautilus-vfs-directory.c @@ -1,24 +1,24 @@ /* - nautilus-vfs-directory.c: Subclass of NautilusDirectory to help implement the - virtual trash directory. - - Copyright (C) 1999, 2000 Eazel, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public - License along with this program; if not, see . - - Author: Darin Adler -*/ + * nautilus-vfs-directory.c: Subclass of NautilusDirectory to help implement the + * virtual trash directory. + * + * Copyright (C) 1999, 2000 Eazel, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, see . + * + * Author: Darin Adler + */ #include #include "nautilus-vfs-directory.h" @@ -31,122 +31,121 @@ G_DEFINE_TYPE (NautilusVFSDirectory, nautilus_vfs_directory, NAUTILUS_TYPE_DIREC static void nautilus_vfs_directory_init (NautilusVFSDirectory *directory) { - } static gboolean vfs_contains_file (NautilusDirectory *directory, - NautilusFile *file) + NautilusFile *file) { - g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); - g_assert (NAUTILUS_IS_FILE (file)); + g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); + g_assert (NAUTILUS_IS_FILE (file)); - return file->details->directory == directory; + return file->details->directory == directory; } static void -vfs_call_when_ready (NautilusDirectory *directory, - NautilusFileAttributes file_attributes, - gboolean wait_for_file_list, - NautilusDirectoryCallback callback, - gpointer callback_data) +vfs_call_when_ready (NautilusDirectory *directory, + NautilusFileAttributes file_attributes, + gboolean wait_for_file_list, + NautilusDirectoryCallback callback, + gpointer callback_data) { - g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); - - nautilus_directory_call_when_ready_internal - (directory, - NULL, - file_attributes, - wait_for_file_list, - callback, - NULL, - callback_data); + g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); + + nautilus_directory_call_when_ready_internal + (directory, + NULL, + file_attributes, + wait_for_file_list, + callback, + NULL, + callback_data); } static void -vfs_cancel_callback (NautilusDirectory *directory, - NautilusDirectoryCallback callback, - gpointer callback_data) +vfs_cancel_callback (NautilusDirectory *directory, + NautilusDirectoryCallback callback, + gpointer callback_data) { - g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); - - nautilus_directory_cancel_callback_internal - (directory, - NULL, - callback, - NULL, - callback_data); + g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); + + nautilus_directory_cancel_callback_internal + (directory, + NULL, + callback, + NULL, + callback_data); } static void -vfs_file_monitor_add (NautilusDirectory *directory, - gconstpointer client, - gboolean monitor_hidden_files, - NautilusFileAttributes file_attributes, - NautilusDirectoryCallback callback, - gpointer callback_data) +vfs_file_monitor_add (NautilusDirectory *directory, + gconstpointer client, + gboolean monitor_hidden_files, + NautilusFileAttributes file_attributes, + NautilusDirectoryCallback callback, + gpointer callback_data) { - g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); - g_assert (client != NULL); - - nautilus_directory_monitor_add_internal - (directory, NULL, - client, - monitor_hidden_files, - file_attributes, - callback, callback_data); + g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); + g_assert (client != NULL); + + nautilus_directory_monitor_add_internal + (directory, NULL, + client, + monitor_hidden_files, + file_attributes, + callback, callback_data); } static void vfs_file_monitor_remove (NautilusDirectory *directory, - gconstpointer client) + gconstpointer client) { - g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); - g_assert (client != NULL); - - nautilus_directory_monitor_remove_internal (directory, NULL, client); + g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); + g_assert (client != NULL); + + nautilus_directory_monitor_remove_internal (directory, NULL, client); } static void vfs_force_reload (NautilusDirectory *directory) { - NautilusFileAttributes all_attributes; + NautilusFileAttributes all_attributes; - g_assert (NAUTILUS_IS_DIRECTORY (directory)); + g_assert (NAUTILUS_IS_DIRECTORY (directory)); - all_attributes = nautilus_file_get_all_attributes (); - nautilus_directory_force_reload_internal (directory, - all_attributes); + all_attributes = nautilus_file_get_all_attributes (); + nautilus_directory_force_reload_internal (directory, + all_attributes); } static gboolean vfs_are_all_files_seen (NautilusDirectory *directory) { - g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); - - return directory->details->directory_loaded; + g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); + + return directory->details->directory_loaded; } static gboolean vfs_is_not_empty (NautilusDirectory *directory) { - g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); - g_assert (nautilus_directory_is_anyone_monitoring_file_list (directory)); + g_assert (NAUTILUS_IS_VFS_DIRECTORY (directory)); + g_assert (nautilus_directory_is_anyone_monitoring_file_list (directory)); - return directory->details->file_list != NULL; + return directory->details->file_list != NULL; } static void nautilus_vfs_directory_class_init (NautilusVFSDirectoryClass *klass) { - NautilusDirectoryClass *directory_class = NAUTILUS_DIRECTORY_CLASS (klass); - - directory_class->contains_file = vfs_contains_file; - directory_class->call_when_ready = vfs_call_when_ready; - directory_class->cancel_callback = vfs_cancel_callback; - directory_class->file_monitor_add = vfs_file_monitor_add; - directory_class->file_monitor_remove = vfs_file_monitor_remove; - directory_class->force_reload = vfs_force_reload; - directory_class->are_all_files_seen = vfs_are_all_files_seen; - directory_class->is_not_empty = vfs_is_not_empty; + NautilusDirectoryClass *directory_class = NAUTILUS_DIRECTORY_CLASS (klass); + + directory_class->contains_file = vfs_contains_file; + directory_class->call_when_ready = vfs_call_when_ready; + directory_class->cancel_callback = vfs_cancel_callback; + directory_class->file_monitor_add = vfs_file_monitor_add; + directory_class->file_monitor_remove = vfs_file_monitor_remove; + directory_class->force_reload = vfs_force_reload; + directory_class->are_all_files_seen = vfs_are_all_files_seen; + directory_class->is_not_empty = vfs_is_not_empty; } -- cgit v1.2.1