Mercurial > geeqie.yaz

diff src/rcfile.c @ 629:1fa2cb6d9d65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename options: startup_path_enable -> startup.restore_path startup_path -> startup.path Geeqie is still able to read old options.
author zas_
date Sun, 11 May 2008 12:23:26 +0000
parents b1a922a32d9c
children 83d3ded39e49
line wrap: on
line diff
--- a/src/rcfile.c	Sun May 11 11:46:48 2008 +0000
+++ b/src/rcfile.c	Sun May 11 12:23:26 2008 +0000
@@ -309,9 +309,6 @@
 	WRITE_BOOL(update_on_time_change);
 	WRITE_SEPARATOR();
 
-	WRITE_BOOL(startup_path_enable);
-	WRITE_CHAR(startup_path);
-
 	WRITE_BOOL(progressive_key_scrolling);
 	WRITE_BOOL(enable_metadata_dirs);
 	WRITE_BOOL(save_metadata_in_image_file);
@@ -325,6 +322,12 @@
 	WRITE_BOOL(place_dialogs_under_mouse);
 
 
+	WRITE_SUBTITLE("Startup Options");
+
+	WRITE_BOOL(startup.restore_path);
+	WRITE_CHAR(startup.path);
+
+
 	WRITE_SUBTITLE("File operations Options");
 
 	WRITE_BOOL(file_ops.enable_in_place_rename);
@@ -625,9 +628,6 @@
 		READ_BOOL(lazy_image_sync);
 		READ_BOOL(update_on_time_change);
 
-		READ_BOOL(startup_path_enable);
-		READ_CHAR(startup_path);
-
 		READ_INT(duplicates_similarity_threshold);
 
 		READ_BOOL(progressive_key_scrolling);
@@ -641,7 +641,14 @@
 		READ_INT(dnd_icon_size);
 		READ_BOOL(place_dialogs_under_mouse);
 
+		/* startup options */
+		
+		COMPAT_READ_BOOL(startup_path_enable, startup.restore_path); /* 2008/05/11 */
+		READ_BOOL(startup.restore_path);
 
+		COMPAT_READ_CHAR(startup_path, startup.path); /* 2008/05/11 */
+		READ_CHAR(startup.path);
+	
 		/* layout options */
 
 		READ_INT(layout.style);