diff src/globals.c @ 341:15c6b94545a2

Move safe_delete* and in place rename options to file_ops struct. Re-order rc file a bit.
author zas_
date Sat, 12 Apr 2008 22:04:29 +0000
parents 77103f3f2cb1
children 07490120df2d
line wrap: on
line diff
--- a/src/globals.c	Sat Apr 12 21:45:30 2008 +0000
+++ b/src/globals.c	Sat Apr 12 22:04:29 2008 +0000
@@ -44,11 +44,11 @@
 	
 	options->startup_path_enable = FALSE;
 	options->startup_path = NULL;
-	options->confirm_delete = TRUE;
-	options->enable_delete_key = TRUE;
-	options->safe_delete_enable = FALSE;
-	options->safe_delete_path = NULL;
-	options->safe_delete_size = 128;
+	options->file_ops.confirm_delete = TRUE;
+	options->file_ops.enable_delete_key = TRUE;
+	options->file_ops.safe_delete_enable = FALSE;
+	options->file_ops.safe_delete_path = NULL;
+	options->file_ops.safe_delete_folder_maxsize = 128;
 	options->layout.tools_restore_state = FALSE;
 	options->image.zoom_mode = ZOOM_RESET_ORIGINAL;
 	options->image.zoom_2pass = TRUE;
@@ -80,7 +80,7 @@
 	options->slideshow.repeat = FALSE;
 	
 	options->mousewheel_scrolls = FALSE;
-	options->enable_in_place_rename = TRUE;
+	options->file_ops.enable_in_place_rename = TRUE;
 	
 	options->recent_list_max = 10;