Commit b6ebffd5 authored by Carlos Soriano Sánchez's avatar Carlos Soriano Sánchez

general: Run uncrustify

parent 27b039b3
Pipeline #3358 passed with stage
in 7 minutes and 57 seconds
...@@ -95,4 +95,3 @@ eel_gtk_menu_insert_separator (GtkMenu *menu, ...@@ -95,4 +95,3 @@ eel_gtk_menu_insert_separator (GtkMenu *menu,
return GTK_MENU_ITEM (menu_item); return GTK_MENU_ITEM (menu_item);
} }
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
G_DEFINE_INTERFACE (NautilusFileInfo, nautilus_file_info, G_TYPE_OBJECT) 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 * SECTION:nautilus-file-info
......
...@@ -936,7 +936,7 @@ const GOptionEntry options[] = ...@@ -936,7 +936,7 @@ const GOptionEntry options[] =
/* dummy, only for compatibility reasons */ /* dummy, only for compatibility reasons */
{ "browser", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, NULL, { "browser", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, NULL,
NULL, NULL }, NULL, NULL },
/* ditto */ /* ditto */
{ "geometry", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, NULL, { "geometry", 'g', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, NULL,
N_("Create the initial window with the given geometry."), N_("GEOMETRY") }, N_("Create the initial window with the given geometry."), N_("GEOMETRY") },
{ "version", '\0', 0, G_OPTION_ARG_NONE, NULL, { "version", '\0', 0, G_OPTION_ARG_NONE, NULL,
......
...@@ -355,7 +355,7 @@ batch_rename_format (NautilusFile *file, ...@@ -355,7 +355,7 @@ batch_rename_format (NautilusFile *file,
gchar *metadata; gchar *metadata;
file_name = nautilus_file_get_display_name (file); 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); extension = nautilus_file_get_extension (file);
} }
...@@ -435,7 +435,7 @@ batch_rename_format (NautilusFile *file, ...@@ -435,7 +435,7 @@ batch_rename_format (NautilusFile *file,
{ {
case ORIGINAL_FILE_NAME: 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); new_name = g_string_append (new_name, file_name);
} }
......
...@@ -1485,7 +1485,7 @@ create_label_layout (NautilusCanvasItem *item, ...@@ -1485,7 +1485,7 @@ create_label_layout (NautilusCanvasItem *item,
{ {
str = g_string_append_c (str, *p); 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, /* Ensure that we allow to break after '_' or '.' characters,
* if they are not followed by a number */ * if they are not followed by a number */
......
...@@ -1366,7 +1366,7 @@ canvas_container_longpress_gesture_pressed_callback (GtkGestureLongPress *gestur ...@@ -1366,7 +1366,7 @@ canvas_container_longpress_gesture_pressed_callback (GtkGestureLongPress *gestur
else else
{ {
nautilus_files_view_pop_up_background_context_menu (NAUTILUS_FILES_VIEW (view), nautilus_files_view_pop_up_background_context_menu (NAUTILUS_FILES_VIEW (view),
event); event);
} }
} }
......
...@@ -132,7 +132,6 @@ nautilus_column_chooser_class_init (NautilusColumnChooserClass *chooser_class) ...@@ -132,7 +132,6 @@ nautilus_column_chooser_class_init (NautilusColumnChooserClass *chooser_class)
NAUTILUS_TYPE_FILE, NAUTILUS_TYPE_FILE,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
} }
static void static void
......
...@@ -3547,7 +3547,7 @@ is_link_trusted (NautilusFile *file, ...@@ -3547,7 +3547,7 @@ is_link_trusted (NautilusFile *file,
{ {
GFile *location; GFile *location;
gboolean res; gboolean res;
g_autofree gchar* trusted = NULL; g_autofree gchar *trusted = NULL;
if (!is_launcher) if (!is_launcher)
{ {
......
...@@ -1203,10 +1203,10 @@ do_run_simple_dialog (gpointer _data) ...@@ -1203,10 +1203,10 @@ do_run_simple_dialog (gpointer _data)
button = gtk_dialog_add_button (GTK_DIALOG (dialog), button_title, response_id); button = gtk_dialog_add_button (GTK_DIALOG (dialog), button_title, response_id);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), 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), gtk_style_context_add_class (gtk_widget_get_style_context (button),
"destructive-action"); "destructive-action");
} }
} }
...@@ -2262,9 +2262,9 @@ skip: ...@@ -2262,9 +2262,9 @@ skip:
} }
static void static void
source_info_remove_file_from_count (GFile *file, source_info_remove_file_from_count (GFile *file,
CommonJob *job, CommonJob *job,
SourceInfo *source_info) SourceInfo *source_info)
{ {
g_autoptr (GFileInfo) file_info = NULL; g_autoptr (GFileInfo) file_info = NULL;
...@@ -7949,10 +7949,10 @@ extract_job_on_progress (AutoarExtractor *extractor, ...@@ -7949,10 +7949,10 @@ extract_job_on_progress (AutoarExtractor *extractor,
details = g_strdup_printf (ngettext ("%s / %s \xE2\x80\x94 %s left (%s/sec)", details = g_strdup_printf (ngettext ("%s / %s \xE2\x80\x94 %s left (%s/sec)",
"%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)), seconds_count_format_time_units (remaining_time)),
formatted_size_job_completed_size, formatted_size_job_completed_size,
formatted_size_total_compressed_size, formatted_size_total_compressed_size,
formatted_time, formatted_time,
formatted_size_transfer_rate); formatted_size_transfer_rate);
} }
nautilus_progress_info_take_details (common->progress, details); nautilus_progress_info_take_details (common->progress, details);
...@@ -8049,20 +8049,20 @@ extract_job_on_scanned (AutoarExtractor *extractor, ...@@ -8049,20 +8049,20 @@ extract_job_on_scanned (AutoarExtractor *extractor,
/* FIXME: G_MAXUINT64 is the value used by autoar when the file size cannot /* FIXME: G_MAXUINT64 is the value used by autoar when the file size cannot
* be determined. Ideally an API should be used instead. * 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, nautilus_progress_info_take_status (extract_job->common.progress,
g_strdup_printf (_("Error extracting “%s”"), g_strdup_printf (_("Error extracting “%s”"),
basename)); basename));
run_error (&extract_job->common, run_error (&extract_job->common,
g_strdup_printf (_("Not enough free space to extract %s"),basename), g_strdup_printf (_("Not enough free space to extract %s"), basename),
NULL, NULL,
NULL, NULL,
FALSE, FALSE,
CANCEL, CANCEL,
NULL); NULL);
abort_job ((CommonJob *) extract_job); abort_job ((CommonJob *) extract_job);
} }
} }
...@@ -8081,7 +8081,7 @@ report_extract_final_progress (ExtractJob *extract_job, ...@@ -8081,7 +8081,7 @@ report_extract_final_progress (ExtractJob *extract_job,
if (total_files == 1) if (total_files == 1)
{ {
GFile *source_file; GFile *source_file;
g_autofree gchar * basename = NULL; g_autofree gchar *basename = NULL;
source_file = G_FILE (extract_job->source_files->data); source_file = G_FILE (extract_job->source_files->data);
basename = get_basename (source_file); basename = get_basename (source_file);
......
...@@ -1319,10 +1319,10 @@ enum ...@@ -1319,10 +1319,10 @@ enum
static void static void
starred_strings_func (NautilusFileUndoInfo *info, starred_strings_func (NautilusFileUndoInfo *info,
gchar **undo_label, gchar **undo_label,
gchar **undo_description, gchar **undo_description,
gchar **redo_label, gchar **redo_label,
gchar **redo_description) gchar **redo_description)
{ {
NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info); NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info);
...@@ -1356,8 +1356,8 @@ starred_strings_func (NautilusFileUndoInfo *info, ...@@ -1356,8 +1356,8 @@ starred_strings_func (NautilusFileUndoInfo *info,
static void static void
on_undo_starred_tags_updated (GObject *object, on_undo_starred_tags_updated (GObject *object,
GAsyncResult *res, GAsyncResult *res,
gpointer user_data) gpointer user_data)
{ {
GTask *task; GTask *task;
NautilusFileUndoInfo *undo_info; NautilusFileUndoInfo *undo_info;
...@@ -1372,7 +1372,7 @@ on_undo_starred_tags_updated (GObject *object, ...@@ -1372,7 +1372,7 @@ on_undo_starred_tags_updated (GObject *object,
static void static void
starred_redo_func (NautilusFileUndoInfo *info, starred_redo_func (NautilusFileUndoInfo *info,
GtkWindow *parent_window) GtkWindow *parent_window)
{ {
NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info); NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info);
NautilusTagManager *tag_manager; NautilusTagManager *tag_manager;
...@@ -1389,7 +1389,6 @@ starred_redo_func (NautilusFileUndoInfo *info, ...@@ -1389,7 +1389,6 @@ starred_redo_func (NautilusFileUndoInfo *info,
} }
else else
{ {
nautilus_tag_manager_unstar_files (tag_manager, nautilus_tag_manager_unstar_files (tag_manager,
G_OBJECT (info), G_OBJECT (info),
self->priv->files, self->priv->files,
...@@ -1400,7 +1399,7 @@ starred_redo_func (NautilusFileUndoInfo *info, ...@@ -1400,7 +1399,7 @@ starred_redo_func (NautilusFileUndoInfo *info,
static void static void
starred_undo_func (NautilusFileUndoInfo *info, starred_undo_func (NautilusFileUndoInfo *info,
GtkWindow *parent_window) GtkWindow *parent_window)
{ {
NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info); NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (info);
NautilusTagManager *tag_manager; NautilusTagManager *tag_manager;
...@@ -1427,9 +1426,9 @@ starred_undo_func (NautilusFileUndoInfo *info, ...@@ -1427,9 +1426,9 @@ starred_undo_func (NautilusFileUndoInfo *info,
static void static void
nautilus_file_undo_info_starred_set_property (GObject *object, nautilus_file_undo_info_starred_set_property (GObject *object,
guint prop_id, guint prop_id,
const GValue *value, const GValue *value,
GParamSpec *pspec) GParamSpec *pspec)
{ {
NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (object); NautilusFileUndoInfoFavorites *self = NAUTILUS_FILE_UNDO_INFO_STARRED (object);
...@@ -1501,7 +1500,6 @@ nautilus_file_undo_info_starred_class_init (NautilusFileUndoInfoFavoritesClass * ...@@ -1501,7 +1500,6 @@ nautilus_file_undo_info_starred_class_init (NautilusFileUndoInfoFavoritesClass *
FALSE, FALSE,
G_PARAM_WRITABLE | G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY)); G_PARAM_CONSTRUCT_ONLY));
} }
GList * GList *
...@@ -1517,8 +1515,8 @@ nautilus_file_undo_info_starred_is_starred (NautilusFileUndoInfoFavorites *self) ...@@ -1517,8 +1515,8 @@ nautilus_file_undo_info_starred_is_starred (NautilusFileUndoInfoFavorites *self)
} }
NautilusFileUndoInfo * NautilusFileUndoInfo *
nautilus_file_undo_info_starred_new (GList *files, nautilus_file_undo_info_starred_new (GList *files,
gboolean starred) gboolean starred)
{ {
NautilusFileUndoInfoFavorites *self; NautilusFileUndoInfoFavorites *self;
......
...@@ -557,7 +557,9 @@ nautilus_is_starred_directory (GFile *dir) ...@@ -557,7 +557,9 @@ nautilus_is_starred_directory (GFile *dir)
uri = g_file_get_uri (dir); uri = g_file_get_uri (dir);
if (eel_uri_is_starred (uri)) if (eel_uri_is_starred (uri))
{
return TRUE; return TRUE;
}
return FALSE; return FALSE;
} }
...@@ -1436,4 +1438,3 @@ nautilus_uri_to_native_uri (const gchar *uri) ...@@ -1436,4 +1438,3 @@ nautilus_uri_to_native_uri (const gchar *uri)
return NULL; return NULL;
} }
...@@ -3572,7 +3572,7 @@ compare_by_type (NautilusFile *file_1, ...@@ -3572,7 +3572,7 @@ compare_by_type (NautilusFile *file_1,
static int static int
compare_by_starred (NautilusFile *file_1, compare_by_starred (NautilusFile *file_1,
NautilusFile *file_2) NautilusFile *file_2)
{ {
NautilusTagManager *tag_manager; NautilusTagManager *tag_manager;
g_autofree gchar *uri_1 = NULL; g_autofree gchar *uri_1 = NULL;
...@@ -3586,9 +3586,9 @@ compare_by_starred (NautilusFile *file_1, ...@@ -3586,9 +3586,9 @@ compare_by_starred (NautilusFile *file_1,
uri_2 = nautilus_file_get_uri (file_2); uri_2 = nautilus_file_get_uri (file_2);
file_1_is_starred = nautilus_tag_manager_file_is_starred (tag_manager, 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, 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) if (!!file_1_is_starred == !!file_2_is_starred)
{ {
return 0; return 0;
...@@ -4529,9 +4529,13 @@ char * ...@@ -4529,9 +4529,13 @@ char *
nautilus_file_get_display_name (NautilusFile *file) nautilus_file_get_display_name (NautilusFile *file)
{ {
if (nautilus_file_is_other_locations (file)) if (nautilus_file_is_other_locations (file))
{
return g_strdup (_("Other Locations")); return g_strdup (_("Other Locations"));
}
if (nautilus_file_is_starred_location (file)) if (nautilus_file_is_starred_location (file))
{
return g_strdup (_("Starred")); return g_strdup (_("Starred"));
}
return g_strdup (nautilus_file_peek_display_name (file)); return g_strdup (nautilus_file_peek_display_name (file));
} }
...@@ -6115,7 +6119,7 @@ nautilus_file_set_search_fts_snippet (NautilusFile *file, ...@@ -6115,7 +6119,7 @@ nautilus_file_set_search_fts_snippet (NautilusFile *file,
file->details->fts_snippet = g_strdup (fts_snippet); file->details->fts_snippet = g_strdup (fts_snippet);
} }
const gchar* const gchar *
nautilus_file_get_search_fts_snippet (NautilusFile *file) nautilus_file_get_search_fts_snippet (NautilusFile *file)
{ {
return file->details->fts_snippet; return file->details->fts_snippet;
...@@ -7770,7 +7774,8 @@ nautilus_file_get_file_type (NautilusFile *file) ...@@ -7770,7 +7774,8 @@ nautilus_file_get_file_type (NautilusFile *file)
{ {
g_return_val_if_fail (NAUTILUS_IS_FILE (file), G_FILE_TYPE_UNKNOWN); 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));
;
  • Oh, uncrustify doesn't handle double semicolons correctly. New line for empty statement. (By the way, did anyone receive an email for this comment?)

  • 0f411dc4 should make uncrustify remove those.

Please register or sign in to reply
} }
/** /**
...@@ -9210,8 +9215,9 @@ thumbnail_limit_changed_callback (gpointer user_data) ...@@ -9210,8 +9215,9 @@ thumbnail_limit_changed_callback (gpointer user_data)
cached_thumbnail_limit = g_settings_get_uint64 (nautilus_preferences, cached_thumbnail_limit = g_settings_get_uint64 (nautilus_preferences,
NAUTILUS_PREFERENCES_FILE_THUMBNAIL_LIMIT); NAUTILUS_PREFERENCES_FILE_THUMBNAIL_LIMIT);
//Converts the obtained limit in MB to bytes /*Converts the obtained limit in MB to bytes */
cached_thumbnail_limit *= MEGA_TO_BASE_RATE;; cached_thumbnail_limit *= MEGA_TO_BASE_RATE;
;
/* Tell the world that icons might have changed. We could invent a narrower-scope /* 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 * signal to mean only "thumbnails might have changed" if this ends up being slow
......
...@@ -2003,7 +2003,7 @@ new_folder_dialog_controller_on_name_accepted (NautilusFileNameWidgetController ...@@ -2003,7 +2003,7 @@ new_folder_dialog_controller_on_name_accepted (NautilusFileNameWidgetController
new_folder_done, data); new_folder_done, data);
g_clear_object (&priv->new_folder_controller); g_clear_object (&priv->new_folder_controller);
/* After the dialog is destroyed the focus, is probably in the menu item /* 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 * that created the dialog, but we want the focus to be in the newly created
* folder. * folder.
...@@ -3632,7 +3632,6 @@ debuting_files_add_files_callback (NautilusFilesView *view, ...@@ -3632,7 +3632,6 @@ debuting_files_add_files_callback (NautilusFilesView *view,
{ {
nautilus_file_ref (NAUTILUS_FILE (l->data)); nautilus_file_ref (NAUTILUS_FILE (l->data));
data->added_files = g_list_prepend (data->added_files, NAUTILUS_FILE (l->data)); data->added_files = g_list_prepend (data->added_files, NAUTILUS_FILE (l->data));
} }
g_object_unref (location); g_object_unref (location);
} }
...@@ -3672,8 +3671,8 @@ copy_move_done_data_free (CopyMoveDoneData *data) ...@@ -3672,8 +3671,8 @@ copy_move_done_data_free (CopyMoveDoneData *data)
static void static void
pre_copy_move_add_files_callback (NautilusFilesView *view, pre_copy_move_add_files_callback (NautilusFilesView *view,
GList *new_files, GList *new_files,
CopyMoveDoneData *data) CopyMoveDoneData *data)
{ {
GList *l; GList *l;
...@@ -8411,8 +8410,8 @@ load_directory (NautilusFilesView *view, ...@@ -8411,8 +8410,8 @@ load_directory (NautilusFilesView *view,
attributes); attributes);
priv->file_changed_handler_id = g_signal_connect priv->file_changed_handler_id = g_signal_connect
(priv->directory_as_file, "changed", (priv->directory_as_file, "changed",
G_CALLBACK (file_changed_callback), view); G_CALLBACK (file_changed_callback), view);
nautilus_profile_end (NULL); nautilus_profile_end (NULL);
} }
...@@ -8449,12 +8448,10 @@ finish_loading (NautilusFilesView *view) ...@@ -8449,12 +8448,10 @@ finish_loading (NautilusFilesView *view)
/* Start loading. */ /* Start loading. */
/* Connect handlers to learn about loading progress. */ /* Connect handlers to learn about loading progress. */
priv->done_loading_handler_id = g_signal_connect priv->done_loading_handler_id = g_signal_connect (priv->model, "done-loading",
(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",
priv->load_error_handler_id = g_signal_connect G_CALLBACK (load_error_callback), view);
(priv->model, "load-error",
G_CALLBACK (load_error_callback), view);
/* Monitor the things needed to get the right icon. Also /* Monitor the things needed to get the right icon. Also
* monitor a directory's item count because the "size" * monitor a directory's item count because the "size"
...@@ -8470,11 +8467,11 @@ finish_loading (NautilusFilesView *view) ...@@ -8470,11 +8467,11 @@ finish_loading (NautilusFilesView *view)
NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO; NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;
priv->files_added_handler_id = g_signal_connect priv->files_added_handler_id = g_signal_connect
(priv->model, "files-added", (priv->model, "files-added",
G_CALLBACK (files_added_callback), view); G_CALLBACK (files_added_callback), view);
priv->files_changed_handler_id = g_signal_connect priv->files_changed_handler_id = g_signal_connect
(priv->model, "files-changed", (priv->model, "files-changed",
G_CALLBACK (files_changed_callback), view); G_CALLBACK (files_changed_callback), view);
nautilus_directory_file_monitor_add (priv->model, nautilus_directory_file_monitor_add (priv->model,
&priv->model, &priv->model,
...@@ -9468,13 +9465,13 @@ nautilus_files_view_init (NautilusFilesView *view) ...@@ -9468,13 +9465,13 @@ nautilus_files_view_init (NautilusFilesView *view)
"<control>plus", "<control>plus",
NULL NULL
}; };
const gchar *move_to_trash_accels[] = const gchar *move_to_trash_accels[] =
{ {
"Delete", "Delete",
"KP_Delete", "KP_Delete",
NULL NULL
}; };
const gchar *delete_permanently_accels[] = const gchar *delete_permanently_accels[] =
{ {
"<shift>Delete", "<shift>Delete",
"<shift>KP_Delete", "<shift>KP_Delete",
......
...@@ -184,13 +184,13 @@ slurp_key_string (const char *uri, ...@@ -184,13 +184,13 @@ slurp_key_string (const char *uri,
} }
gboolean gboolean
nautilus_link_local_create (const char *directory_uri, nautilus_link_local_create (const char *directory_uri,
const char *base_name, const char *base_name,
const char *display_name, const char *display_name,
const char *image, const char *image,
const char *target_uri, const char *target_uri,
int screen, int screen,
gboolean unique_filename) gboolean unique_filename)
{ {
char *real_directory_uri; char *real_directory_uri;
char *contents; char *contents;
......
...@@ -443,8 +443,8 @@ check_starred_status (GtkTreeModel *model, ...@@ -443,8 +443,8 @@ check_starred_status (GtkTreeModel *model,
static void static void
on_starred_files_changed (NautilusTagManager *tag_manager, on_starred_files_changed (NautilusTagManager *tag_manager,
GList *changed_files, GList *changed_files,
gpointer user_data) gpointer user_data)
{ {
NautilusListView *list_view; NautilusListView *list_view;
...@@ -1591,10 +1591,10 @@ apply_columns_settings (NautilusListView *list_view, ...@@ -1591,10 +1591,10 @@ apply_columns_settings (NautilusListView *list_view,
static void static void
starred_cell_data_func (GtkTreeViewColumn *column, starred_cell_data_func (GtkTreeViewColumn *column,
GtkCellRenderer *renderer, GtkCellRenderer *renderer,
GtkTreeModel *model, GtkTreeModel *model,
GtkTreeIter *iter, GtkTreeIter *iter,
NautilusListView *view) NautilusListView *view)
{ {
g_autofree gchar *text = NULL; g_autofree gchar *text = NULL;
g_autofree gchar *uri = NULL; g_autofree gchar *uri = NULL;
...@@ -1632,7 +1632,6 @@ starred_cell_data_func (GtkTreeViewColumn *column, ...@@ -1632,7 +1632,6 @@ starred_cell_data_func (GtkTreeViewColumn *column,
g_object_set (renderer, g_object_set (renderer,
"icon-name", "non-starred-symbolic", "icon-name", "non-starred-symbolic",
NULL); NULL);
} }
nautilus_file_unref (file); nautilus_file_unref (file);
...@@ -1663,7 +1662,7 @@ filename_cell_data_func (GtkTreeViewColumn *column, ...@@ -1663,7 +1662,7 @@ filename_cell_data_func (GtkTreeViewColumn *column,
-1); -1);
escaped_name = g_markup_escape_text (text, -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)); directory = nautilus_files_view_get_model (NAUTILUS_FILES_VIEW (view));
...@@ -2326,8 +2325,8 @@ get_default_visible_columns (NautilusListView *list_view) ...@@ -2326,8 +2325,8 @@ get_default_visible_columns (NautilusListView *list_view)
NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS); NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS);
} }
static GList* static GList *
default_column_array_as_list (gchar** array) default_column_array_as_list (gchar **array)
{ {
GList *res = NULL; GList *res = NULL;
gint i = 0; gint i = 0;
...@@ -2348,7 +2347,7 @@ get_visible_columns (NautilusListView *list_view) ...@@ -2348,7 +2347,7 @@ get_visible_columns (NautilusListView *list_view)
g_autoptr (GList) visible_columns = NULL; g_autoptr (GList) visible_columns = NULL;
GPtrArray *res; GPtrArray *res;
GList *l; GList *l;
g_autofree gchar* uri = NULL; g_autofree gchar *uri = NULL;
gboolean in_xdg_dirs; gboolean in_xdg_dirs;
gboolean is_starred; gboolean is_starred;
...@@ -3802,7 +3801,7 @@ nautilus_list_view_reveal_for_selection_context_menu (NautilusFilesView *view) ...@@ -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 = gtk_tree_selection_get_selected_rows (tree_selection, NULL);
list = g_list_last (list); 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); g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
} }
......
...@@ -717,7 +717,7 @@ get_activation_action (NautilusFile *file) ...@@ -717,7 +717,7 @@ get_activation_action (NautilusFile *file)
char *activation_uri; char *activation_uri;
gboolean handles_extract = FALSE; gboolean handles_extract = FALSE;
g_autoptr (GAppInfo) app_info = NULL; g_autoptr (GAppInfo) app_info = NULL;
const gchar* app_id; const gchar *app_id;
app_info = nautilus_mime_get_default_application_for_file (file); app_info = nautilus_mime_get_default_application_for_file (file);
if (app_info != NULL) if (app_info != NULL)
......
<
...@@ -142,7 +142,7 @@ set_copy_move_dialog_text (FileConflictDialogData *data) ...@@ -142,7 +142,7 @@ set_copy_move_dialog_text (FileConflictDialogData *data)