[nautilus/merge_replace_dialog: 14/23] Fix indentation.

[Cosimo Cecchi <cosimoc src gnome org>]

commit d44f93b71adf569455d23723d575a2347f063c6e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Apr 8 18:10:48 2010 +0200

    Fix indentation.

 .../nautilus-file-conflict-dialog.c                |   17 +++++++--------
 .../nautilus-file-conflict-dialog.h                |   21 +++++++++++++-----
 libnautilus-private/nautilus-file-operations.c     |   22 ++++++++++----------
 3 files changed, 34 insertions(+), 26 deletions(-)
---
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c
index ae6eb65..fe8d3a7 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -229,14 +229,14 @@ set_source_and_destination (GtkWidget *w,
 {
 	NautilusFileConflictDialog *dialog;
 	NautilusFileConflictDialogDetails *details;
-	
+
 	dialog = NAUTILUS_FILE_CONFLICT_DIALOG (w);
 	details = dialog->details;
-	
+
 	details->source = source;
 	details->destination = destination;
 	details->dest_dir = dest_dir;
-	
+
 	build_dialog_appearance (dialog);
 }
 
@@ -278,17 +278,17 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
 	GtkWidget *widget;
 	NautilusFileConflictDialogDetails *details;
 	GtkDialog *dialog;
-	
+
 	details = fcd->details = NAUTILUS_FILE_CONFLICT_DIALOG_GET_PRIVATE (fcd);
 	dialog = GTK_DIALOG (fcd);
-	
+
 	/* Setup the main hbox */
 	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (dialog->vbox),
 			    hbox, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
 	gtk_widget_show (hbox);
-	
+
 	/* Setup the dialog image */
 	widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
 					   GTK_ICON_SIZE_DIALOG);
@@ -302,14 +302,13 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
 	gtk_box_pack_start (GTK_BOX (hbox),
 			    vbox, FALSE, FALSE, 0);
 	gtk_widget_show (vbox);
-	
+
 	/* Setup the vbox for the dialog labels */
 	widget = gtk_vbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (vbox),
 			    widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 	details->titles_vbox = widget;
-	
 
 	/* Setup the hboxes to pack file infos into */
 	hbox = gtk_hbox_new (FALSE, 12);
@@ -347,7 +346,7 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
 	g_signal_connect_object (widget, "notify::text",
 				 G_CALLBACK (entry_text_notify_cb),
 				 dialog, 0);
-	
+
 	/* Setup HIG properties */
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);		
 	gtk_box_set_spacing (GTK_BOX (dialog->vbox), 14);
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.h b/libnautilus-private/nautilus-file-conflict-dialog.h
index 452f742..a76018d 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.h
+++ b/libnautilus-private/nautilus-file-conflict-dialog.h
@@ -30,12 +30,21 @@
 #include <gio/gio.h>
 #include <gtk/gtkmessagedialog.h>
 
-#define NAUTILUS_TYPE_FILE_CONFLICT_DIALOG         (nautilus_file_conflict_dialog_get_type ())
-#define NAUTILUS_FILE_CONFLICT_DIALOG(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG, NautilusFileConflictDialog))
-#define NAUTILUS_FILE_CONFLICT_DIALOG_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG, NautilusFileConflictDialogClass))
-#define NAUTILUS_IS_FILE_CONFLICT_DIALOG(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG))
-#define NAUTILUS_IS_FILE_CONFLICT_DIALOG_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG))
-#define NAUTILUS_FILE_CONFLICT_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG, NautilusFileConflictDialogClass))
+#define NAUTILUS_TYPE_FILE_CONFLICT_DIALOG \
+	(nautilus_file_conflict_dialog_get_type ())
+#define NAUTILUS_FILE_CONFLICT_DIALOG(o) \
+	(G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG,\
+				     NautilusFileConflictDialog))
+#define NAUTILUS_FILE_CONFLICT_DIALOG_CLASS(k) \
+	(G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG,\
+				 NautilusFileConflictDialogClass))
+#define NAUTILUS_IS_FILE_CONFLICT_DIALOG(o) \
+	(G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG))
+#define NAUTILUS_IS_FILE_CONFLICT_DIALOG_CLASS(k) \
+	(G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG))
+#define NAUTILUS_FILE_CONFLICT_DIALOG_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_FILE_CONFLICT_DIALOG,\
+				    NautilusFileConflictDialogClass))
 
 typedef struct _NautilusFileConflictDialog        NautilusFileConflictDialog;
 typedef struct _NautilusFileConflictDialogClass   NautilusFileConflictDialogClass;
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 26bcb2c..52bc77f 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -3850,13 +3850,13 @@ do_run_conflict_dialog (gpointer _data)
 	ConflictDialogData *data = _data;
 	GtkWidget *dialog;
 	int response;
-	
+
 	dialog = nautilus_file_conflict_dialog_new (data->parent,
 						    data->src,
 						    data->dest,
 						    data->dest_dir);
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
-	
+
 	if (response == CONFLICT_RESPONSE_RENAME) {
 		data->resp_data->new_name = 
 			nautilus_file_conflict_dialog_get_new_name (NAUTILUS_FILE_CONFLICT_DIALOG (dialog));
@@ -3866,11 +3866,11 @@ do_run_conflict_dialog (gpointer _data)
 			   nautilus_file_conflict_dialog_get_apply_to_all 
 				(NAUTILUS_FILE_CONFLICT_DIALOG (dialog));
 	}
-	
+
 	data->resp_data->id = response;
-	
+
 	gtk_widget_destroy (dialog);
-	
+
 	return FALSE;
 }
 
@@ -3882,9 +3882,9 @@ run_conflict_dialog (CommonJob *job,
 {
 	ConflictDialogData *data;
 	ConflictResponseData *resp_data;
-	
+
 	g_timer_stop (job->time);
-	
+
 	data = g_slice_new0 (ConflictDialogData);
 	data->parent = job->parent_window;
 	data->src = src;
@@ -3894,18 +3894,18 @@ run_conflict_dialog (CommonJob *job,
 	resp_data = g_slice_new0 (ConflictResponseData);
 	resp_data->new_name = NULL;
 	data->resp_data = resp_data;
-	
+
 	nautilus_progress_info_pause (job->progress);
 	g_io_scheduler_job_send_to_mainloop (job->io_job,
 					     do_run_conflict_dialog,
 					     data,
 					     NULL);
 	nautilus_progress_info_resume (job->progress);
-	
+
 	g_slice_free (ConflictDialogData, data);
-	
+
 	g_timer_continue (job->time);
-	
+
 	return resp_data;
 }