[gthumb] Minor formatting corrections to previous commit

[Michael J. Chudobiak <mjc src gnome org>]

commit d018661145a5615b8988157d182f04ba637acc31
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Wed Jul 8 21:09:51 2009 -0400

    Minor formatting corrections to previous commit

 src/dlg-duplicates.c |    5 ++---
 src/dlg-file-utils.c |   33 +++++++++++++++------------------
 src/gth-fullscreen.c |    3 +--
 3 files changed, 18 insertions(+), 23 deletions(-)
---
diff --git a/src/dlg-duplicates.c b/src/dlg-duplicates.c
index 1922195..78fd216 100644
--- a/src/dlg-duplicates.c
+++ b/src/dlg-duplicates.c
@@ -629,10 +629,9 @@ get_checked_images_as_fd (DialogData *data)
 				    DCOLUMN_CHECKED, &checked,
 				    DCOLUMN_IMAGE_DATA, &idata, -1);
 
-		if (checked)
-		{
+		if (checked) {
 			FileData *fd;
-			fd = file_data_new_from_gfile(idata->gfile);
+			fd = file_data_new_from_gfile (idata->gfile);
 			list = g_list_prepend (list, fd);
 		}
 
diff --git a/src/dlg-file-utils.c b/src/dlg-file-utils.c
index e8ab592..4d5d107 100644
--- a/src/dlg-file-utils.c
+++ b/src/dlg-file-utils.c
@@ -222,8 +222,8 @@ typedef struct {
 } ConfirmFileDeleteData;
 
 static void
-real_files_delete__continue2 (GError	    *error,
-			      gpointer       data)
+real_files_delete__continue2 (GError   *error,
+			      gpointer  data)
 {
 	ConfirmFileDeleteData *cfddata = data;
 
@@ -276,24 +276,21 @@ real_files_delete__no_trash (ConfirmFileDeleteData *cfddata)
 
 
 static void
-real_files_delete__continue (GError	    *error,
-			      gpointer       data)
+real_files_delete__continue (GError   *error,
+			     gpointer  data)
 {
 	ConfirmFileDeleteData *cfddata = data;
 
-	if ((error != NULL))
-	{
+	if ((error != NULL)) {
 		_gtk_error_dialog_run (GTK_WINDOW (cfddata->window),
 				       "%s %s",
 				       _("Could not delete the images:"),
 				       error->message);
 		file_data_list_free (cfddata->file_list);
 		g_free (cfddata);
-	}
-	else if (cfddata->file_list != NULL) {
+	} else if (cfddata->file_list != NULL) {
 		real_files_delete__no_trash (cfddata);
-	}
-	else {
+	} else {
 		file_data_list_free (cfddata->file_list);
 		g_free (cfddata);
 	}
@@ -464,8 +461,8 @@ dlg_file_move__ask_dest (GthWindow  *window,
 
 
 static void
-file_copy_ask__continue (GError	       *error,
-			 gpointer       data)
+file_copy_ask__continue (GError	  *error,
+			 gpointer  data)
 {
 	GtkWidget *file_sel = data;
 	GthWindow *window;
@@ -1844,7 +1841,8 @@ trash_next_file (gpointer data)
 
 	g_file_trash (gfile, NULL, &error);
 	if (error == NULL) {
-		fddata->gfile_list = g_list_append (fddata->gfile_list, g_file_dup(gfile));
+		fddata->gfile_list = g_list_append (fddata->gfile_list, gfile);
+		g_object_ref (gfile);
 		file_data_unref (fd);
 		g_list_free (link);
 		fddata->count++;
@@ -2039,8 +2037,7 @@ delete_next_file (gpointer data)
 
 	file_delete_progress_update_gfile (fddata);
 
-	if (fddata->fd_list == NULL || g_cancellable_is_cancelled (fddata->cancelled))
-	{
+	if (fddata->fd_list == NULL || g_cancellable_is_cancelled (fddata->cancelled)) {
 		(*fddata->done_func) (NULL, fddata->done_data);
 		files_delete__done (fddata);
 		return FALSE;
@@ -2053,13 +2050,13 @@ delete_next_file (gpointer data)
 
 	g_file_delete (gfile, NULL, &error);
 	if (error == NULL) {
-		fddata->gfile_list = g_list_append (fddata->gfile_list, g_file_dup (gfile));
+		fddata->gfile_list = g_list_append (fddata->gfile_list, gfile);
+		g_object_ref (gfile);
 		fddata->count++;
 		file_data_unref (fd);
 		g_list_free (link);
 		return TRUE;
-	}
-	else {
+	} else {
 		(*fddata->done_func) (error, fddata->done_data);
 		files_delete__done (fddata);
 		g_error_free (error);
diff --git a/src/gth-fullscreen.c b/src/gth-fullscreen.c
index 35c66d9..5a8f854 100644
--- a/src/gth-fullscreen.c
+++ b/src/gth-fullscreen.c
@@ -1108,8 +1108,7 @@ delete_current_image (GthFullscreen *fullscreen)
 		dlg_file_delete__confirm (GTH_WINDOW (fullscreen),
 					  fd_list,
 					  _("The image will be moved to the Trash, are you sure?"));
-	}
-	else {
+	} else {
 		const char *image_filename;
 		GList 	   *filename_list;