mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-27 11:29:24 +00:00
general: adjust uncrustify style
https://bugzilla.gnome.org/show_bug.cgi?id=770564
This commit is contained in:
parent
cc5126487b
commit
0abaab1c44
|
@ -98,7 +98,7 @@ mod_full_brace_for = force
|
|||
mod_full_brace_function = force
|
||||
mod_full_brace_if = force
|
||||
mod_full_brace_while = force
|
||||
mod_case_brace = add
|
||||
mod_case_brace = force
|
||||
|
||||
# Align
|
||||
align_func_params = true
|
||||
|
@ -119,6 +119,9 @@ cmt_star_cont = true # Whether to put a star on
|
|||
cmt_sp_after_star_cont = 1 # The number of spaces to insert after the star on subsequent comment lines
|
||||
cmt_c_nl_start = false # false/true
|
||||
cmt_c_nl_end = true # false/true
|
||||
# For multi-line comments with a '*' lead, remove leading spaces if the first and last lines of
|
||||
# the comment are the same length. Default=True
|
||||
cmt_multi_check_last = false
|
||||
|
||||
# Encoding
|
||||
utf8_bom = remove
|
||||
|
|
|
@ -3493,7 +3493,7 @@ eel_canvas_set_scroll_region (EelCanvas *canvas,
|
|||
gtk_adjustment_get_value (hadjustment) + canvas->zoom_xofs,
|
||||
gtk_adjustment_get_value (vadjustment) + canvas->zoom_yofs,
|
||||
/*canvas->zoom_xofs,
|
||||
* canvas->zoom_yofs,*/
|
||||
* canvas->zoom_yofs,*/
|
||||
&wxofs, &wyofs);
|
||||
|
||||
canvas->scroll_x1 = x1;
|
||||
|
|
|
@ -489,6 +489,7 @@ get_arg_type_from_format (EelPrintfHandler *custom_handlers,
|
|||
}
|
||||
return ARG_TYPE_INT;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'e':
|
||||
case 'E':
|
||||
|
@ -505,16 +506,21 @@ get_arg_type_from_format (EelPrintfHandler *custom_handlers,
|
|||
}
|
||||
return ARG_TYPE_DOUBLE;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'c':
|
||||
{
|
||||
return ARG_TYPE_INT;
|
||||
}
|
||||
break;
|
||||
|
||||
case 's':
|
||||
case 'p':
|
||||
case 'n':
|
||||
{
|
||||
return ARG_TYPE_POINTER;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return ARG_TYPE_INVALID;
|
||||
}
|
||||
|
|
|
@ -232,7 +232,10 @@ nautilus_desktop_link_new (NautilusDesktopLinkType type)
|
|||
|
||||
default:
|
||||
case NAUTILUS_DESKTOP_LINK_MOUNT:
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
create_icon_file (link);
|
||||
|
|
|
@ -366,19 +366,25 @@ nautilus_canvas_container_get_grid_size_for_zoom_level (NautilusCanvasZoomLevel
|
|||
{
|
||||
return SMALL_ICON_GRID_WIDTH;
|
||||
}
|
||||
break;
|
||||
|
||||
case NAUTILUS_CANVAS_ZOOM_LEVEL_STANDARD:
|
||||
{
|
||||
return STANDARD_ICON_GRID_WIDTH;
|
||||
}
|
||||
break;
|
||||
|
||||
case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE:
|
||||
{
|
||||
return LARGE_ICON_GRID_WIDTH;
|
||||
}
|
||||
break;
|
||||
|
||||
case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER:
|
||||
{
|
||||
return LARGER_ICON_GRID_WIDTH;
|
||||
}
|
||||
break;
|
||||
}
|
||||
g_return_val_if_reached (STANDARD_ICON_GRID_WIDTH);
|
||||
}
|
||||
|
@ -392,19 +398,25 @@ nautilus_canvas_container_get_icon_size_for_zoom_level (NautilusCanvasZoomLevel
|
|||
{
|
||||
return NAUTILUS_CANVAS_ICON_SIZE_SMALL;
|
||||
}
|
||||
break;
|
||||
|
||||
case NAUTILUS_CANVAS_ZOOM_LEVEL_STANDARD:
|
||||
{
|
||||
return NAUTILUS_CANVAS_ICON_SIZE_STANDARD;
|
||||
}
|
||||
break;
|
||||
|
||||
case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE:
|
||||
{
|
||||
return NAUTILUS_CANVAS_ICON_SIZE_LARGE;
|
||||
}
|
||||
break;
|
||||
|
||||
case NAUTILUS_CANVAS_ZOOM_LEVEL_LARGER:
|
||||
{
|
||||
return NAUTILUS_CANVAS_ICON_SIZE_LARGER;
|
||||
}
|
||||
break;
|
||||
}
|
||||
g_return_val_if_reached (NAUTILUS_CANVAS_ICON_SIZE_STANDARD);
|
||||
}
|
||||
|
@ -3613,7 +3625,10 @@ closest_in_90_degrees (NautilusCanvasContainer *container,
|
|||
break;
|
||||
|
||||
default:
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
dist = dx * dx + dy * dy;
|
||||
|
@ -6072,8 +6087,11 @@ item_event_callback (EelCanvasItem *item,
|
|||
}
|
||||
|
||||
default:
|
||||
{
|
||||
container->details->double_clicked = FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -8058,8 +8076,11 @@ nautilus_canvas_container_accessible_do_action (AtkAction *accessible,
|
|||
break;
|
||||
|
||||
default:
|
||||
{
|
||||
g_warning ("Invalid action passed to NautilusCanvasContainerAccessible::do_action");
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -1939,8 +1939,8 @@ drag_data_received_callback (GtkWidget *widget,
|
|||
nautilus_file_changes_consume_changes (TRUE);
|
||||
success = TRUE;
|
||||
}
|
||||
break;
|
||||
} /* NAUTILUS_ICON_DND_XDNDDIRECTSAVE */
|
||||
break;
|
||||
}
|
||||
gtk_drag_finish (context, success, FALSE, time);
|
||||
|
||||
|
|
|
@ -5483,10 +5483,10 @@ retry:
|
|||
if (is_merge)
|
||||
{
|
||||
/* On merge we now write in the target directory, which may not
|
||||
* be in the same directory as the source, even if the parent is
|
||||
* (if the merged directory is a mountpoint). This could cause
|
||||
* problems as we then don't transcode filenames.
|
||||
* We just set same_fs to FALSE which is safe but a bit slower. */
|
||||
* be in the same directory as the source, even if the parent is
|
||||
* (if the merged directory is a mountpoint). This could cause
|
||||
* problems as we then don't transcode filenames.
|
||||
* We just set same_fs to FALSE which is safe but a bit slower. */
|
||||
same_fs = FALSE;
|
||||
}
|
||||
|
||||
|
|
|
@ -490,7 +490,8 @@ copy_move_conflict_ask_user_action (GtkWindow *parent_window,
|
|||
return data->response;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
typedef struct
|
||||
{
|
||||
GtkWindow *parent_window;
|
||||
NautilusFile *file;
|
||||
} HandleUnsupportedFileData;
|
||||
|
@ -499,7 +500,7 @@ static gboolean
|
|||
open_file_in_application (gpointer user_data)
|
||||
{
|
||||
HandleUnsupportedFileData *data;
|
||||
g_autoptr (GAppInfo) application = NULL;
|
||||
g_autoptr (GAppInfo) application = NULL;
|
||||
|
||||
data = user_data;
|
||||
|
||||
|
|
|
@ -869,8 +869,8 @@ select_all_at_idle (gpointer user_data)
|
|||
}
|
||||
|
||||
static void
|
||||
name_field_activate (GtkWidget *name_field,
|
||||
gpointer user_data)
|
||||
name_field_activate (GtkWidget *name_field,
|
||||
gpointer user_data)
|
||||
{
|
||||
NautilusPropertiesWindow *window;
|
||||
|
||||
|
@ -2757,7 +2757,7 @@ location_show_original (NautilusPropertiesWindow *window)
|
|||
NautilusFile *file;
|
||||
|
||||
/* there is no way a recent item will be mixed with
|
||||
* other items so just pick the first file to check */
|
||||
* other items so just pick the first file to check */
|
||||
file = NAUTILUS_FILE (g_list_nth_data (window->details->original_files, 0));
|
||||
return (file != NULL && !nautilus_file_is_in_recent (file));
|
||||
}
|
||||
|
|
|
@ -193,8 +193,8 @@ nautilus_thumbnail_remove_from_queue (const char *file_uri)
|
|||
g_mutex_lock (&thumbnails_mutex);
|
||||
|
||||
/*********************************
|
||||
* MUTEX LOCKED
|
||||
*********************************/
|
||||
* MUTEX LOCKED
|
||||
*********************************/
|
||||
|
||||
if (thumbnails_to_make_hash)
|
||||
{
|
||||
|
@ -209,8 +209,8 @@ nautilus_thumbnail_remove_from_queue (const char *file_uri)
|
|||
}
|
||||
|
||||
/*********************************
|
||||
* MUTEX UNLOCKED
|
||||
*********************************/
|
||||
* MUTEX UNLOCKED
|
||||
*********************************/
|
||||
|
||||
#ifdef DEBUG_THUMBNAILS
|
||||
g_message ("(Remove from queue) Unlocking mutex\n");
|
||||
|
@ -229,8 +229,8 @@ nautilus_thumbnail_prioritize (const char *file_uri)
|
|||
g_mutex_lock (&thumbnails_mutex);
|
||||
|
||||
/*********************************
|
||||
* MUTEX LOCKED
|
||||
*********************************/
|
||||
* MUTEX LOCKED
|
||||
*********************************/
|
||||
|
||||
if (thumbnails_to_make_hash)
|
||||
{
|
||||
|
@ -244,8 +244,8 @@ nautilus_thumbnail_prioritize (const char *file_uri)
|
|||
}
|
||||
|
||||
/*********************************
|
||||
* MUTEX UNLOCKED
|
||||
*********************************/
|
||||
* MUTEX UNLOCKED
|
||||
*********************************/
|
||||
|
||||
#ifdef DEBUG_THUMBNAILS
|
||||
g_message ("(Prioritize) Unlocking mutex\n");
|
||||
|
@ -255,8 +255,8 @@ nautilus_thumbnail_prioritize (const char *file_uri)
|
|||
|
||||
|
||||
/***************************************************************************
|
||||
* Thumbnail Thread Functions.
|
||||
***************************************************************************/
|
||||
* Thumbnail Thread Functions.
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
/* This is a one-shot idle callback called from the main loop to call
|
||||
|
@ -413,8 +413,8 @@ nautilus_create_thumbnail (NautilusFile *file)
|
|||
g_mutex_lock (&thumbnails_mutex);
|
||||
|
||||
/*********************************
|
||||
* MUTEX LOCKED
|
||||
*********************************/
|
||||
* MUTEX LOCKED
|
||||
*********************************/
|
||||
|
||||
if (thumbnails_to_make_hash == NULL)
|
||||
{
|
||||
|
@ -459,8 +459,8 @@ nautilus_create_thumbnail (NautilusFile *file)
|
|||
}
|
||||
|
||||
/*********************************
|
||||
* MUTEX UNLOCKED
|
||||
*********************************/
|
||||
* MUTEX UNLOCKED
|
||||
*********************************/
|
||||
|
||||
#ifdef DEBUG_THUMBNAILS
|
||||
g_message ("(Main Thread) Unlocking mutex\n");
|
||||
|
@ -491,8 +491,8 @@ thumbnail_thread_func (GTask *task,
|
|||
g_mutex_lock (&thumbnails_mutex);
|
||||
|
||||
/*********************************
|
||||
* MUTEX LOCKED
|
||||
*********************************/
|
||||
* MUTEX LOCKED
|
||||
*********************************/
|
||||
|
||||
/* Pop the last thumbnail we just made off the head of the
|
||||
* list and free it. I did this here so we only have to lock
|
||||
|
@ -533,8 +533,8 @@ thumbnail_thread_func (GTask *task,
|
|||
currently_thumbnailing = info;
|
||||
current_orig_mtime = info->original_file_mtime;
|
||||
/*********************************
|
||||
* MUTEX UNLOCKED
|
||||
*********************************/
|
||||
* MUTEX UNLOCKED
|
||||
*********************************/
|
||||
|
||||
#ifdef DEBUG_THUMBNAILS
|
||||
g_message ("(Thumbnail Thread) Unlocking mutex\n");
|
||||
|
|
|
@ -104,7 +104,7 @@ typedef struct
|
|||
/* Load state */
|
||||
GCancellable *find_mount_cancellable;
|
||||
/* It could be either the view is loading the files or the search didn't
|
||||
* finish. Used for showing a spinner to provide feedback to the user. */
|
||||
* finish. Used for showing a spinner to provide feedback to the user. */
|
||||
gboolean allow_stop;
|
||||
gboolean needs_reload;
|
||||
gchar *pending_search_text;
|
||||
|
|
Loading…
Reference in a new issue