summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/uncrustify.cfg1
-rw-r--r--src/nautilus-batch-rename-dialog.c2
-rw-r--r--src/nautilus-canvas-container.c2
-rw-r--r--src/nautilus-file-conflict-dialog.c6
-rw-r--r--src/nautilus-file.c2
5 files changed, 7 insertions, 6 deletions
diff --git a/data/uncrustify.cfg b/data/uncrustify.cfg
index 3883681ef..a4777c8f4 100644
--- a/data/uncrustify.cfg
+++ b/data/uncrustify.cfg
@@ -55,6 +55,7 @@ sp_between_ptr_star = remove # "**var" vs "* *var"
sp_inside_paren = remove # "( 1 )" vs "(1)"
sp_inside_fparen = remove # "( 1 )" vs "(1)" - functions
sp_inside_sparen = remove # "( 1 )" vs "(1)" - if/for/etc
+sp_before_sparen = force # "if (" vs "if(" - if/for/etc
sp_after_cast = force # "(int) a" vs "(int)a"
sp_func_call_user_paren = remove # For gettext, "_()" vs. "_ ()"
set func_call_user _ N_ C_ # Needed for sp_after_cast
diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c
index 9c278a327..5f3040497 100644
--- a/src/nautilus-batch-rename-dialog.c
+++ b/src/nautilus-batch-rename-dialog.c
@@ -1375,7 +1375,7 @@ numbering_tag_is_some_added (NautilusBatchRenameDialog *self)
static void
update_display_text (NautilusBatchRenameDialog *dialog)
{
- if(dialog->selection == NULL)
+ if (dialog->selection == NULL)
{
return;
}
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index 71bcf1904..44b637166 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -2910,7 +2910,7 @@ keyboard_space (NautilusCanvasContainer *container,
{
icon_toggle_selected (container, container->details->focus);
g_signal_emit (container, signals[SELECTION_CHANGED], 0);
- if (container->details->focus->is_selected)
+ if (container->details->focus->is_selected)
{
container->details->range_selection_base_icon = container->details->focus;
}
diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c
index 2bbe37fef..28fa972a3 100644
--- a/src/nautilus-file-conflict-dialog.c
+++ b/src/nautilus-file-conflict-dialog.c
@@ -180,8 +180,8 @@ static void
entry_text_changed_cb (GtkEditable *entry,
NautilusFileConflictDialog *dialog)
{
- if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), "") != 0 &&
- g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), dialog->conflict_name) != 0)
+ if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), "") != 0 &&
+ g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (entry)), dialog->conflict_name) != 0)
{
gtk_widget_set_sensitive (dialog->rename_button, TRUE);
}
@@ -241,7 +241,7 @@ checkbox_toggled_cb (GtkToggleButton *t,
{
gtk_widget_set_sensitive (dialog->expander, !gtk_toggle_button_get_active (t));
- if (!gtk_toggle_button_get_active (t))
+ if (!gtk_toggle_button_get_active (t))
{
gtk_widget_hide (dialog->replace_button);
gtk_widget_show (dialog->rename_button);
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 124dc0287..280bbb9e3 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -3583,7 +3583,7 @@ compare_by_time (NautilusFile *file_1,
/* Now time_known_1 is equal to time_known_2. Check whether
* we failed to get modification times for files
*/
- if(time_known_1 == UNKNOWABLE || time_known_1 == UNKNOWN)
+ if (time_known_1 == UNKNOWABLE || time_known_1 == UNKNOWN)
{
return 0;
}