From e0e185b1790f5a670cdd1292bac75ad1c44e4996 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sun, 16 Jun 2019 13:37:09 +0200 Subject: Remove trailing whitespaces find . -regextype posix-extended -regex '.*\.(c|h|ac|txt|xml)' -exec sed --in-place 's/[[:space:]]\+$//' {} \+ --- src/caja-application.c | 70 +++++++++++++++++------------------ src/caja-connect-server-dialog.c | 10 ++--- src/caja-file-management-properties.c | 22 +++++------ src/caja-main.c | 4 +- src/caja-navigation-window-pane.c | 8 ++-- src/caja-navigation-window-ui.xml | 2 +- src/caja-navigation-window.c | 2 +- src/caja-pathbar.c | 4 +- src/caja-places-sidebar.c | 8 ++-- src/caja-window-manage-views.c | 2 +- src/caja-window-menus.c | 2 +- src/caja-window.c | 2 +- src/caja-zoom-control.c | 10 ++--- src/file-manager/fm-directory-view.c | 2 +- src/file-manager/fm-tree-model.c | 2 +- 15 files changed, 75 insertions(+), 75 deletions(-) (limited to 'src') diff --git a/src/caja-application.c b/src/caja-application.c index 3b344b66..ff3e6679 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -179,7 +179,7 @@ smclient_save_state_cb (EggSMClient *client, char *data; data = caja_application_get_session_data (application); - if (data != NULL) + if (data != NULL) { g_key_file_set_string (state_file, "Caja", @@ -223,9 +223,9 @@ caja_empty_callback_to_ensure_read() { static void open_window (CajaApplication *application, - GFile *location, - GdkScreen *screen, - const char *geometry, + GFile *location, + GdkScreen *screen, + const char *geometry, gboolean browser_window) { CajaApplication *self = CAJA_APPLICATION (application); @@ -271,10 +271,10 @@ open_window (CajaApplication *application, static void open_tabs (CajaApplication *application, - GFile **locations, - guint n_files, - GdkScreen *screen, - const char *geometry, + GFile **locations, + guint n_files, + GdkScreen *screen, + const char *geometry, gboolean browser_window) { CajaApplication *self = CAJA_APPLICATION (application); @@ -283,7 +283,7 @@ open_tabs (CajaApplication *application, /* monitor the preference to use browser or spatial windows */ /* connect before trying to read or this preference won't be read by root or after change */ - g_signal_connect_swapped (caja_preferences, + g_signal_connect_swapped (caja_preferences, "changed::"CAJA_PREFERENCES_ALWAYS_USE_BROWSER, G_CALLBACK (caja_empty_callback_to_ensure_read), self); @@ -305,7 +305,7 @@ open_tabs (CajaApplication *application, caja_window_go_to (window, locations[0]); g_free (uri); for (int i = 1; i< n_files;i++) { - /* open tabs in reverse order because each + /* open tabs in reverse order because each * tab is opened before the previous one */ guint tab = n_files-i; uri = g_file_get_uri (locations[tab]); @@ -345,9 +345,9 @@ open_windows (CajaApplication *application, /* Open one window with one tab at each requested location */ open_tabs (application, files, n_files, screen, geometry, browser_window); } else { - /* Open windows at each requested location. */ + /* Open windows at each requested location. */ i = 0; - while (i < n_files) { + while (i < n_files) { open_window (application, files[i], screen, geometry, browser_window); i++ ; } @@ -416,7 +416,7 @@ caja_application_open_location (CajaApplication *application, } caja_window_slot_open_location_full (caja_window_get_active_slot (window), location, - open_in_tabs, CAJA_WINDOW_OPEN_FLAG_NEW_WINDOW, + open_in_tabs, CAJA_WINDOW_OPEN_FLAG_NEW_WINDOW, sel_list, NULL, NULL); if (sel_list != NULL) { @@ -472,7 +472,7 @@ caja_application_finalize (GObject *object) { g_bus_unwatch_name (application->ss_watch_id); } - + if (application->volume_queue != NULL) { g_list_free_full (application->volume_queue, g_object_unref); @@ -1108,7 +1108,7 @@ check_screen_lock_and_mount (CajaApplication *application, } else { /* mount it immediately */ caja_file_operations_mount_volume (NULL, volume, TRUE); - } + } } static void @@ -1236,13 +1236,13 @@ mount_added_callback (GVolumeMonitor *monitor, CajaDirectory *directory; GFile *root; gchar *uri; - + root = g_mount_get_root (mount); uri = g_file_get_uri (root); g_debug ("Added mount at uri %s", uri); g_free (uri); - + directory = caja_directory_get_existing (root); g_object_unref (root); if (directory != NULL) { @@ -1455,10 +1455,10 @@ caja_application_get_session_data (CajaApplication *self) } win_node = xmlNewChild (root_node, NULL, "window", NULL); - + xmlNewProp (win_node, "location", tmp); g_free (tmp); - + xmlNewProp (win_node, "type", CAJA_IS_NAVIGATION_WINDOW (window) ? "navigation" : "spatial"); if (CAJA_IS_NAVIGATION_WINDOW (window)) { /* spatial windows store their state as file metadata */ @@ -1510,7 +1510,7 @@ caja_application_get_session_data (CajaApplication *self) xmlSaveFlush (ctx) < 0) { g_message ("failed to save session"); } - + xmlSaveClose(ctx); data = g_strndup (buffer->content, buffer->use); xmlBufferFree (buffer); @@ -1551,7 +1551,7 @@ caja_application_load_session (CajaApplication *application) } bail = TRUE; - + doc = xmlReadMemory (data, strlen (data), NULL, "UTF-8", 0); if (doc != NULL && (root_node = xmlDocGetRootElement (doc)) != NULL) { @@ -1738,7 +1738,7 @@ caja_application_load_session (CajaApplication *application) else if (g_strcmp0 (type, "spatial") == 0) { location = g_file_new_for_uri (location_uri); - window = caja_application_get_spatial_window (application, NULL, NULL, + window = caja_application_get_spatial_window (application, NULL, NULL, location, gdk_screen_get_default (), NULL); @@ -1864,7 +1864,7 @@ caja_application_local_command_line (GApplication *application, const GOptionEntry options[] = { #ifndef CAJA_OMIT_SELF_CHECK - { "check", 'c', 0, G_OPTION_ARG_NONE, &perform_self_check, + { "check", 'c', 0, G_OPTION_ARG_NONE, &perform_self_check, N_("Perform a quick set of self-check tests."), NULL }, #endif { "version", '\0', 0, G_OPTION_ARG_NONE, &version, @@ -1877,11 +1877,11 @@ caja_application_local_command_line (GApplication *application, N_("Do not manage the desktop (ignore the preference set in the preferences dialog)."), NULL }, { "force-desktop", '\0', 0, G_OPTION_ARG_NONE, &self->priv->force_desktop, N_("Manage the desktop regardless of set preferences or environment (on new startup only)"), NULL }, - { "tabs", 't', 0, G_OPTION_ARG_NONE, &open_in_tabs, + { "tabs", 't', 0, G_OPTION_ARG_NONE, &open_in_tabs, N_("Open URIs in tabs."), NULL }, - { "browser", '\0', 0, G_OPTION_ARG_NONE, &browser_window, + { "browser", '\0', 0, G_OPTION_ARG_NONE, &browser_window, N_("Open a browser window."), NULL }, - { "quit", 'q', 0, G_OPTION_ARG_NONE, &kill_shell, + { "quit", 'q', 0, G_OPTION_ARG_NONE, &kill_shell, N_("Quit Caja."), NULL }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &remaining, NULL, N_("[URI...]") }, @@ -2021,7 +2021,7 @@ caja_application_local_command_line (GApplication *application, out: g_option_context_free (context); - return TRUE; + return TRUE; } @@ -2095,7 +2095,7 @@ init_desktop (CajaApplication *self) self); } -static gboolean +static gboolean caja_application_save_accel_map (gpointer data) { if (save_of_accel_map_requested) { @@ -2111,14 +2111,14 @@ caja_application_save_accel_map (gpointer data) return FALSE; } -static void +static void queue_accel_map_save_callback (GtkAccelMap *object, gchar *accel_path, guint accel_key, GdkModifierType accel_mods, gpointer user_data) { if (!save_of_accel_map_requested) { save_of_accel_map_requested = TRUE; - g_timeout_add_seconds (CAJA_ACCEL_MAP_SAVE_DELAY, + g_timeout_add_seconds (CAJA_ACCEL_MAP_SAVE_DELAY, caja_application_save_accel_map, NULL); } } @@ -2187,15 +2187,15 @@ caja_application_startup (GApplication *app) /* initialize theming */ init_icons_and_styles (); init_gtk_accels (); - + /* initialize caja modules */ caja_module_setup (); /* attach menu-provider module callback */ menu_provider_init_callback (); - + /* Initialize notifications for eject operations */ - notify_init (GETTEXT_PACKAGE); + notify_init (GETTEXT_PACKAGE); /* Watch for unmounts so we can close open windows */ /* TODO-gio: This should be using the UNMOUNTED feature of GFileMonitor instead */ @@ -2226,7 +2226,7 @@ caja_application_startup (GApplication *app) init_desktop (self); /* exit_with_last_window is already set to TRUE, and we need to keep that value - * on other desktops, running from the command line, or when running caja as root. + * on other desktops, running from the command line, or when running caja as root. * Otherwise, we read the value from the configuration. */ @@ -2234,7 +2234,7 @@ caja_application_startup (GApplication *app) { GApplication *instance; - exit_with_last_window = g_settings_get_boolean (caja_preferences, + exit_with_last_window = g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_EXIT_WITH_LAST_WINDOW); /*Keep this inside the running as mate/not as root block */ /*So other desktop don't get unkillable caja instances holding open */ diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c index c2de6284..9caaced5 100644 --- a/src/caja-connect-server-dialog.c +++ b/src/caja-connect-server-dialog.c @@ -176,7 +176,7 @@ connect_dialog_set_connecting (CajaConnectServerDialog *dialog) gint width, height; connect_dialog_restore_info_bar (dialog, GTK_MESSAGE_INFO); - gtk_widget_show (dialog->details->info_bar); + gtk_widget_show (dialog->details->info_bar); content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (dialog->details->info_bar)); @@ -216,7 +216,7 @@ connect_dialog_gvfs_error (CajaConnectServerDialog *dialog) image = gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 6); gtk_widget_show (image); - + label = gtk_label_new (_("Can't load the supported server method list.\n" "Please check your GVfs installation.")); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6); @@ -244,7 +244,7 @@ iconized_entry_restore (gpointer data, g_signal_handlers_disconnect_by_func (entry, iconized_entry_changed_cb, - dialog); + dialog); } static void @@ -311,7 +311,7 @@ connect_dialog_set_info_bar_error (CajaConnectServerDialog *dialog, g_free (str); - break; + break; case G_IO_ERROR_FAILED: default: label = gtk_label_new (error->message); @@ -1222,7 +1222,7 @@ caja_connect_server_dialog_fill_details_async (CajaConnectServerDialog *self, g_mount_operation_set_password (G_MOUNT_OPERATION (operation), str); set_flags ^= G_ASK_PASSWORD_NEED_PASSWORD; - + if (flags & G_ASK_PASSWORD_SAVING_SUPPORTED && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->details->remember_checkbox))) { g_mount_operation_set_password_save (G_MOUNT_OPERATION (operation), diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index b3e9bcc1..ce823a42 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -728,22 +728,22 @@ extension_state_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer GtkTreeModel *model; gboolean new_state; Extension *ext; - + path = gtk_tree_path_new_from_string (path_str); model = gtk_tree_view_get_model (GTK_TREE_VIEW (data)); - + g_object_get (G_OBJECT (cell), "active", &new_state, NULL); gtk_tree_model_get_iter_from_string (model, &iter, path_str); - + new_state ^= 1; if (&iter != NULL) { gtk_tree_model_get (model, &iter, EXT_STRUCT_COLUMN, &ext, -1); - + if (caja_extension_set_state (ext, new_state)) { - gtk_list_store_set (GTK_LIST_STORE (model), &iter, + gtk_list_store_set (GTK_LIST_STORE (model), &iter, EXT_STATE_COLUMN, new_state, -1); } } @@ -874,7 +874,7 @@ caja_file_management_properties_dialog_setup_extension_page (GtkBuilder *builder GdkPixbuf *ext_pixbuf_icon; GtkButton *about_button, *configure_button; gchar *ext_text_info; - + GList *extensions; int i; @@ -884,16 +884,16 @@ caja_file_management_properties_dialog_setup_extension_page (GtkBuilder *builder gtk_builder_get_object (builder, "extension_view")); store = GTK_LIST_STORE ( gtk_builder_get_object (builder, "extension_store")); - + toggle = GTK_CELL_RENDERER_TOGGLE ( gtk_builder_get_object (builder, "extension_toggle")); g_object_set (toggle, "xpad", 6, NULL); - + g_signal_connect (toggle, "toggled", G_CALLBACK (extension_state_toggled), view); - + icon_theme = gtk_icon_theme_get_default(); - + for (i = 0; i < g_list_length (extensions); i++) { Extension* ext = EXTENSION (g_list_nth_data (extensions, i)); @@ -926,7 +926,7 @@ caja_file_management_properties_dialog_setup_extension_page (GtkBuilder *builder gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, EXT_STATE_COLUMN, ext->state, - EXT_ICON_COLUMN, ext_pixbuf_icon, + EXT_ICON_COLUMN, ext_pixbuf_icon, EXT_INFO_COLUMN, ext_text_info, EXT_STRUCT_COLUMN, ext, -1); diff --git a/src/caja-main.c b/src/caja-main.c index 48b575df..1fb7e360 100644 --- a/src/caja-main.c +++ b/src/caja-main.c @@ -242,7 +242,7 @@ main (int argc, char *argv[]) if (g_getenv ("CAJA_DEBUG") != NULL) { eel_make_warnings_and_criticals_stop_in_debugger (); } - + /* Initialize gettext support */ bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -255,7 +255,7 @@ main (int argc, char *argv[]) if (g_file_test (DATADIR "/applications/caja.desktop", G_FILE_TEST_EXISTS)) { egg_set_desktop_file (DATADIR "/applications/caja.desktop"); } - + #ifdef HAVE_EXEMPI xmp_init(); #endif diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c index 22b21233..b5e4bb6f 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -62,7 +62,7 @@ real_set_active (CajaWindowPane *pane, gboolean is_active) /* navigation bar (manual entry) */ caja_location_bar_set_active (CAJA_LOCATION_BAR (nav_pane->navigation_bar), is_active); - + /* location button */ gtk_widget_set_sensitive (gtk_bin_get_child (GTK_BIN (nav_pane->location_button)), is_active); } @@ -490,7 +490,7 @@ notebook_switch_page_cb (GtkNotebook *notebook, g_assert (slot != NULL); caja_window_set_active_slot (slot->pane->window, slot); - + caja_window_slot_update_icon (slot); return FALSE; @@ -642,7 +642,7 @@ caja_navigation_window_pane_always_use_location_entry (CajaNavigationWindowPane { caja_navigation_window_pane_set_bar_mode (pane, CAJA_BAR_PATH); } - + g_signal_handlers_block_by_func (pane->location_button, G_CALLBACK (location_button_toggled_cb), pane); @@ -808,7 +808,7 @@ caja_navigation_window_pane_set_bar_mode (CajaNavigationWindowPane *pane, gtk_widget_hide (pane->navigation_bar); break; } - + if (mode == CAJA_BAR_NAVIGATION || mode == CAJA_BAR_PATH) { use_entry = (mode == CAJA_BAR_NAVIGATION); diff --git a/src/caja-navigation-window-ui.xml b/src/caja-navigation-window-ui.xml index 76b34cb8..e9da1a56 100644 --- a/src/caja-navigation-window-ui.xml +++ b/src/caja-navigation-window-ui.xml @@ -13,7 +13,7 @@ - + diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index c73966b1..b64bb040 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -144,7 +144,7 @@ caja_navigation_window_init (CajaNavigationWindow *window) gtk_paned_pack2 (GTK_PANED (window->details->content_paned), vbox, TRUE, FALSE); gtk_widget_show (vbox); - + hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0); gtk_widget_show (hpaned); diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c index 9ee38230..131a8b1e 100644 --- a/src/caja-pathbar.c +++ b/src/caja-pathbar.c @@ -1469,7 +1469,7 @@ set_label_padding_size (ButtonData *button_data) gint width, height, bold_width, bold_height; gint pad_left, pad_right; gchar *markup; - + layout = gtk_widget_create_pango_layout (button_data->label, dir_name); pango_layout_get_pixel_size (layout, &width, &height); @@ -1839,7 +1839,7 @@ button_data_file_changed (CajaFile *file, * will get the event too and call us back. */ current_location = caja_file_get_location (current_button_data->file); - + if (g_file_has_prefix (location, current_location)) { /* remove this and the following buttons */ diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c index 22ac28b8..a86b94f3 100644 --- a/src/caja-places-sidebar.c +++ b/src/caja-places-sidebar.c @@ -293,7 +293,7 @@ add_heading (CajaPlacesSidebar *sidebar, gtk_list_store_append (sidebar->store, &iter); gtk_list_store_set (sidebar->store, &iter, PLACES_SIDEBAR_COLUMN_ROW_TYPE, PLACES_HEADING, - PLACES_SIDEBAR_COLUMN_SECTION_TYPE, section_type, + PLACES_SIDEBAR_COLUMN_SECTION_TYPE, section_type, PLACES_SIDEBAR_COLUMN_HEADING_TEXT, title, PLACES_SIDEBAR_COLUMN_EJECT, FALSE, PLACES_SIDEBAR_COLUMN_NO_EJECT, TRUE, @@ -563,7 +563,7 @@ update_places (CajaPlacesSidebar *sidebar) location, mount_uri, last_uri, &last_iter, &select_path); - + /* XDG directories */ xdg_dirs = NULL; for (index = 0; index < G_USER_N_DIRECTORIES; index++) { @@ -891,7 +891,7 @@ update_places (CajaPlacesSidebar *sidebar) compare_for_selection (sidebar, location, mount_uri, last_uri, &last_iter, &select_path); - + g_free (location); if (select_path != NULL) { @@ -2259,7 +2259,7 @@ volume_eject_cb (GObject *source_object, NULL); g_free (primary); } - g_error_free (error); + g_error_free (error); } else { diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c index 22f801d4..0c81d628 100644 --- a/src/caja-window-manage-views.c +++ b/src/caja-window-manage-views.c @@ -1308,7 +1308,7 @@ got_file_info_for_view_selection_callback (CajaFile *file, */ /* if this is the only window, we don't want to quit, so we redirect it to home */ app = CAJA_APPLICATION (g_application_get_default ()); - + if (g_list_length (gtk_application_get_windows (GTK_APPLICATION (app))) == 1) { /* the user could have typed in a home directory that doesn't exist, diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c index 7eeb93bf..c444be6e 100644 --- a/src/caja-window-menus.c +++ b/src/caja-window-menus.c @@ -1006,7 +1006,7 @@ caja_window_initialize_menus (CajaWindow *window) g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_SHOW_BACKUP_FILES, G_CALLBACK(show_backup_files_preference_callback), window); - + window->details->ui_manager = gtk_ui_manager_new (); ui_manager = window->details->ui_manager; gtk_window_add_accel_group (GTK_WINDOW (window), diff --git a/src/caja-window.c b/src/caja-window.c index 3cfa1952..32b349cc 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -2059,7 +2059,7 @@ caja_window_info_iface_init (CajaWindowInfoIface *iface) iface->get_selection = caja_window_get_selection; iface->get_hidden_files_mode = caja_window_get_hidden_files_mode; iface->set_hidden_files_mode = caja_window_set_hidden_files_mode; - + iface->get_backup_files_mode = caja_window_get_backup_files_mode; iface->set_backup_files_mode = caja_window_set_backup_files_mode; diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index ebe0e31b..125e04c3 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -651,7 +651,7 @@ caja_zoom_control_class_init (CajaZoomControlClass *class) binding_set = gtk_binding_set_by_class (class); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_KP_Subtract, 0, + GDK_KEY_KP_Subtract, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN); @@ -662,21 +662,21 @@ caja_zoom_control_class_init (CajaZoomControlClass *class) GTK_SCROLL_STEP_DOWN); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_KP_Equal, 0, + GDK_KEY_KP_Equal, 0, "zoom_to_default", 0); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_KP_Equal, 0, + GDK_KEY_KP_Equal, 0, "zoom_to_default", 0); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_KP_Add, 0, + GDK_KEY_KP_Add, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); gtk_binding_entry_add_signal (binding_set, - GDK_KEY_plus, 0, + GDK_KEY_plus, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 41ea3f16..5827410b 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -239,7 +239,7 @@ struct FMDirectoryViewDetails gboolean show_foreign_files; gboolean show_hidden_files; gboolean ignore_hidden_file_preferences; - + gboolean show_backup_files; gboolean batching_selection_level; diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c index 6a0768bd..e95a6079 100644 --- a/src/file-manager/fm-tree-model.c +++ b/src/file-manager/fm-tree-model.c @@ -105,7 +105,7 @@ struct FMTreeModelDetails gboolean show_hidden_files; gboolean show_backup_files; gboolean show_only_directories; - + GList *highlighted_files; }; -- cgit v1.2.1