# HG changeset patch
# User nadvornik
# Date 1236725532 0
# Node ID 5a534e1501e19d01091b9258bca933c19845714c
# Parent  2ebf1a80ef64fc662e38d8e25669780c5029dc33
fixed saving of file_view_type

diff -r 2ebf1a80ef64 -r 5a534e1501e1 src/layout.c
--- a/src/layout.c	Tue Mar 10 17:58:30 2009 +0000
+++ b/src/layout.c	Tue Mar 10 22:52:12 2009 +0000
@@ -841,7 +841,7 @@
 
 static GtkWidget *layout_list_new(LayoutWindow *lw)
 {
-	lw->vf = vf_new(lw->file_view_type, NULL);
+	lw->vf = vf_new(lw->options.file_view_type, NULL);
 	vf_set_layout(lw->vf, lw);
 
 	vf_set_status_func(lw->vf, layout_list_status_cb, lw);
@@ -849,7 +849,7 @@
 
 	vf_marks_set(lw->vf, lw->options.show_marks);
 
-	switch (lw->file_view_type)
+	switch (lw->options.file_view_type)
 	{
 	case FILEVIEW_ICON:
 		break;
@@ -1235,10 +1235,10 @@
 {
 	if (!layout_valid(&lw)) return;
 
-	if (lw->options.dir_view_type == dir_view_type && lw->file_view_type == file_view_type) return;
+	if (lw->options.dir_view_type == dir_view_type && lw->options.file_view_type == file_view_type) return;
 
 	lw->options.dir_view_type = dir_view_type;
-	lw->file_view_type = file_view_type;
+	lw->options.file_view_type = file_view_type;
 
 	layout_style_set(lw, -1, NULL);
 }
@@ -1248,7 +1248,7 @@
 	if (!layout_valid(&lw)) return FALSE;
 
 	*dir_view_type = lw->options.dir_view_type;
-	*file_view_type = lw->file_view_type;
+	*file_view_type = lw->options.file_view_type;
 
 	return TRUE;
 }
diff -r 2ebf1a80ef64 -r 5a534e1501e1 src/layout_util.c
--- a/src/layout_util.c	Tue Mar 10 17:58:30 2009 +0000
+++ b/src/layout_util.c	Tue Mar 10 22:52:12 2009 +0000
@@ -580,7 +580,7 @@
 	LayoutWindow *lw = data;
 
 	layout_exit_fullscreen(lw);
-	layout_views_set(lw, (DirViewType) gtk_radio_action_get_current_value(action), lw->file_view_type);
+	layout_views_set(lw, (DirViewType) gtk_radio_action_get_current_value(action), lw->options.file_view_type);
 }
 
 static void layout_menu_view_in_new_window_cb(GtkAction *action, gpointer data)
@@ -1852,7 +1852,7 @@
 	radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type);
 
 	action = gtk_action_group_get_action(lw->action_group, "ViewIcons");
-	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->file_view_type);
+	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.file_view_type);
 
 	action = gtk_action_group_get_action(lw->action_group, "FloatTools");
 	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.tools_float);
@@ -1885,7 +1885,7 @@
 
 	action = gtk_action_group_get_action(lw->action_group, "Thumbnails");
 	gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.show_thumbnails);
-	g_object_set(action, "sensitive", (lw->file_view_type == FILEVIEW_LIST), NULL);
+	g_object_set(action, "sensitive", (lw->options.file_view_type == FILEVIEW_LIST), NULL);
 }
 
 void layout_util_sync(LayoutWindow *lw)
diff -r 2ebf1a80ef64 -r 5a534e1501e1 src/typedefs.h
--- a/src/typedefs.h	Tue Mar 10 17:58:30 2009 +0000
+++ b/src/typedefs.h	Tue Mar 10 22:52:12 2009 +0000
@@ -599,7 +599,7 @@
 	LayoutLocation file_location;
 
 	ViewFile *vf;
-	FileViewType file_view_type;
+//	FileViewType file_view_type;
 
 	GtkWidget *file_view;
 
diff -r 2ebf1a80ef64 -r 5a534e1501e1 src/view_dir.c
--- a/src/view_dir.c	Tue Mar 10 17:58:30 2009 +0000
+++ b/src/view_dir.c	Tue Mar 10 22:52:12 2009 +0000
@@ -473,7 +473,7 @@
 	ViewDir *vd = data;
 
 	DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), VIEW_DIR_AS_SUBMENU_KEY));
-	layout_views_set(vd->layout, new_type, vd->layout->file_view_type);
+	layout_views_set(vd->layout, new_type, vd->layout->options.file_view_type);
 }
 
 static void vd_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
diff -r 2ebf1a80ef64 -r 5a534e1501e1 src/view_file.c
--- a/src/view_file.c	Tue Mar 10 17:58:30 2009 +0000
+++ b/src/view_file.c	Tue Mar 10 22:52:12 2009 +0000
@@ -444,7 +444,7 @@
 	
 	if (!vf->layout) return;
 
-	switch (vf->layout->file_view_type)
+	switch (vf->type)
 	{
 	case FILEVIEW_LIST:
 		layout_views_set(vf->layout, vf->layout->options.dir_view_type, FILEVIEW_ICON);