diff options
34 files changed, 228 insertions, 232 deletions
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c index d44c1781b..d93087561 100644 --- a/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c @@ -95,4 +95,3 @@ eel_gtk_menu_insert_separator (GtkMenu *menu, return GTK_MENU_ITEM (menu_item); } - diff --git a/libnautilus-extension/nautilus-file-info.c b/libnautilus-extension/nautilus-file-info.c index db02a0b11..2a4c9d478 100644 --- a/libnautilus-extension/nautilus-file-info.c +++ b/libnautilus-extension/nautilus-file-info.c @@ -24,7 +24,7 @@ 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); /** * SECTION:nautilus-file-info diff --git a/src/nautilus-application.c b/src/nautilus-application.c index ea15a8ae0..3ce6eb9ae 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -936,7 +936,7 @@ const GOptionEntry options[] = /* dummy, only for compatibility reasons */ { "browser", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, NULL, NULL, NULL }, - /* ditto */ + /* ditto */ { "geometry", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, NULL, N_("Create the initial window with the given geometry."), N_("GEOMETRY") }, { "version", '\0', 0, G_OPTION_ARG_NONE, NULL, diff --git a/src/nautilus-batch-rename-utilities.c b/src/nautilus-batch-rename-utilities.c index ae078e6f7..da0f32113 100644 --- a/src/nautilus-batch-rename-utilities.c +++ b/src/nautilus-batch-rename-utilities.c @@ -355,7 +355,7 @@ batch_rename_format (NautilusFile *file, gchar *metadata; file_name = nautilus_file_get_display_name (file); - if (!nautilus_file_is_directory(file)) + if (!nautilus_file_is_directory (file)) { extension = nautilus_file_get_extension (file); } @@ -435,7 +435,7 @@ batch_rename_format (NautilusFile *file, { case ORIGINAL_FILE_NAME: { - if (nautilus_file_is_directory(file)) + if (nautilus_file_is_directory (file)) { new_name = g_string_append (new_name, file_name); } diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c index 9a0073a00..718082051 100644 --- a/src/nautilus-canvas-item.c +++ b/src/nautilus-canvas-item.c @@ -1485,7 +1485,7 @@ create_label_layout (NautilusCanvasItem *item, { str = g_string_append_c (str, *p); - if (*p == '_' || *p == '-' || (*p == '.' && !g_ascii_isdigit(*(p+1)))) + if (*p == '_' || *p == '-' || (*p == '.' && !g_ascii_isdigit (*(p + 1)))) { /* Ensure that we allow to break after '_' or '.' characters, * if they are not followed by a number */ diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c index ab5673a39..161206768 100644 --- a/src/nautilus-canvas-view.c +++ b/src/nautilus-canvas-view.c @@ -1366,7 +1366,7 @@ canvas_container_longpress_gesture_pressed_callback (GtkGestureLongPress *gestur else { nautilus_files_view_pop_up_background_context_menu (NAUTILUS_FILES_VIEW (view), - event); + event); } } diff --git a/src/nautilus-column-chooser.c b/src/nautilus-column-chooser.c index ba05b5924..43d95c6bc 100644 --- a/src/nautilus-column-chooser.c +++ b/src/nautilus-column-chooser.c @@ -132,7 +132,6 @@ nautilus_column_chooser_class_init (NautilusColumnChooserClass *chooser_class) NAUTILUS_TYPE_FILE, G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE)); - } static void diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c index 62745ceb2..8a16da168 100644 --- a/src/nautilus-directory-async.c +++ b/src/nautilus-directory-async.c @@ -3547,7 +3547,7 @@ is_link_trusted (NautilusFile *file, { GFile *location; gboolean res; - g_autofree gchar* trusted = NULL; + g_autofree gchar *trusted = NULL; if (!is_launcher) { diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c index 6429bbd33..eb5c8deec 100644 --- a/src/nautilus-file-operations.c +++ b/src/nautilus-file-operations.c @@ -1203,10 +1203,10 @@ do_run_simple_dialog (gpointer _data) button = gtk_dialog_add_button (GTK_DIALOG (dialog), button_title, response_id); gtk_dialog_set_default_response (GTK_DIALOG (dialog), response_id); - if (g_strcmp0(button_title, DELETE) == 0) + if (g_strcmp0 (button_title, DELETE) == 0) { - gtk_style_context_add_class(gtk_widget_get_style_context(button), - "destructive-action"); + gtk_style_context_add_class (gtk_widget_get_style_context (button), + "destructive-action"); } } @@ -2262,9 +2262,9 @@ skip: } static void -source_info_remove_file_from_count (GFile *file, - CommonJob *job, - SourceInfo *source_info) +source_info_remove_file_from_count (GFile *file, + CommonJob *job, + SourceInfo *source_info) { g_autoptr (GFileInfo) file_info = NULL; @@ -7949,10 +7949,10 @@ extract_job_on_progress (AutoarExtractor *extractor, details = g_strdup_printf (ngettext ("%s / %s \xE2\x80\x94 %s left (%s/sec)", "%s / %s \xE2\x80\x94 %s left (%s/sec)", seconds_count_format_time_units (remaining_time)), - formatted_size_job_completed_size, - formatted_size_total_compressed_size, - formatted_time, - formatted_size_transfer_rate); + formatted_size_job_completed_size, + formatted_size_total_compressed_size, + formatted_time, + formatted_size_transfer_rate); } nautilus_progress_info_take_details (common->progress, details); @@ -8049,20 +8049,20 @@ extract_job_on_scanned (AutoarExtractor *extractor, /* FIXME: G_MAXUINT64 is the value used by autoar when the file size cannot * be determined. Ideally an API should be used instead. */ - if (total_size != G_MAXUINT64 && total_size > free_size ) + if (total_size != G_MAXUINT64 && total_size > free_size) { - nautilus_progress_info_take_status (extract_job->common.progress, - g_strdup_printf (_("Error extracting “%s”"), - basename)); - run_error (&extract_job->common, - g_strdup_printf (_("Not enough free space to extract %s"),basename), - NULL, - NULL, - FALSE, - CANCEL, - NULL); + nautilus_progress_info_take_status (extract_job->common.progress, + g_strdup_printf (_("Error extracting “%s”"), + basename)); + run_error (&extract_job->common, + g_strdup_printf (_("Not enough free space to extract %s"), basename), + NULL, + NULL, + FALSE, + CANCEL, + NULL); - abort_job ((CommonJob *) extract_job); + abort_job ((CommonJob *) extract_job); } } @@ -8081,7 +8081,7 @@ report_extract_final_progress (ExtractJob *extract_job, if (total_files == 1) { GFile *source_file; - g_autofree gchar * basename = NULL; + g_autofree gchar *basename = NULL; source_file = G_FILE (extract_job->source_files->data); basename = get_basename (source_file); diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c index a2b108445..5e24a12c2 100644 --- a/src/nautilus-file-undo-operations.c +++ b/src/nautilus-file-undo-operations.c @@ -1319,10 +1319,10 @@ enum static void starred_strings_func (NautilusFileUndoInfo *info, - gchar **undo_label, - gchar **undo_description, - gchar **redo_label, - gchar **redo_description) + gchar **undo_label, + gchar **undo_description, + gchar **redo_label, + gchar **redo_description) { NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info); @@ -1356,8 +1356,8 @@ starred_strings_func (NautilusFileUndoInfo *info, static void on_undo_starred_tags_updated (GObject *object, - GAsyncResult *res, - gpointer user_data) + GAsyncResult *res, + gpointer user_data) { GTask *task; NautilusFileUndoInfo *undo_info; @@ -1372,7 +1372,7 @@ on_undo_starred_tags_updated (GObject *object, static void starred_redo_func (NautilusFileUndoInfo *info, - GtkWindow *parent_window) + GtkWindow *parent_window) { NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info); NautilusTagManager *tag_manager; @@ -1389,7 +1389,6 @@ starred_redo_func (NautilusFileUndoInfo *info, } else { - nautilus_tag_manager_unstar_files (tag_manager, G_OBJECT (info), self->priv->files, @@ -1400,7 +1399,7 @@ starred_redo_func (NautilusFileUndoInfo *info, static void starred_undo_func (NautilusFileUndoInfo *info, - GtkWindow *parent_window) + GtkWindow *parent_window) { NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info); NautilusTagManager *tag_manager; @@ -1427,9 +1426,9 @@ starred_undo_func (NautilusFileUndoInfo *info, static void nautilus_file_undo_info_starred_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) + guint prop_id, + const GValue *value, + GParamSpec *pspec) { NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (object); @@ -1501,7 +1500,6 @@ nautilus_file_undo_info_starred_class_init (NautilusFileUndoInfoFavoritesClass * FALSE, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - } GList * @@ -1517,8 +1515,8 @@ nautilus_file_undo_info_starred_is_starred (NautilusFileUndoInfoFavorites *self) } NautilusFileUndoInfo * -nautilus_file_undo_info_starred_new (GList *files, - gboolean starred) +nautilus_file_undo_info_starred_new (GList *files, + gboolean starred) { NautilusFileUndoInfoFavorites *self; diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c index e2c1d49ea..0a4a4ee59 100644 --- a/src/nautilus-file-utilities.c +++ b/src/nautilus-file-utilities.c @@ -557,7 +557,9 @@ nautilus_is_starred_directory (GFile *dir) uri = g_file_get_uri (dir); if (eel_uri_is_starred (uri)) + { return TRUE; + } return FALSE; } @@ -1436,4 +1438,3 @@ nautilus_uri_to_native_uri (const gchar *uri) return NULL; } - diff --git a/src/nautilus-file.c b/src/nautilus-file.c index acee3e531..61a3fd904 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -3572,7 +3572,7 @@ compare_by_type (NautilusFile *file_1, static int compare_by_starred (NautilusFile *file_1, - NautilusFile *file_2) + NautilusFile *file_2) { NautilusTagManager *tag_manager; g_autofree gchar *uri_1 = NULL; @@ -3586,9 +3586,9 @@ compare_by_starred (NautilusFile *file_1, uri_2 = nautilus_file_get_uri (file_2); file_1_is_starred = nautilus_tag_manager_file_is_starred (tag_manager, - uri_1); + uri_1); file_2_is_starred = nautilus_tag_manager_file_is_starred (tag_manager, - uri_2); + uri_2); if (!!file_1_is_starred == !!file_2_is_starred) { return 0; @@ -4529,9 +4529,13 @@ char * nautilus_file_get_display_name (NautilusFile *file) { if (nautilus_file_is_other_locations (file)) + { return g_strdup (_("Other Locations")); + } if (nautilus_file_is_starred_location (file)) + { return g_strdup (_("Starred")); + } return g_strdup (nautilus_file_peek_display_name (file)); } @@ -6115,7 +6119,7 @@ nautilus_file_set_search_fts_snippet (NautilusFile *file, file->details->fts_snippet = g_strdup (fts_snippet); } -const gchar* +const gchar * nautilus_file_get_search_fts_snippet (NautilusFile *file) { return file->details->fts_snippet; @@ -7770,7 +7774,8 @@ 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));; + return nautilus_file_info_get_file_type (NAUTILUS_FILE_INFO (file)); + ; } /** @@ -9210,8 +9215,9 @@ thumbnail_limit_changed_callback (gpointer user_data) cached_thumbnail_limit = g_settings_get_uint64 (nautilus_preferences, NAUTILUS_PREFERENCES_FILE_THUMBNAIL_LIMIT); - //Converts the obtained limit in MB to bytes - cached_thumbnail_limit *= MEGA_TO_BASE_RATE;; + /*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 08b2f2f7d..f4cc4a791 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -2003,7 +2003,7 @@ new_folder_dialog_controller_on_name_accepted (NautilusFileNameWidgetController new_folder_done, data); g_clear_object (&priv->new_folder_controller); - + /* After the dialog is destroyed the focus, is probably in the menu item * that created the dialog, but we want the focus to be in the newly created * folder. @@ -3632,7 +3632,6 @@ debuting_files_add_files_callback (NautilusFilesView *view, { nautilus_file_ref (NAUTILUS_FILE (l->data)); data->added_files = g_list_prepend (data->added_files, NAUTILUS_FILE (l->data)); - } g_object_unref (location); } @@ -3672,8 +3671,8 @@ copy_move_done_data_free (CopyMoveDoneData *data) static void pre_copy_move_add_files_callback (NautilusFilesView *view, - GList *new_files, - CopyMoveDoneData *data) + GList *new_files, + CopyMoveDoneData *data) { GList *l; @@ -8411,8 +8410,8 @@ load_directory (NautilusFilesView *view, attributes); priv->file_changed_handler_id = g_signal_connect - (priv->directory_as_file, "changed", - G_CALLBACK (file_changed_callback), view); + (priv->directory_as_file, "changed", + G_CALLBACK (file_changed_callback), view); nautilus_profile_end (NULL); } @@ -8449,12 +8448,10 @@ finish_loading (NautilusFilesView *view) /* Start loading. */ /* 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); - priv->load_error_handler_id = g_signal_connect - (priv->model, "load-error", - G_CALLBACK (load_error_callback), view); + priv->done_loading_handler_id = g_signal_connect (priv->model, "done-loading", + G_CALLBACK (done_loading_callback), view); + priv->load_error_handler_id = g_signal_connect (priv->model, "load-error", + 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" @@ -8470,11 +8467,11 @@ finish_loading (NautilusFilesView *view) NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO; priv->files_added_handler_id = g_signal_connect - (priv->model, "files-added", - G_CALLBACK (files_added_callback), view); + (priv->model, "files-added", + G_CALLBACK (files_added_callback), view); priv->files_changed_handler_id = g_signal_connect - (priv->model, "files-changed", - G_CALLBACK (files_changed_callback), view); + (priv->model, "files-changed", + G_CALLBACK (files_changed_callback), view); nautilus_directory_file_monitor_add (priv->model, &priv->model, @@ -9468,13 +9465,13 @@ nautilus_files_view_init (NautilusFilesView *view) "<control>plus", NULL }; - const gchar *move_to_trash_accels[] = + const gchar *move_to_trash_accels[] = { "Delete", "KP_Delete", NULL }; - const gchar *delete_permanently_accels[] = + const gchar *delete_permanently_accels[] = { "<shift>Delete", "<shift>KP_Delete", diff --git a/src/nautilus-link.c b/src/nautilus-link.c index d52841843..e235400ab 100644 --- a/src/nautilus-link.c +++ b/src/nautilus-link.c @@ -184,13 +184,13 @@ slurp_key_string (const char *uri, } gboolean -nautilus_link_local_create (const char *directory_uri, - const char *base_name, - const char *display_name, - const char *image, - const char *target_uri, - int screen, - gboolean unique_filename) +nautilus_link_local_create (const char *directory_uri, + const char *base_name, + const char *display_name, + const char *image, + const char *target_uri, + int screen, + gboolean unique_filename) { char *real_directory_uri; char *contents; diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c index 8f6ff279d..a74b37cd2 100644 --- a/src/nautilus-list-view.c +++ b/src/nautilus-list-view.c @@ -443,8 +443,8 @@ check_starred_status (GtkTreeModel *model, static void on_starred_files_changed (NautilusTagManager *tag_manager, - GList *changed_files, - gpointer user_data) + GList *changed_files, + gpointer user_data) { NautilusListView *list_view; @@ -1591,10 +1591,10 @@ apply_columns_settings (NautilusListView *list_view, static void starred_cell_data_func (GtkTreeViewColumn *column, - GtkCellRenderer *renderer, - GtkTreeModel *model, - GtkTreeIter *iter, - NautilusListView *view) + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + NautilusListView *view) { g_autofree gchar *text = NULL; g_autofree gchar *uri = NULL; @@ -1632,7 +1632,6 @@ starred_cell_data_func (GtkTreeViewColumn *column, g_object_set (renderer, "icon-name", "non-starred-symbolic", NULL); - } nautilus_file_unref (file); @@ -1663,7 +1662,7 @@ filename_cell_data_func (GtkTreeViewColumn *column, -1); escaped_name = g_markup_escape_text (text, -1); - display_text = g_string_new(escaped_name); + display_text = g_string_new (escaped_name); directory = nautilus_files_view_get_model (NAUTILUS_FILES_VIEW (view)); @@ -2326,8 +2325,8 @@ get_default_visible_columns (NautilusListView *list_view) NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS); } -static GList* -default_column_array_as_list (gchar** array) +static GList * +default_column_array_as_list (gchar **array) { GList *res = NULL; gint i = 0; @@ -2348,7 +2347,7 @@ get_visible_columns (NautilusListView *list_view) g_autoptr (GList) visible_columns = NULL; GPtrArray *res; GList *l; - g_autofree gchar* uri = NULL; + g_autofree gchar *uri = NULL; gboolean in_xdg_dirs; gboolean is_starred; @@ -3802,7 +3801,7 @@ nautilus_list_view_reveal_for_selection_context_menu (NautilusFilesView *view) list = gtk_tree_selection_get_selected_rows (tree_selection, NULL); list = g_list_last (list); - path = g_steal_pointer(&list->data); + path = g_steal_pointer (&list->data); g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free); } diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c index 882716054..2f3f9b196 100644 --- a/src/nautilus-mime-actions.c +++ b/src/nautilus-mime-actions.c @@ -717,7 +717,7 @@ get_activation_action (NautilusFile *file) char *activation_uri; gboolean handles_extract = FALSE; g_autoptr (GAppInfo) app_info = NULL; - const gchar* app_id; + const gchar *app_id; app_info = nautilus_mime_get_default_application_for_file (file); if (app_info != NULL) diff --git a/src/nautilus-operations-ui-manager.c b/src/nautilus-operations-ui-manager.c index f86e9e228..474eae619 100644 --- a/src/nautilus-operations-ui-manager.c +++ b/src/nautilus-operations-ui-manager.c @@ -142,7 +142,7 @@ set_copy_move_dialog_text (FileConflictDialogData *data) { primary_text = g_strdup_printf (_("You are trying to replace the destination folder “%s” with a symbolic link."), destination_name); - message = g_strdup_printf(_("This is not allowed in order to avoid the deletion of the destination folder’s contents.")); + message = g_strdup_printf (_("This is not allowed in order to avoid the deletion of the destination folder’s contents.")); message_extra = _("Please rename the symbolic link or press the skip button."); } else if (source_is_directory) diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c index 6aeda60fb..05511f5ce 100644 --- a/src/nautilus-pathbar.c +++ b/src/nautilus-pathbar.c @@ -1014,7 +1014,7 @@ nautilus_path_bar_realize (GtkWidget *widget) attributes_mask = GDK_WA_X | GDK_WA_Y; priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget), - &attributes, attributes_mask); + &attributes, attributes_mask); gdk_window_set_user_data (priv->event_window, widget); } @@ -1954,7 +1954,7 @@ button_data_file_changed (NautilusFile *file, gboolean renamed, child; self = (NautilusPathBar *) gtk_widget_get_ancestor (button_data->button, - NAUTILUS_TYPE_PATH_BAR); + NAUTILUS_TYPE_PATH_BAR); priv = nautilus_path_bar_get_instance_private (self); if (self == NULL) diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c index cbe817f08..350c189b0 100644 --- a/src/nautilus-preferences-window.c +++ b/src/nautilus-preferences-window.c @@ -355,15 +355,15 @@ nautilus_preferences_window_setup_list_column_page (GtkBuilder *builder) } static gboolean format_spin_button(GtkSpinButton *spin_button, - gpointer user_data) + gpointer user_data) { GtkAdjustment *adjustment; int value; gchar *text; adjustment = gtk_spin_button_get_adjustment (spin_button); - value = (int)gtk_adjustment_get_value (adjustment); - text = g_strdup_printf ("%d MB",value); + value = (int) gtk_adjustment_get_value (adjustment); + text = g_strdup_printf ("%d MB", value); gtk_entry_set_text (GTK_ENTRY (spin_button), text); return TRUE; @@ -377,7 +377,6 @@ static void nautilus_preferences_window_setup_thumbnail_limit_formatting (GtkBui g_signal_connect (spin, "output", G_CALLBACK (format_spin_button), spin); - } static void bind_builder_bool(GtkBuilder *builder, @@ -393,7 +392,7 @@ static void bind_builder_uint_spin(GtkBuilder *builder, GSettings *settings, const char *widget_name, const char *prefs) -{ +{ g_settings_bind (settings, prefs, gtk_builder_get_object (builder, widget_name), "value", G_SETTINGS_BIND_DEFAULT); } diff --git a/src/nautilus-program-choosing.c b/src/nautilus-program-choosing.c index 52d654a87..a4b035894 100644 --- a/src/nautilus-program-choosing.c +++ b/src/nautilus-program-choosing.c @@ -457,9 +457,9 @@ nautilus_launch_desktop_file (GdkScreen *screen, #include <gdk/gdkwayland.h> #endif -typedef void (*GtkWindowHandleExported) (GtkWindow *window, - const char *handle, - gpointer user_data); +typedef void (*GtkWindowHandleExported) (GtkWindow *window, + const char *handle, + gpointer user_data); #ifdef GDK_WINDOWING_WAYLAND typedef struct @@ -488,7 +488,6 @@ window_export_handle (GtkWindow *window, GtkWindowHandleExported callback, gpointer user_data) { - #ifdef GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window)))) { @@ -625,11 +624,11 @@ launch_default_for_uri_thread_func (GTask *task, } void -nautilus_launch_default_for_uri_async (const char *uri, - GtkWindow *parent_window, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer callback_data) +nautilus_launch_default_for_uri_async (const char *uri, + GtkWindow *parent_window, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer callback_data) { g_autoptr (GdkAppLaunchContext) launch_context = NULL; g_autoptr (GTask) task = NULL; diff --git a/src/nautilus-progress-info-manager.c b/src/nautilus-progress-info-manager.c index 00868593a..88e76cfb3 100644 --- a/src/nautilus-progress-info-manager.c +++ b/src/nautilus-progress-info-manager.c @@ -93,7 +93,6 @@ nautilus_progress_info_manager_constructor (GType type, static void nautilus_progress_info_manager_init (NautilusProgressInfoManager *self) { - } static void diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c index 94b9c4d70..0041ff5b4 100644 --- a/src/nautilus-query-editor.c +++ b/src/nautilus-query-editor.c @@ -583,9 +583,9 @@ search_popover_time_type_changed_cb (NautilusSearchPopover *popover, } static void -search_popover_fts_changed_cb (GObject *popover, - GParamSpec *pspec, - gpointer user_data) +search_popover_fts_changed_cb (GObject *popover, + GParamSpec *pspec, + gpointer user_data) { NautilusQueryEditorPrivate *priv; NautilusQueryEditor *editor; diff --git a/src/nautilus-query.c b/src/nautilus-query.c index a88f52483..c3c6ea585 100644 --- a/src/nautilus-query.c +++ b/src/nautilus-query.c @@ -562,7 +562,7 @@ nautilus_query_get_search_starred (NautilusQuery *query) void nautilus_query_set_search_starred (NautilusQuery *query, - gboolean search_starred) + gboolean search_starred) { g_return_if_fail (NAUTILUS_IS_QUERY (query)); diff --git a/src/nautilus-search-directory.c b/src/nautilus-search-directory.c index ae710f330..1d91b0329 100644 --- a/src/nautilus-search-directory.c +++ b/src/nautilus-search-directory.c @@ -588,7 +588,7 @@ search_directory_add_pending_files_callbacks (NautilusSearchDirectory *self) g_list_foreach (self->pending_callback_list, (GFunc) search_callback_add_pending_file_callbacks, NULL); self->callback_list = g_list_concat (self->callback_list, - self->pending_callback_list); + self->pending_callback_list); g_list_free (self->pending_callback_list); self->pending_callback_list = NULL; @@ -1051,8 +1051,8 @@ nautilus_search_directory_set_query (NautilusSearchDirectory *self, if (query) { self->binding = g_object_bind_property (self->engine, "running", - query, "searching", - G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); + query, "searching", + G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); } g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_QUERY]); diff --git a/src/nautilus-search-engine-model.c b/src/nautilus-search-engine-model.c index 24c2ba4ae..7c303a864 100644 --- a/src/nautilus-search-engine-model.c +++ b/src/nautilus-search-engine-model.c @@ -38,7 +38,7 @@ struct _NautilusSearchEngineModel { GObject parent; - + NautilusQuery *query; GList *hits; @@ -344,7 +344,6 @@ nautilus_search_engine_model_class_init (NautilusSearchEngineModelClass *class) * Whether the search engine is running a search. */ g_object_class_override_property (gobject_class, PROP_RUNNING, "running"); - } static void diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c index d87c0cd6a..42f1cd101 100644 --- a/src/nautilus-search-engine-tracker.c +++ b/src/nautilus-search-engine-tracker.c @@ -341,12 +341,13 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider) g_string_append (sparql, " fts:snippet(?urn)"); } - g_string_append (sparql, "\nWHERE {" - " ?urn a nfo:FileDataObject;" - " nfo:fileLastModified ?mtime;" - " nfo:fileLastAccessed ?atime;" - " tracker:available true;" - " nie:url ?url"); + g_string_append (sparql, + "\nWHERE {" + " ?urn a nfo:FileDataObject;" + " nfo:fileLastModified ?mtime;" + " nfo:fileLastAccessed ?atime;" + " tracker:available true;" + " nie:url ?url"); if (*search_text) { @@ -376,7 +377,7 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider) if (!tracker->fts_enabled) { - g_string_append_printf (sparql, " && fn:contains(fn:lower-case(nfo:fileName(?urn)), '%s')", search_text); + g_string_append_printf (sparql, " && fn:contains(fn:lower-case(nfo:fileName(?urn)), '%s')", search_text); } date_range = nautilus_query_get_date_range (tracker->query); @@ -537,7 +538,6 @@ nautilus_search_engine_tracker_class_init (NautilusSearchEngineTrackerClass *cla * Whether the search engine is running a search. */ g_object_class_override_property (gobject_class, PROP_RUNNING, "running"); - } static void diff --git a/src/nautilus-search-popover.c b/src/nautilus-search-popover.c index 5c9dfa8d6..37f4ce6c8 100644 --- a/src/nautilus-search-popover.c +++ b/src/nautilus-search-popover.c @@ -367,14 +367,14 @@ search_fts_mode_changed (GtkToggleButton *button, popover->fts_enabled == FALSE) { popover->fts_enabled = TRUE; - g_settings_set_boolean(nautilus_preferences, NAUTILUS_PREFERENCES_FTS_ENABLED, TRUE); + g_settings_set_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_FTS_ENABLED, TRUE); g_object_notify (G_OBJECT (popover), "fts-enabled"); } else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (popover->filename_search_button)) && popover->fts_enabled == TRUE) { popover->fts_enabled = FALSE; - g_settings_set_boolean(nautilus_preferences, NAUTILUS_PREFERENCES_FTS_ENABLED, FALSE); + g_settings_set_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_FTS_ENABLED, FALSE); g_object_notify (G_OBJECT (popover), "fts-enabled"); } } diff --git a/src/nautilus-starred-directory.c b/src/nautilus-starred-directory.c index ab03ce3b0..8068ad5dc 100644 --- a/src/nautilus-starred-directory.c +++ b/src/nautilus-starred-directory.c @@ -22,7 +22,8 @@ #include "nautilus-directory-private.h" #include <glib/gi18n.h> -struct _NautilusFavoriteDirectory { +struct _NautilusFavoriteDirectory +{ NautilusDirectory parent_slot; NautilusTagManager *tag_manager; @@ -105,7 +106,7 @@ nautilus_starred_directory_update_files (NautilusFavoriteDirectory *self) { if (!g_hash_table_contains (uri_table, l->data)) { - file = nautilus_file_get_by_uri ((gchar*) l->data); + file = nautilus_file_get_by_uri ((gchar *) l->data); for (monitor_list = self->monitor_list; monitor_list; monitor_list = monitor_list->next) { @@ -184,9 +185,9 @@ nautilus_starred_directory_update_files (NautilusFavoriteDirectory *self) } static void -on_starred_files_changed (NautilusTagManager *tag_manager, - GList *changed_files, - gpointer user_data) +on_starred_files_changed (NautilusTagManager *tag_manager, + GList *changed_files, + gpointer user_data) { NautilusFavoriteDirectory *self; @@ -236,8 +237,8 @@ real_call_when_ready (NautilusDirectory *directory, file_list = nautilus_file_list_copy (starred->files); callback (NAUTILUS_DIRECTORY (directory), - file_list, - callback_data); + file_list, + callback_data); } static gboolean @@ -270,7 +271,7 @@ real_file_monitor_add (NautilusDirectory *directory, if (callback != NULL) { - (*callback) (directory, starred->files, callback_data); + (*callback)(directory, starred->files, callback_data); } for (list = starred->files; list != NULL; list = list->next) @@ -284,7 +285,7 @@ real_file_monitor_add (NautilusDirectory *directory, static void starred_monitor_destroy (FavoriteMonitor *monitor, - NautilusFavoriteDirectory *starred) + NautilusFavoriteDirectory *starred) { GList *l; NautilusFile *file; @@ -314,7 +315,9 @@ real_monitor_remove (NautilusDirectory *directory, monitor = list->data; if (monitor->client != client) + { continue; + } starred->monitor_list = g_list_delete_link (starred->monitor_list, list); @@ -339,10 +342,10 @@ real_handles_location (GFile *location) return FALSE; } -static FavoriteCallback* +static FavoriteCallback * starred_callback_find_pending (NautilusFavoriteDirectory *starred, - NautilusDirectoryCallback callback, - gpointer callback_data) + NautilusDirectoryCallback callback, + gpointer callback_data) { FavoriteCallback *starred_callback; GList *list; @@ -361,10 +364,10 @@ starred_callback_find_pending (NautilusFavoriteDirectory *starred, return NULL; } -static FavoriteCallback* +static FavoriteCallback * starred_callback_find (NautilusFavoriteDirectory *starred, - NautilusDirectoryCallback callback, - gpointer callback_data) + NautilusDirectoryCallback callback, + gpointer callback_data) { FavoriteCallback *starred_callback; GList *list; @@ -392,9 +395,9 @@ starred_callback_destroy (FavoriteCallback *starred_callback) } static void -real_cancel_callback (NautilusDirectory *directory, - NautilusDirectoryCallback callback, - gpointer callback_data) +real_cancel_callback (NautilusDirectory *directory, + NautilusDirectoryCallback callback, + gpointer callback_data) { NautilusFavoriteDirectory *starred; FavoriteCallback *starred_callback; @@ -422,7 +425,7 @@ real_cancel_callback (NautilusDirectory *directory, } } -static GList* +static GList * real_get_file_list (NautilusDirectory *directory) { NautilusFavoriteDirectory *starred; @@ -448,7 +451,7 @@ nautilus_starred_directory_set_files (NautilusFavoriteDirectory *self) for (l = starred_files; l != NULL; l = l->next) { - file = nautilus_file_get_by_uri ((gchar*) l->data); + file = nautilus_file_get_by_uri ((gchar *) l->data); g_signal_connect (file, "changed", G_CALLBACK (file_changed), self); @@ -518,7 +521,7 @@ nautilus_starred_directory_dispose (GObject *object) { for (l = starred->monitor_list; l != NULL; l = l->next) { - starred_monitor_destroy ((FavoriteMonitor*) l->data, starred); + starred_monitor_destroy ((FavoriteMonitor *) l->data, starred); } g_list_free (starred->monitor_list); @@ -552,7 +555,7 @@ nautilus_starred_directory_class_init (NautilusFavoriteDirectoryClass *klass) directory_class->get_file_list = real_get_file_list; } -NautilusFavoriteDirectory* +NautilusFavoriteDirectory * nautilus_starred_directory_new () { NautilusFavoriteDirectory *self; @@ -577,5 +580,4 @@ nautilus_starred_directory_init (NautilusFavoriteDirectory *self) self->tag_manager = tag_manager; nautilus_starred_directory_set_files (self); - } diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c index de7f52ee8..1b6be5eef 100644 --- a/src/nautilus-tag-manager.c +++ b/src/nautilus-tag-manager.c @@ -71,7 +71,7 @@ enum static guint signals[LAST_SIGNAL]; -static const gchar* +static const gchar * nautilus_tag_manager_file_with_id_changed_url (GHashTable *hash_table, gint64 id, const gchar *url) @@ -102,7 +102,7 @@ destroy_insert_task_data (gpointer data) g_free (data); } -static GString* +static GString * add_selection_filter (GList *selection, GString *query) { @@ -176,12 +176,12 @@ start_query_or_update (GString *query, } static void -on_query_callback (GObject *object, - GAsyncResult *result, - gpointer user_data, - GAsyncReadyCallback callback, - OperationType op_type, - GCancellable *cancellable) +on_query_callback (GObject *object, + GAsyncResult *result, + gpointer user_data, + GAsyncReadyCallback callback, + OperationType op_type, + GCancellable *cancellable) { TrackerSparqlCursor *cursor; g_autoptr (GError) error = NULL; @@ -289,7 +289,7 @@ on_update_callback (GObject *object, } else if (error && error->code == G_IO_ERROR_CANCELLED) { - g_error_free (error); + g_error_free (error); } else { @@ -343,7 +343,7 @@ get_query_status (TrackerSparqlCursor *cursor, return success; } -GList* +GList * nautilus_tag_manager_get_starred_files (NautilusTagManager *self) { return g_hash_table_get_keys (self->starred_files); @@ -351,8 +351,8 @@ nautilus_tag_manager_get_starred_files (NautilusTagManager *self) static void on_get_starred_files_cursor_callback (GObject *object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { TrackerSparqlCursor *cursor; const gchar *url; @@ -396,8 +396,8 @@ on_get_starred_files_cursor_callback (GObject *object, static void on_get_starred_files_query_callback (GObject *object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { NautilusTagManager *self; @@ -413,7 +413,7 @@ on_get_starred_files_query_callback (GObject *object, static void nautilus_tag_manager_query_starred_files (NautilusTagManager *self, - GCancellable *cancellable) + GCancellable *cancellable) { GString *query; @@ -431,21 +431,20 @@ nautilus_tag_manager_query_starred_files (NautilusTagManager *self, } static gpointer -nautilus_tag_manager_gpointer_task_finish (GObject *source_object, - GAsyncResult *res, - GError **error) +nautilus_tag_manager_gpointer_task_finish (GObject *source_object, + GAsyncResult *res, + GError **error) { g_return_val_if_fail (g_task_is_valid (res, source_object), FALSE); return g_task_propagate_pointer (G_TASK (res), error); } -static GString* -nautilus_tag_manager_delete_tag (NautilusTagManager *self, - GList *selection, - GString *query) +static GString * +nautilus_tag_manager_delete_tag (NautilusTagManager *self, + GList *selection, + GString *query) { - g_string_append (query, "DELETE { ?urn nao:hasTag nao:predefined-tag-favorite }" "WHERE { ?urn a nfo:FileDataObject ; nie:url ?url ."); @@ -457,10 +456,10 @@ nautilus_tag_manager_delete_tag (NautilusTagManager *self, return query; } -static GString* -nautilus_tag_manager_insert_tag (NautilusTagManager *self, - GList *selection, - GString *query) +static GString * +nautilus_tag_manager_insert_tag (NautilusTagManager *self, + GList *selection, + GString *query) { g_string_append (query, "INSERT { ?urn nao:hasTag nao:predefined-tag-favorite }" @@ -475,7 +474,7 @@ nautilus_tag_manager_insert_tag (NautilusTagManager *self, gboolean nautilus_tag_manager_file_is_starred (NautilusTagManager *self, - const gchar *file_name) + const gchar *file_name) { return g_hash_table_contains (self->starred_files, file_name); } @@ -532,7 +531,6 @@ on_get_file_ids_for_urls_cursor_callback (GObject *object, g_task_get_cancellable (task), on_get_file_ids_for_urls_cursor_callback, task); - } @@ -683,9 +681,9 @@ nautilus_tag_manager_unstar_files (NautilusTagManager *self, } void -on_tracker_notifier_events(TrackerNotifier *notifier, - GPtrArray *events, - gpointer user_data) +on_tracker_notifier_events (TrackerNotifier *notifier, + GPtrArray *events, + gpointer user_data) { TrackerNotifierEvent *event; NautilusTagManager *self; @@ -803,7 +801,6 @@ on_tracker_notifier_events(TrackerNotifier *notifier, g_string_free (query, TRUE); } - } static void @@ -833,18 +830,18 @@ nautilus_tag_manager_class_init (NautilusTagManagerClass *klass) oclass->finalize = nautilus_tag_manager_finalize; signals[STARRED_CHANGED] = g_signal_new ("starred-changed", - NAUTILUS_TYPE_TAG_MANAGER, - G_SIGNAL_RUN_LAST, - 0, - NULL, - NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, - G_TYPE_POINTER); + NAUTILUS_TYPE_TAG_MANAGER, + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, + G_TYPE_POINTER); } -NautilusTagManager* nautilus_tag_manager_get () +NautilusTagManager *nautilus_tag_manager_get () { if (tag_manager != NULL) { @@ -852,13 +849,13 @@ NautilusTagManager* nautilus_tag_manager_get () } tag_manager = g_object_new (NAUTILUS_TYPE_TAG_MANAGER, NULL); - g_object_add_weak_pointer (G_OBJECT (tag_manager), (gpointer)&tag_manager); + g_object_add_weak_pointer (G_OBJECT (tag_manager), (gpointer) & tag_manager); return tag_manager; } void nautilus_tag_manager_set_cancellable (NautilusTagManager *tag_manager, - GCancellable *cancellable) + GCancellable *cancellable) { nautilus_tag_manager_query_starred_files (tag_manager, cancellable); @@ -871,14 +868,13 @@ void nautilus_tag_manager_set_cancellable (NautilusTagManager *tag_manager, "events", G_CALLBACK (on_tracker_notifier_events), tag_manager); - } static void nautilus_tag_manager_init (NautilusTagManager *self) { self->starred_files = g_hash_table_new_full (g_str_hash, - g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) g_free); + g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) g_free); } diff --git a/src/nautilus-thumbnails.c b/src/nautilus-thumbnails.c index 29a52c5cc..1917b6364 100644 --- a/src/nautilus-thumbnails.c +++ b/src/nautilus-thumbnails.c @@ -404,7 +404,7 @@ nautilus_create_thumbnail (NautilusFile *file) { /* Add the thumbnail to the list. */ g_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, @@ -423,7 +423,7 @@ nautilus_create_thumbnail (NautilusFile *file) else { g_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; @@ -518,7 +518,7 @@ thumbnail_thread_func (GTask *task, current_time >= current_orig_mtime) { g_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, @@ -528,7 +528,7 @@ thumbnail_thread_func (GTask *task, /* Create the thumbnail. */ g_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, @@ -537,7 +537,7 @@ thumbnail_thread_func (GTask *task, if (pixbuf) { g_debug ("(Thumbnail Thread) Saving thumbnail: %s\n", - info->image_uri); + info->image_uri); gnome_desktop_thumbnail_factory_save_thumbnail (thumbnail_factory, pixbuf, @@ -548,7 +548,7 @@ thumbnail_thread_func (GTask *task, else { g_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 1dfb0977d..d38209e6b 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -264,14 +264,14 @@ back_button_longpress_cb (GtkGestureLongPress *gesture, double y, gpointer user_data) { - NautilusToolbar *self = user_data; - GdkEventSequence *sequence; - const GdkEvent *event; + NautilusToolbar *self = user_data; + GdkEventSequence *sequence; + const GdkEvent *event; - sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); - event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence); + sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); + event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence); - show_menu (self, self->back_button, event); + show_menu (self, self->back_button, event); } static void @@ -280,14 +280,14 @@ forward_button_longpress_cb (GtkGestureLongPress *gesture, double y, gpointer user_data) { - NautilusToolbar *self = user_data; - GdkEventSequence *sequence; - const GdkEvent *event; + NautilusToolbar *self = user_data; + GdkEventSequence *sequence; + const GdkEvent *event; - sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); - event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence); + sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); + event = gtk_gesture_get_last_event (GTK_GESTURE (gesture), sequence); - show_menu (self, self->forward_button, event); + show_menu (self, self->forward_button, event); } static gboolean @@ -910,7 +910,7 @@ nautilus_toolbar_init (NautilusToolbar *self) gtk_container_add (GTK_CONTAINER (self->location_entry_container), self->location_entry); self->location_entry_close_button = gtk_button_new_from_icon_name ("window-close-symbolic", - GTK_ICON_SIZE_BUTTON); + GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (self->location_entry_container), self->location_entry_close_button); g_signal_connect (self->location_entry_close_button, "clicked", diff --git a/src/nautilus-vfs-file.c b/src/nautilus-vfs-file.c index 172dc0378..66dff20a2 100644 --- a/src/nautilus-vfs-file.c +++ b/src/nautilus-vfs-file.c @@ -264,6 +264,7 @@ vfs_file_get_date (NautilusFile *file, } case NAUTILUS_DATE_TYPE_TRASHED: + { /* Before we have info on a file, the date is unknown. */ if (trash_time == 0) { @@ -274,6 +275,7 @@ vfs_file_get_date (NautilusFile *file, *date = trash_time; } return TRUE; + } case NAUTILUS_DATE_TYPE_RECENCY: /* Before we have info on a file, the date is unknown. */ diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index f3e42c47b..4187cffff 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -157,7 +157,7 @@ static void trash_state_changed_cb (NautilusTrashMonitor *monitor, void nautilus_window_slot_restore_from_data (NautilusWindowSlot *self, - RestoreTabData *data) + RestoreTabData *data) { NautilusWindowSlotPrivate *priv; @@ -172,7 +172,7 @@ nautilus_window_slot_restore_from_data (NautilusWindowSlot *self, priv->location_change_type = NAUTILUS_LOCATION_CHANGE_RELOAD; } -RestoreTabData* +RestoreTabData * nautilus_window_slot_get_restore_tab_data (NautilusWindowSlot *self) { NautilusWindowSlotPrivate *priv; @@ -223,7 +223,7 @@ real_handles_location (NautilusWindowSlot *self, gboolean handles_location; g_autofree char *uri = NULL; - uri = g_file_get_uri(location); + uri = g_file_get_uri (location); file = nautilus_file_get (location); handles_location = !nautilus_file_is_other_locations (file); diff --git a/src/nautilus-window.c b/src/nautilus-window.c index d27d8e590..c332d03d1 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -175,7 +175,8 @@ static const struct { GDK_KEY_Forward, "forward" }, }; -static const GtkPadActionEntry pad_actions[] = { +static const GtkPadActionEntry pad_actions[] = +{ { GTK_PAD_ACTION_BUTTON, 0, -1, N_("Parent folder"), "up" }, { GTK_PAD_ACTION_BUTTON, 1, -1, N_("Home"), "go-home" }, { GTK_PAD_ACTION_BUTTON, 2, -1, N_("New tab"), "new-tab" }, @@ -1126,8 +1127,8 @@ places_sidebar_show_other_locations_with_flags (NautilusWindow *window, } static void -places_sidebar_show_starred_location (NautilusWindow *window, - GtkPlacesOpenFlags open_flags) +places_sidebar_show_starred_location (NautilusWindow *window, + GtkPlacesOpenFlags open_flags) { GFile *location; @@ -1841,7 +1842,7 @@ nautilus_window_on_undo_changed (NautilusFileUndoManager *manager, if (nautilus_file_undo_info_get_op_type (undo_info) == NAUTILUS_FILE_UNDO_OP_MOVE_TO_TRASH) { - g_autoptr(GList) files = NULL; + g_autoptr (GList) files = NULL; files = nautilus_file_undo_info_trash_get_files (NAUTILUS_FILE_UNDO_INFO_TRASH (undo_info)); @@ -1975,8 +1976,8 @@ nautilus_window_show_operation_notification (NautilusWindow *window, gtk_revealer_set_reveal_child (GTK_REVEALER (priv->notification_operation), TRUE); priv->notification_operation_timeout_id = g_timeout_add_seconds (NOTIFICATION_TIMEOUT, - (GSourceFunc) on_notification_operation_timeout, - window); + (GSourceFunc) on_notification_operation_timeout, + window); } } @@ -2090,7 +2091,7 @@ notebook_popup_menu_show (NautilusWindow *window, gtk_widget_show_all (popup); gtk_menu_popup_at_pointer (GTK_MENU (popup), - (GdkEvent*) event); + (GdkEvent *) event); } /* emitted when the user clicks the "close" button of tabs */ @@ -2886,7 +2887,7 @@ nautilus_window_init (NautilusWindow *window) gtk_window_group_add_window (window_group, GTK_WINDOW (window)); g_object_unref (window_group); - priv->tab_data_queue = g_queue_new(); + priv->tab_data_queue = g_queue_new (); priv->pad_controller = gtk_pad_controller_new (GTK_WINDOW (window), G_ACTION_GROUP (window), |